diff --git a/po/documentation.de.po b/po/documentation.de.po
index ee0ad57606f40d10ffe20ff4b608df70e89ff79c..d1fc28d3f8ab5adf648e89d1fc251aa0c501db60 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2019-08-27 18:53+0200\n"
+"POT-Creation-Date: 2019-12-08 16:35+0100\n"
"PO-Revision-Date: 2019-10-22 09:53+0000\n"
"Last-Translator: villabunterkunt <helene.wiesinger@mailbox.org>\n"
"Language-Team: Matthias A횩hauer <mha1993@live.de>\n"
@@ -34,7 +34,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr "Leere SHA-1 f체r Grenz-Commits anzeigen. Kann auch 체ber die Option `blame.blankboundary` gesteuert werden."
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:319 en/git-fsck.txt:38 en/git-rebase.txt:471
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:321 en/git-fsck.txt:38 en/git-rebase.txt:493
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -94,7 +94,7 @@ msgid "Show long rev (Default: off)."
msgstr "Zeige lange Revisionsnummer an (Standard: aus)."
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1000
+#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1016
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -130,7 +130,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr "Den Verlauf vorw채rts statt r체ckw채rts durchgehen. Anstatt die erste Revision anzuzeigen, in der eine Zeile erschien, wird die letzte Revision angezeigt, in der die Zeile noch existierte. Dies erfordert einen Revisionsbereich wie ANFANG..ENDE, wobei die gesuchte Stelle in ANFANG existieren muss. `git blame --reverse ANFANG` ist die Abk체rzung f체r `git blame --reverse ANFANG..HEAD`."
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:433 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -473,7 +473,7 @@ msgid "Get and set repository or global options."
msgstr "Repositoryweite oder globale Optionen lesen und setzen."
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1505
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1528
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-export[1]"
msgstr "linkgit:git-fast-export[1]"
@@ -485,7 +485,7 @@ msgid "Git data exporter."
msgstr "Export-Tool f체r Git-Daten."
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:243
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-import[1]"
msgstr "linkgit:git-fast-import[1]"
@@ -2203,7 +2203,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:143
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "`gitdir/i`"
msgstr "`gitdir/i`"
@@ -2275,8 +2275,8 @@ msgstr ""
"#-#-#-#-# git-remote-de.po (PACKAGE VERSION) #-#-#-#-#\n"
"Beispiele"
-#. type: Plain text
-#: en/config.txt:185
+#. type: delimited block -
+#: en/config.txt:186
#, fuzzy, no-wrap, priority:100
#| msgid ""
#| "\t; core variables\n"
@@ -2284,18 +2284,18 @@ msgstr ""
#| "\t\t; Don't trust file modes\n"
#| "\t\tfilemode = false\n"
msgid ""
-"\t# Core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"# Core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
"\t; Kernvariablen\n"
"\t[core]\n"
"\t\t; Vertraue den Dateimodi nicht\n"
"\t\tfilemode = false\n"
-#. type: Plain text
-#: en/config.txt:190
+#. type: delimited block -
+#: en/config.txt:191
#, fuzzy, no-wrap, priority:100
#| msgid ""
#| "\t; Our diff algorithm\n"
@@ -2303,27 +2303,27 @@ msgstr ""
#| "\t\texternal = /usr/local/bin/diff-wrapper\n"
#| "\t\trenames = true\n"
msgid ""
-"\t# Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"# Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
"\t; Unser diff-Algorithmus\n"
"\t[diff]\n"
"\t\texternal = /usr/local/bin/diff-wrapper\n"
"\t\trenames = true\n"
-#. type: Plain text
-#: en/config.txt:194
+#. type: delimited block -
+#: en/config.txt:195
#, no-wrap, priority:100
msgid ""
-"\t[branch \"devel\"]\n"
-"\t\tremote = origin\n"
-"\t\tmerge = refs/heads/devel\n"
+"[branch \"devel\"]\n"
+"\tremote = origin\n"
+"\tmerge = refs/heads/devel\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:199
+#. type: delimited block -
+#: en/config.txt:200
#, fuzzy, no-wrap, priority:100
#| msgid ""
#| "\t; Proxy settings\n"
@@ -2331,66 +2331,66 @@ msgstr ""
#| "\t\tgitproxy=\"proxy-command\" for kernel.org\n"
#| "\t\tgitproxy=default-proxy ; for all the rest\n"
msgid ""
-"\t# Proxy settings\n"
-"\t[core]\n"
-"\t\tgitProxy=\"ssh\" for \"kernel.org\"\n"
-"\t\tgitProxy=default-proxy ; for the rest\n"
+"# Proxy settings\n"
+"[core]\n"
+"\tgitProxy=\"ssh\" for \"kernel.org\"\n"
+"\tgitProxy=default-proxy ; for the rest\n"
msgstr ""
"\t; Proxyeinstellungen\n"
"\t[core]\n"
"\t\tgitproxy=\"proxy-Befehl\" for kernel.org\n"
"\t\tgitproxy=default-proxy ; f체r den Rest\n"
-#. type: Plain text
-#: en/config.txt:204
+#. type: delimited block -
+#: en/config.txt:205
#, no-wrap, priority:100
msgid ""
-"\t[include]\n"
-"\t\tpath = /path/to/foo.inc ; include by absolute path\n"
-"\t\tpath = foo.inc ; find \"foo.inc\" relative to the current file\n"
-"\t\tpath = ~/foo.inc ; find \"foo.inc\" in your `$HOME` directory\n"
+"[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: Plain text
-#: en/config.txt:208
+#. type: delimited block -
+#: en/config.txt:209
#, no-wrap, priority:100
msgid ""
-"\t; include if $GIT_DIR is /path/to/foo/.git\n"
-"\t[includeIf \"gitdir:/path/to/foo/.git\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; 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: Plain text
-#: en/config.txt:212
+#. type: delimited block -
+#: en/config.txt:213
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside /path/to/group\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside /path/to/group\n"
+"[includeIf \"gitdir:/path/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:216
+#. type: delimited block -
+#: en/config.txt:217
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside $HOME/to/group\n"
-"\t[includeIf \"gitdir:~/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside $HOME/to/group\n"
+"[includeIf \"gitdir:~/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:222
+#. type: delimited block -
+#: en/config.txt:223
#, no-wrap, priority:100
msgid ""
-"\t; relative paths are always relative to the including\n"
-"\t; file (if the condition is true); their location is not\n"
-"\t; affected by the condition\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = foo.inc\n"
+"; 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:227
+#: en/config.txt:229
#, no-wrap, priority:100
msgid ""
"\t; include only if we are in a worktree where foo-branch is\n"
@@ -2400,44 +2400,44 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/config.txt:229
+#: en/config.txt:231
#, no-wrap, priority:100
msgid "Values"
msgstr ""
#. type: Plain text
-#: en/config.txt:234
+#: 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:235
+#: en/config.txt:237
#, fuzzy, no-wrap, priority:100
#| msgid "--bool"
msgid "boolean"
msgstr "--bool"
#. type: Plain text
-#: en/config.txt:240
+#: 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:241
+#: en/config.txt:243
#, no-wrap, priority:100
msgid "true"
msgstr ""
#. type: Plain text
-#: en/config.txt:242
+#: en/config.txt:244
#, priority:100
msgid "Boolean true literals are `yes`, `on`, `true`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:244
+#: en/config.txt:246
#, no-wrap, priority:100
msgid ""
"and `1`. Also, a variable defined without `= <value>`\n"
@@ -2445,110 +2445,110 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/config.txt:245
+#: en/config.txt:247
#, no-wrap, priority:100
msgid "false"
msgstr ""
#. type: Plain text
-#: en/config.txt:246
+#: en/config.txt:248
#, priority:100
msgid "Boolean false literals are `no`, `off`, `false`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:247
+#: en/config.txt:249
#, no-wrap, priority:100
msgid "`0` and the empty string.\n"
msgstr ""
#. type: Plain text
-#: en/config.txt:251
+#: 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:252
+#: en/config.txt:254
#, no-wrap, priority:100
msgid "integer"
msgstr ""
#. type: Plain text
-#: en/config.txt:256
+#: 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:257 en/diff-options.txt:356 en/git-for-each-ref.txt:177
+#: 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:261
+#: 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:265
+#: en/config.txt:267
#, 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."
msgstr ""
#. type: Plain text
-#: en/config.txt:270
+#: en/config.txt:272
#, 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:277
+#: en/config.txt:279
#, 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:280
+#: en/config.txt:282
#, 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:289
+#: en/config.txt:291
#, 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:290
+#: en/config.txt:292
#, fuzzy, no-wrap, priority:100
#| msgid "<branchname>"
msgid "pathname"
msgstr "<branchname>"
#. type: Plain text
-#: en/config.txt:296
+#: en/config.txt:298
#, 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:299 en/git-imap-send.txt:58
+#: en/config.txt:301 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:304
+#: en/config.txt:306
#, 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:309
+#: en/config.txt:311
#, 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 ""
@@ -3287,53 +3287,53 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
#, no-wrap, priority:260
-msgid "Generating patches with -p"
+msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:10
+#: en/diff-generate-patch.txt:14
#, priority:260
-msgid "When \"git-diff-index\", \"git-diff-tree\", or \"git-diff-files\" are run with a `-p` option, \"git diff\" without the `--raw` option, or \"git log\" with the \"-p\" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
+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:13
+#: 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:15
+#: 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:17
+#: en/diff-generate-patch.txt:21
#, no-wrap, priority:260
msgid "diff --git a/file1 b/file2\n"
msgstr "diff --git a/datei1 b/datei2\n"
#. type: Plain text
-#: en/diff-generate-patch.txt:21
+#: 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:25
+#: 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:27
+#: 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:39
+#: en/diff-generate-patch.txt:43
#, no-wrap, priority:260
msgid ""
"old mode <mode>\n"
@@ -3350,43 +3350,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:42
+#: 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:44
+#: 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:51
+#: 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:55
+#: en/diff-generate-patch.txt:59
#, priority:260
-msgid "The index line includes the SHA-1 checksum 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."
+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:59
+#: 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:64
+#: 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:71
+#: en/diff-generate-patch.txt:75
#, no-wrap, priority:260
msgid ""
"diff --git a/a b/b\n"
@@ -3398,25 +3398,25 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/diff-generate-patch.txt:74
+#: en/diff-generate-patch.txt:78
#, no-wrap, priority:260
-msgid "combined diff format"
+msgid "Combined diff format"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:82
+#: 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:84
+#: en/diff-generate-patch.txt:88
#, priority:260
-msgid "A 'combined diff' format looks like this:"
+msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:93
+#: en/diff-generate-patch.txt:97
#, no-wrap, priority:260
msgid ""
"diff --combined describe.c\n"
@@ -3429,7 +3429,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:103
+#: en/diff-generate-patch.txt:107
#, no-wrap, priority:260
msgid ""
"- static void describe(char *arg)\n"
@@ -3444,7 +3444,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:113
+#: en/diff-generate-patch.txt:117
#, no-wrap, priority:260
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
@@ -3459,37 +3459,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:117
+#: en/diff-generate-patch.txt:121
#, priority:260
-msgid "It is preceded with a \"git diff\" header, that looks like this (when `-c` option is used):"
+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:119
+#: en/diff-generate-patch.txt:123
#, no-wrap, priority:260
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:121
+#: en/diff-generate-patch.txt:125
#, priority:260
-msgid "or like this (when `--cc` option is used):"
+msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:123
+#: en/diff-generate-patch.txt:127
#, no-wrap, priority:260
msgid " diff --cc file\n"
msgstr " diff --cc Datei\n"
#. type: Plain text
-#: en/diff-generate-patch.txt:126
+#: 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:131
+#: en/diff-generate-patch.txt:135
#, no-wrap, priority:260
msgid ""
"index <hash>,<hash>..<hash>\n"
@@ -3499,91 +3499,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:137
+#: 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:139
+#: 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:141 en/diff-generate-patch.txt:152 en/diff-generate-patch.txt:153 en/diff-generate-patch.txt:154
+#: 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:142 en/diff-generate-patch.txt:155
+#: 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:146
+#: 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:150
+#: 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:159
+#: 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:165
+#: 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 for apply. The change is similar to the change in the extended 'index' header:"
+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:167
+#: 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:170
+#: 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:179
+#: 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:185
+#: 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:191
+#: 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:197
+#: 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:327 en/merge-options.txt:86
+#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3595,7 +3595,7 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:186 en/git-add.txt:111 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/diff-options.txt:23 en/fetch-options.txt:198 en/git-add.txt:111 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
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
@@ -3619,7 +3619,7 @@ msgid "\tThis is the default.\n"
msgstr ""
#. 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:117 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
+#: 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:118 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"
@@ -4038,7 +4038,7 @@ msgid "Synonym for --dirstat=files,param1,param2..."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:129
+#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--summary"
msgstr "--summary"
@@ -4062,7 +4062,7 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:122 en/git-update-index.txt:168
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:168
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4473,7 +4473,7 @@ msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:402 en/git-status.txt:139
+#: en/diff-options.txt:402 en/git-status.txt:143
#, ignore-same, no-wrap, priority:280
msgid "--no-renames"
msgstr "--no-renames"
@@ -4578,7 +4578,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:463
#, priority:280
-msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
+msgid "It affects the way a change that amounts to a total rewrite of a file does not appear as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
msgstr ""
#. type: Plain text
@@ -4594,7 +4594,7 @@ msgid "-M[<n>]"
msgstr "-M[<Anz>]"
#. type: Labeled list
-#: en/diff-options.txt:473 en/git-status.txt:143
+#: en/diff-options.txt:473 en/git-status.txt:147
#, no-wrap, priority:280
msgid "--find-renames[=<n>]"
msgstr "--find-renames[=<Anz>]"
@@ -5018,7 +5018,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:203 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:52 en/git-clone.txt:120 en/git-commit.txt:314 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:301 en/git-gc.txt:68 en/git-grep.txt:296 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:315 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:255 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:136 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:215 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:316 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:302 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:256 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5072,7 +5072,7 @@ msgid "Allow (or disallow) external text conversion filters to be run when compa
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:85
+#: en/diff-options.txt:722 en/git-status.txt:87
#, no-wrap, priority:280
msgid "--ignore-submodules[=<when>]"
msgstr ""
@@ -5150,7 +5150,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:265 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:266 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5283,7 +5283,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr "The remote configuration is achieved using the `remote.origin.url` and `remote.origin.fetch` configuration variables. (See linkgit:git-config[1]). Die Konfiguration entfernter Repositories wird durch die Konfigurationsvariablen `remote.origin.url` und `remote.origin.fetch` erreicht. (Siehe linkgit:git-config[1])."
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:48 en/git-commit.txt:317 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:50 en/git-commit.txt:319 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5295,13 +5295,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:34 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:195 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:347 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:278 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:279 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:35 en/git-fast-import.txt:37 en/git-filter-branch.txt:196 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:279 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:280 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5333,7 +5333,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:112 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:113 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5411,7 +5411,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:47 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:97 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:326 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:301 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:85
+#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:98 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:302 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5477,188 +5477,212 @@ msgid "--jobs=<n>"
msgstr "--jobs=<Anz>"
#. type: Plain text
-#: en/fetch-options.txt:167
+#: en/fetch-options.txt:164
+#, priority:220
+msgid "Number of parallel children to be used for all forms of fetching."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:169
#, priority:220
-msgid "Number of parallel children to be used for fetching submodules. Each will fetch from different submodules, such that fetching many submodules will be faster. By default submodules will be fetched one at a time."
+msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:172
+#, priority:220
+msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:168 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:173 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:171
+#: en/fetch-options.txt:176
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:172
+#: en/fetch-options.txt:177 en/git-branch.txt:225 en/git-push.txt:349
+#, ignore-same, no-wrap, priority:240
+msgid "--set-upstream"
+msgstr "--set-upstream"
+
+#. type: Plain text
+#: en/fetch-options.txt:183
+#, priority:220
+msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:184
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr "--submodule-prefix=<Pfad>"
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:188
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177
+#: en/fetch-options.txt:189
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:184
+#: en/fetch-options.txt:196
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:199
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:194
+#: en/fetch-options.txt:206
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:195 en/git-clone.txt:182
+#: en/fetch-options.txt:207 en/git-clone.txt:182
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr "--upload-pack <upload-pack>"
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:212
#, fuzzy, priority:220
#| msgid "When given, and the repository to clone from is accessed via ssh, this specifies a non-default path for the command run on the other end."
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr "Wird diese Option angegeben und auf das zu klonende Projektarchiv mittels ssh zugegriffen, dann gibt <upload-pack> das auf der entfernten Seite auszuf체hrende Kommando an."
#. type: Labeled list
-#: en/fetch-options.txt:202 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:51 en/git-clone.txt:119 en/git-commit.txt:313 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:300 en/git-grep.txt:295 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:314 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:254 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:135
+#: en/fetch-options.txt:214 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:315 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:301 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:255 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:207
+#: en/fetch-options.txt:219
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:208 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:298 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:318 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:139
+#: en/fetch-options.txt:220 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:300 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:209 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:299 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:319 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:140
+#: en/fetch-options.txt:221 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:301 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:211 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:142
+#: en/fetch-options.txt:223 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr "Gib ausf체hrliche Informationen aus."
#. type: Labeled list
-#: en/fetch-options.txt:213 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:326 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:258 en/git-switch.txt:144 en/merge-options.txt:143
+#: en/fetch-options.txt:225 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:328 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:259 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:218 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:230 en/git-pack-objects.txt:156 en/git-push.txt:376
#, fuzzy, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr "Der Fortschritt wird nur standardm채횩ig auf der Standardfehlerausgabe angezeigt, wenn dieser an ein Terminal angebunden ist. Dieses Flag erlaubt die Fortschrittsanzeige auch ohne Terminalanbindung. `--progress` kann nicht zusammen mit `--porcelain` oder `--incremental` verwendet werden."
#. type: Labeled list
-#: en/fetch-options.txt:219 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:231 en/git-ls-remote.txt:73 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr "-o <Option>"
#. type: Labeled list
-#: en/fetch-options.txt:220 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:232 en/git-clone.txt:135 en/git-ls-remote.txt:74
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr "--server-option=<Option>"
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-clone.txt:142
+#: en/fetch-options.txt:239 en/git-clone.txt:142
#, priority:300
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:240
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:233
+#: en/fetch-options.txt:245
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:234
+#: en/fetch-options.txt:246
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:240
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:241 en/git-push.txt:398
+#: en/fetch-options.txt:253 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:242 en/git-push.txt:399
+#: en/fetch-options.txt:254 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:244 en/git-push.txt:401
+#: en/fetch-options.txt:256 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:245 en/git-push.txt:402
+#: en/fetch-options.txt:257 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:246 en/git-push.txt:403
+#: en/fetch-options.txt:258 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:247 en/git-push.txt:405
+#: en/fetch-options.txt:259 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5702,7 +5726,7 @@ msgstr ""
"\t [--chmod=(+|-)x] [--] [<Pfadspezifikation>...]\n"
#. type: Title -
-#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:20 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:67 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
+#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr "BESCHREIBUNG"
@@ -5746,13 +5770,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr "F체r andere Wege, Inhalte zu einer Eintragung (commit) hinzuzuf체gen, siehe auch linkgit:git-commit[1] ."
#. type: Title -
-#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:83 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:85 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:115 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:253 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:86 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:254 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr "OPTIONEN"
#. type: Labeled list
-#: en/git-add.txt:52 en/git-grep.txt:308 en/git-status.txt:148
+#: en/git-add.txt:52 en/git-grep.txt:325 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr "<Pfadspezifikation>..."
@@ -5764,7 +5788,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:67 en/git-grep.txt:314
+#: en/git-add.txt:67 en/git-grep.txt:331
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr "F체r mehr Detail 체ber die <pathspec> Syntax kann der 'pathspec' Eintrag im linkgit:gitglossary[7] zur Rate gezogen werden."
@@ -5782,13 +5806,13 @@ msgid "Allow adding otherwise ignored files."
msgstr "Erzwinge das Hinzuf체gen normalerweise ignorierter Dateien."
#. type: Labeled list
-#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:42 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:394 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:43 en/git-rebase.txt:395 en/git-rebase.txt:536 en/git-svn.txt:297
+#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5812,7 +5836,7 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:275 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
@@ -5902,7 +5926,7 @@ msgid "This option is primarily to help users who are used to older versions of
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:146 en/git-format-patch.txt:101 en/git-submodule.txt:340
+#: en/git-add.txt:146 en/git-format-patch.txt:102 en/git-submodule.txt:341
#, no-wrap, priority:300
msgid "-N"
msgstr "-N"
@@ -5993,7 +6017,7 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:343 en/git-grep.txt:304 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
+#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:345 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr "\\--"
@@ -6005,7 +6029,7 @@ msgid "This option can be used to separate command-line options from the list of
msgstr "Diese Option kann dazu verwendet werden, Befehlszeilenoptionen von der Liste von Dateien zu trennen. Dies ist sinnvoll, wenn Dateinamen mit Befehlszeilenoptionen verwechselt werden k철nnten."
#. type: Title -
-#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:357 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:153 en/git-fetch.txt:242 en/git-filter-branch.txt:234 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:634 en/git-grep.txt:316 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:206 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:359 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:638 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr "EXAMPLES"
@@ -6047,7 +6071,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr "Dieses Beispiel l채횩t die Erweiterung des Sternchens durch die Shell durchf체hren (git erh채lt bereits eine explizite Dateiliste 체bergeben), und so kann z.B. `subdir/git-foo.sh` nicht gefunden werden."
#. type: Title -
-#: en/git-add.txt:221 en/git-rebase.txt:591
+#: en/git-add.txt:221 en/git-rebase.txt:613
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr "INTERAKTIVER MODUS"
@@ -6059,7 +6083,7 @@ msgid "When the command enters the interactive mode, it shows the output of the
msgstr "Wird git im interaktiven Modus gestartet, zeigt es zuerst die Ausgabe des 'status' Unterbefehls, und beginnt dann mit der interaktiven Befehlsverarbeitung."
#. type: Plain text
-#: en/git-add.txt:230 en/git-clean.txt:83
+#: en/git-add.txt:230 en/git-clean.txt:85
#, priority:300
msgid "The command loop shows the list of subcommands available, and gives a prompt \"What now> \". In general, when the prompt ends with a single '>', you can pick only one of the choices given and type return, like this:"
msgstr "Diese zeigt eine Liste der m철glichen Unterbefehle und fr채gt \"What now> \". Wenn die Frage mit einem einzelnen '>' endet, kann man im Allgemeinen aus einer der folgenden Optionen w채hlen und diese mit der Eingabetaste best채tigen:"
@@ -6092,7 +6116,7 @@ msgstr "Die Hauptbefehlsschleife hat 6 Unterbefehle (sowie zus채tzlich 'help' un
#. type: Labeled list
#: en/git-add.txt:243
-#, no-wrap, ignore-same, priority:300
+#, no-wrap, priority:300
msgid "status"
msgstr "status"
@@ -6104,7 +6128,7 @@ msgstr "Zeigt den Unterschied zwischen HEAD und dem Index (also was committet wi
#. type: delimited block -
#: en/git-add.txt:255
-#, ignore-begin-space, no-wrap, priority:300
+#, no-wrap, priority:300
msgid ""
" staged unstaged path\n"
" 1: binary nothing foo.png\n"
@@ -6140,7 +6164,7 @@ msgstr "Alle ausgew채hlten Listeneintr채ge werden wie folgt mit einem Stern '*'
#. type: delimited block -
#: en/git-add.txt:284
-#, ignore-begin-space, no-wrap, priority:300
+#, no-wrap, priority:300
msgid ""
" staged unstaged path\n"
" 1: binary nothing foo.png\n"
@@ -6158,7 +6182,7 @@ msgstr "Ein '-' vor der Option macht die Auswahl wieder r체ckg채ngig:"
#. type: delimited block -
#: en/git-add.txt:291
-#, no-wrap, ignore-same, priority:300
+#, no-wrap, priority:300
msgid "Update>> -2\n"
msgstr "Update>> -2\n"
@@ -6170,7 +6194,7 @@ msgstr "Nachdem die Auwahl getroffen wurde kann durch Eingabe einer Leerzeile de
#. type: Labeled list
#: en/git-add.txt:296
-#, no-wrap, ignore-same, priority:300
+#, no-wrap, priority:300
msgid "revert"
msgstr "revert"
@@ -6182,7 +6206,7 @@ msgstr "Diese Option ist sehr 채hnlich zu 'update', nur wird die im Index gespei
#. type: Labeled list
#: en/git-add.txt:302
-#, no-wrap, ignore-same, priority:300
+#, no-wrap, priority:300
msgid "add untracked"
msgstr "add untracked"
@@ -6194,7 +6218,7 @@ msgstr "Mit einer zu 'update' und 'revert' sehr 채hnlichen Bedienweise k철nnen m
#. type: Labeled list
#: en/git-add.txt:307
-#, no-wrap, ignore-same, priority:300
+#, no-wrap, priority:300
msgid "patch"
msgstr "patch"
@@ -6383,7 +6407,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:135 en/git-commit-tree.txt:118 en/git-commit.txt:487 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:241 en/git-fast-import.txt:1503 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:679 en/git-gc.txt:154 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:112 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:247 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:519 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:292 en/git-status.txt:434 en/git-submodule.txt:436 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
+#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:489 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1526 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:683 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:437 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
@@ -6395,13 +6419,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:139 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:495 en/git-config.txt:492 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:245 en/git-fast-import.txt:1507 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:480 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:683 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:334 en/git-gui.txt:126 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:116 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:230 en/git-merge-file.txt:94 en/git-merge-index.txt:78 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1052 en/git-receive-pack.txt:251 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:123 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:523 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:300 en/git-status.txt:438 en/git-stripspace.txt:93 en/git-submodule.txt:440 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
+#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:497 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1530 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:693 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:687 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:441 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
#, no-wrap, priority:300
msgid "GIT"
msgstr "GIT"
#. type: Plain text
-#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:140 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:496 en/git-config.txt:493 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:246 en/git-fast-import.txt:1508 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:481 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:684 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:335 en/git-gui.txt:127 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:117 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:231 en/git-merge-file.txt:95 en/git-merge-index.txt:79 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1053 en/git-receive-pack.txt:252 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:124 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:524 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:301 en/git-status.txt:439 en/git-stripspace.txt:94 en/git-submodule.txt:441 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
+#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:498 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1531 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:694 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:688 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:442 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr "Teil der linkgit:git[1] Suite"
@@ -6451,7 +6475,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:118 en/git-rebase.txt:387 en/git-revert.txt:98 en/merge-options.txt:73
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:119 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6493,7 +6517,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:969
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:985
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6523,7 +6547,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:267 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:989
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1005
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6615,37 +6639,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:303 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:304 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:307 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:373 en/git-rebase.txt:524
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:374
+#: en/git-am.txt:109 en/git-rebase.txt:396
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr "--whitespace=<Option>"
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:337
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
#, no-wrap, priority:100
msgid "-C<n>"
msgstr "-C<Anz>"
@@ -6705,7 +6729,7 @@ msgid "Run interactively."
msgstr "Interaktiv ausf체hren."
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:380 en/git-rebase.txt:521
+#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6717,7 +6741,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:381 en/git-rebase.txt:522
+#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6729,7 +6753,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:256 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6741,31 +6765,31 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:333 en/git-rebase.txt:308 en/git-revert.txt:91 en/merge-options.txt:58
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:335 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:334 en/git-rebase.txt:309 en/git-revert.txt:92 en/merge-options.txt:59
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:336 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:338 en/git-rebase.txt:313 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:340 en/git-rebase.txt:331 en/git-revert.txt:96
#, priority:280
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:228 en/sequencer.txt:1
+#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:246 en/sequencer.txt:1
#, ignore-same, no-wrap, priority:240
msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:406 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:997
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1013
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6795,7 +6819,7 @@ msgid "When a patch failure occurs, <msg> will be printed to the screen before e
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:231 en/sequencer.txt:15
+#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:249 en/sequencer.txt:15
#, ignore-same, no-wrap, priority:240
msgid "--abort"
msgstr "--abort"
@@ -6807,7 +6831,7 @@ msgid "Restore the original branch and abort the patching operation."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:238 en/sequencer.txt:10
+#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:256 en/sequencer.txt:10
#, ignore-same, no-wrap, priority:240
msgid "--quit"
msgstr "--quit"
@@ -6819,7 +6843,7 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:262
+#: en/git-am.txt:179 en/git-rebase.txt:280
#, ignore-same, no-wrap, priority:100
msgid "--show-current-patch"
msgstr "--show-current-patch"
@@ -6831,7 +6855,7 @@ msgid "Show the patch being applied when \"git am\" is stopped because of confli
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:451 en/git-format-patch.txt:351 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:188 en/git-tag.txt:231
+#: en/git-am.txt:184 en/git-commit.txt:453 en/git-format-patch.txt:355 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr "ER횜RTERUNG"
@@ -6915,7 +6939,7 @@ msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the curren
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:471 en/git-gc.txt:147
+#: en/git-am.txt:234 en/git-commit.txt:473 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr "HOOKS"
@@ -7015,7 +7039,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr "Nimm die Eintragungsbemerkung (commit message) der spezifizierten Datei. Mit '-' wird die Bemerkung von der Standard Eingabe gelesen."
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:322 en/merge-options.txt:84
+#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -7057,7 +7081,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:291
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:292
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7129,7 +7153,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:342
+#: en/git-apply.txt:134 en/git-rebase.txt:360
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7345,7 +7369,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:330 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:398 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:332 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -8041,7 +8065,7 @@ msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:74
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "$ git bisect good\n"
msgstr "$ git bisect good\n"
@@ -8053,7 +8077,7 @@ msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:80
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "$ git bisect bad\n"
msgstr "$ git bisect bad\n"
@@ -8251,7 +8275,7 @@ msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:205
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "$ git bisect visualize\n"
msgstr "$ git bisect visualize\n"
@@ -8263,7 +8287,7 @@ msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:213
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "$ git bisect visualize --stat\n"
msgstr "$ git bisect visualize --stat\n"
@@ -9296,7 +9320,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr "Kopiere einen Branch und das zugeh철rige Reflog."
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:525
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
#, no-wrap, priority:240
msgid "-C"
msgstr "-C"
@@ -9332,13 +9356,13 @@ msgid "Sorting and filtering branches are case insensitive."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:153 en/git-status.txt:126 en/git-tag.txt:134
+#: en/git-branch.txt:153 en/git-status.txt:130 en/git-tag.txt:134
#, no-wrap, priority:280
msgid "--column[=<options>]"
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:154 en/git-status.txt:127 en/git-tag.txt:135
+#: en/git-branch.txt:154 en/git-status.txt:131 en/git-tag.txt:135
#, ignore-same, no-wrap, priority:280
msgid "--no-column"
msgstr "--no-column"
@@ -9471,12 +9495,6 @@ msgstr ""
"#-#-#-#-# git-checkout-de.po (PACKAGE VERSION) #-#-#-#-#\n"
"Ignore the branch.autosetupmerge configuration variable."
-#. type: Labeled list
-#: en/git-branch.txt:225 en/git-push.txt:349
-#, ignore-same, no-wrap, priority:240
-msgid "--set-upstream"
-msgstr "--set-upstream"
-
#. type: Plain text
#: en/git-branch.txt:228
#, priority:240
@@ -9672,7 +9690,7 @@ msgstr "Weiterentwicklung ausgehend von einer bekannten Markierung (tag)"
#. type: delimited block -
#: en/git-branch.txt:317
-#, ignore-ellipsis, ignore-same, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -9698,7 +9716,7 @@ msgstr "L철schen eines nicht mehr ben철tigten Entwicklungszweiges (Branch)"
#. type: delimited block -
#: en/git-branch.txt:329
-#, ignore-ellipsis, ignore-same, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -9755,7 +9773,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-filter-branch.txt:449 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10380,7 +10398,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:152 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10687,7 +10705,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-attr.txt:22
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "-a, --all"
msgstr "-a --all"
@@ -10934,7 +10952,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ignore.txt:28
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "-q, --quiet"
msgstr "-q --quiet"
@@ -10946,7 +10964,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ignore.txt:32
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "-v, --verbose"
msgstr "-v --verbose"
@@ -11029,7 +11047,7 @@ msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will al
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:226
+#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
@@ -11227,7 +11245,7 @@ msgid "Only meaningful with `--stdin`; paths are separated with NUL character in
msgstr ""
#. type: Plain text
-#: en/git-checkout-index.txt:73 en/git-commit.txt:345 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
+#: en/git-checkout-index.txt:73 en/git-commit.txt:347 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
#, priority:280
msgid "Do not interpret any more arguments as options."
msgstr "Diese Option kann dazu verwendet werden, Befehlszeilenoptionen von der Liste von Dateien zu trennen. Dies ist sinnvoll, wenn Dateinamen mit Befehlszeilenoptionen verwechselt werden k철nnten."
@@ -11378,7 +11396,7 @@ msgstr ""
#. type: delimited block -
#: en/git-checkout-index.txt:170
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "$ git checkout-index --prefix=.merged- Makefile\n"
msgstr "$ git checkout-index --prefix=.merged- Makefile\n"
@@ -11549,7 +11567,7 @@ msgid "Quiet, suppress feedback messages."
msgstr "Leise, unterdr체cke Hinweisnachrichten."
#. type: Labeled list
-#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:144
+#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:152
#, ignore-same, no-wrap, priority:240
msgid "--no-progress"
msgstr "--no-progress"
@@ -11743,7 +11761,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:241 en/git-rebase.txt:268 en/git-rebase.txt:529 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:354 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
+#: en/git-checkout.txt:241 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:355 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11864,7 +11882,7 @@ msgid "In the default overlay mode, `git checkout` never removes files from the
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:312 en/git-rebase.txt:225 en/git-switch.txt:36
+#: en/git-checkout.txt:312 en/git-rebase.txt:243 en/git-switch.txt:36
#, no-wrap, priority:240
msgid "<branch>"
msgstr "<Branch>"
@@ -11957,7 +11975,7 @@ msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:368 en/git-checkout.txt:403 en/git-checkout.txt:420
-#, ignore-same, no-wrap, priority:240
+#, no-wrap, priority:240
msgid "$ edit; git add; git commit\n"
msgstr "$ edit; git add; git commit\n"
@@ -12053,7 +12071,7 @@ msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:437
-#, ignore-same, no-wrap, priority:240
+#, no-wrap, priority:240
msgid "$ git checkout master\n"
msgstr "$ git checkout master\n"
@@ -12078,7 +12096,7 @@ msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:457
-#, ignore-same, no-wrap, priority:240
+#, no-wrap, priority:240
msgid ""
"$ git checkout -b foo <1>\n"
"$ git branch foo <2>\n"
@@ -12143,7 +12161,7 @@ msgstr "The following sequence checks out the `master` branch, reverts the `Make
#. type: delimited block -
#: en/git-checkout.txt:503
-#, ignore-same, no-wrap, priority:240
+#, no-wrap, priority:240
msgid ""
"$ git checkout master <1>\n"
"$ git checkout master~2 Makefile <2>\n"
@@ -12183,7 +12201,7 @@ msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:514
-#, ignore-same, no-wrap, priority:240
+#, no-wrap, priority:240
msgid "$ git checkout -- '*.c'\n"
msgstr "$ git checkout -- '*.c'\n"
@@ -12201,7 +12219,7 @@ msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:527
-#, ignore-same, no-wrap, priority:240
+#, no-wrap, priority:240
msgid "$ git checkout -- hello.c\n"
msgstr "$ git checkout -- hello.c\n"
@@ -12214,7 +12232,7 @@ msgstr "After working in a wrong branch, switching to the correct branch would b
#. type: delimited block -
#: en/git-checkout.txt:534
-#, ignore-same, no-wrap, priority:240
+#, no-wrap, priority:240
msgid "$ git checkout mytopic\n"
msgstr "$ git checkout mytopic\n"
@@ -12295,7 +12313,7 @@ msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:575
-#, ignore-same, no-wrap, priority:240
+#, no-wrap, priority:240
msgid ""
"$ edit frotz\n"
"$ git add frotz\n"
@@ -12608,7 +12626,7 @@ msgid "This option determines how the commit message will be cleaned up before b
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:65 en/git-clean.txt:61
+#: en/git-cherry-pick.txt:65 en/git-clean.txt:63
#, ignore-same, no-wrap, priority:100
msgid "-x"
msgstr "-x"
@@ -12692,7 +12710,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:249 en/git-rebase.txt:532
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:267 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12716,7 +12734,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:282 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:109
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12734,7 +12752,7 @@ msgid "-X<option>"
msgstr "`option`"
#. type: Labeled list
-#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:125
#, no-wrap, priority:240
msgid "--strategy-option=<option>"
msgstr "--strategy-option=<Option>"
@@ -12930,7 +12948,7 @@ msgid "Show the commit subjects next to the SHA1s."
msgstr "Zeige die jeweilige erste Zeile (Betreffzeile) der Commit-Beschreibung nehben den SHA1-Hashes."
#. type: Labeled list
-#: en/git-cherry.txt:32 en/git-rebase.txt:220
+#: en/git-cherry.txt:32 en/git-rebase.txt:238
#, no-wrap, priority:100
msgid "<upstream>"
msgstr ""
@@ -12948,7 +12966,7 @@ msgid "<head>"
msgstr "<Branch>"
#. type: Plain text
-#: en/git-cherry.txt:38 en/git-rebase.txt:227
+#: en/git-cherry.txt:38 en/git-rebase.txt:245
#, priority:100
msgid "Working branch; defaults to HEAD."
msgstr ""
@@ -13108,7 +13126,7 @@ msgstr "git-gitool - Graphische Alternative zu git-commit"
#. type: Plain text
#: en/git-citool.txt:12
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "'git citool'\n"
msgstr "'git citool'\n"
@@ -13161,86 +13179,86 @@ msgid "If any optional `<path>...` arguments are given, only those paths are aff
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:33
+#: en/git-clean.txt:35
#, priority:100
-msgid "Remove untracked directories in addition to untracked files. If an untracked directory is managed by a different Git repository, it is not removed by default. Use -f option twice if you really want to remove such a directory."
+msgid "Normally, when no <path> is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. If any paths are specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under `--force`) will be removed."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:41
+#: en/git-clean.txt:43
#, priority:100
-msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f, -n or -i. Git will refuse to delete directories with .git sub directory or file unless a second -f is given."
+msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f or -i. Git will refuse to modify untracked nested git repositories (directories with a .git subdirectory) unless a second -f is given."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:46
+#: en/git-clean.txt:48
#, priority:100
msgid "Show what would be done and clean files interactively. See ``Interactive mode'' for details."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:50
+#: en/git-clean.txt:52
#, priority:100
msgid "Don't actually remove anything, just show what would be done."
msgstr "Entferne nichts tats채chlich, sondern zeige nur was getan w체rde."
#. type: Plain text
-#: en/git-clean.txt:55
+#: en/git-clean.txt:57
#, priority:100
msgid "Be quiet, only report errors, but not the files that are successfully removed."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:56
+#: en/git-clean.txt:58
#, no-wrap, priority:100
msgid "-e <pattern>"
msgstr "-e <Muster>"
#. type: Labeled list
-#: en/git-clean.txt:57 en/git-ls-files.txt:85 en/git-name-rev.txt:33
+#: en/git-clean.txt:59 en/git-ls-files.txt:85 en/git-name-rev.txt:33
#, no-wrap, priority:100
msgid "--exclude=<pattern>"
msgstr "--exclude=<Muster>"
#. type: Plain text
-#: en/git-clean.txt:60
+#: en/git-clean.txt:62
#, priority:100
msgid "Use the given exclude pattern in addition to the standard ignore rules (see linkgit:gitignore[5])."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:68
+#: en/git-clean.txt:70
#, priority:100
msgid "Don't use the standard ignore rules (see linkgit:gitignore[5]), but still use the ignore rules given with `-e` options from the command line. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git restore' or 'git reset') to create a pristine working directory to test a clean build."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:69
+#: en/git-clean.txt:71
#, no-wrap, priority:100
msgid "-X"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:72
+#: en/git-clean.txt:74
#, priority:100
msgid "Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files."
msgstr ""
#. type: Title -
-#: en/git-clean.txt:74
+#: en/git-clean.txt:76
#, no-wrap, priority:100
msgid "Interactive mode"
msgstr "Interaktiver Modus"
#. type: Plain text
-#: en/git-clean.txt:78
+#: en/git-clean.txt:80
#, fuzzy, priority:100
#| msgid "When the command enters the interactive mode, it shows the output of the 'status' subcommand, and then goes into its interactive command loop."
msgid "When the command enters the interactive mode, it shows the files and directories to be cleaned, and goes into its interactive command loop."
msgstr "Wird git im interaktiven Modus gestartet, zeigt es zuerst die Ausgabe des 'status' Unterbefehls, und beginnt dann mit der interaktiven Befehlsverarbeitung."
#. type: delimited block -
-#: en/git-clean.txt:89
+#: en/git-clean.txt:91
#, fuzzy, no-wrap, priority:100
#| msgid ""
#| " *** Commands ***\n"
@@ -13259,92 +13277,92 @@ msgstr ""
" What now> 1\n"
#. type: Plain text
-#: en/git-clean.txt:92
+#: en/git-clean.txt:94
#, priority:100
msgid "You also could say `c` or `clean` above as long as the choice is unique."
msgstr "Man kann auch `c` oder `clean` eingeben, solange die Auswahl eindeutig ist."
#. type: Plain text
-#: en/git-clean.txt:94
+#: en/git-clean.txt:96
#, priority:100
msgid "The main command loop has 6 subcommands."
msgstr "Die Hauptbefehlsschleife hat 6 Unterbefehle."
#. type: Labeled list
-#: en/git-clean.txt:95
+#: en/git-clean.txt:97
#, no-wrap, priority:100
msgid "clean"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:98
+#: en/git-clean.txt:100
#, priority:100
msgid "Start cleaning files and directories, and then quit."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:99
+#: en/git-clean.txt:101
#, no-wrap, priority:100
msgid "filter by pattern"
msgstr "Anhand eines Musters filtern"
#. type: Plain text
-#: en/git-clean.txt:107
+#: en/git-clean.txt:109
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Input ignore patterns>>\" prompt. You can input space-separated patterns to exclude files and directories from deletion. E.g. \"*.c *.h\" will excludes files end with \".c\" and \".h\" from deletion. When you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:108
+#: en/git-clean.txt:110
#, no-wrap, priority:100
msgid "select by numbers"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:119
+#: en/git-clean.txt:121
#, fuzzy, priority:100
#| msgid "This shows the status information and gives prompt \"Update>>\". When the prompt ends with double '>>', you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining patches are taken. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything."
msgid "This shows the files and directories to be deleted and issues an \"Select items to delete>>\" prompt. When the prompt ends with double '>>' like this, you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything. Also when you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr "Zeigt die Status Information und wartet mit der Meldung \"Update>>\" auf weitere Eingaben. Wenn die Meldung mit doppelten '>>' endet, kann man, getrennt durch Leerzeichen oder Beistriche, mehrere Operationen ausw채hlen. Man kann auch ganze Bereiche angeben, z.B. \"2-5 7,9\" um 2,3,4,5,7,9 aus der Liste auszuw채hlen. Wird die zweite Nummer eines Bereichs nicht angegeben, reicht dieser bis an das Ende der Liste, zB \"7-\" um 7,8,9 aus der Liste auszuw채hlen. Durch '*' werden alle Listeneintr채ge ausgew채hlt."
#. type: Labeled list
-#: en/git-clean.txt:120
+#: en/git-clean.txt:122
#, no-wrap, priority:100
msgid "ask each"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:125
+#: en/git-clean.txt:127
#, priority:100
msgid "This will start to clean, and you must confirm one by one in order to delete items. Please note that this action is not as efficient as the above two actions."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:126
+#: en/git-clean.txt:128
#, no-wrap, priority:100
msgid "quit"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:129
+#: en/git-clean.txt:131
#, priority:100
msgid "This lets you quit without do cleaning."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:130
+#: en/git-clean.txt:132
#, no-wrap, priority:100
msgid "help"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:133
+#: en/git-clean.txt:135
#, priority:100
msgid "Show brief usage of interactive git-clean."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:137 en/git-status.txt:436
+#: en/git-clean.txt:139 en/git-status.txt:440
#, ignore-same, priority:280
msgid "linkgit:gitignore[5]"
msgstr "linkgit:gitignore[5]"
@@ -13517,7 +13535,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:108 en/git-submodule.txt:392
+#: en/git-clone.txt:108 en/git-submodule.txt:393
#, ignore-same, no-wrap, priority:300
msgid "--dissociate"
msgstr "--dissociate"
@@ -13765,13 +13783,13 @@ msgid "Instead of placing the cloned repository where it is supposed to be, plac
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:277 en/git-submodule.txt:416
+#: en/git-clone.txt:277 en/git-submodule.txt:417
#, no-wrap, priority:300
msgid "-j <n>"
msgstr "-j <Anz>"
#. type: Labeled list
-#: en/git-clone.txt:278 en/git-submodule.txt:417
+#: en/git-clone.txt:278 en/git-submodule.txt:418
#, no-wrap, priority:300
msgid "--jobs <n>"
msgstr "--jobs <Anz>"
@@ -13816,7 +13834,7 @@ msgstr "Klonen eines 'fernen' Projektarchivs"
#. type: delimited block -
#: en/git-clone.txt:306
-#, ignore-ellipsis, ignore-same, no-wrap, priority:300
+#, ignore-ellipsis, no-wrap, priority:300
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux.git my-linux\n"
"$ cd my-linux\n"
@@ -13835,7 +13853,7 @@ msgstr "Erzeuge einen lokalen Klon der vom aktuellen Verzeichnis borgt, ohne 'gi
#. type: delimited block -
#: en/git-clone.txt:315
-#, ignore-same, no-wrap, priority:300
+#, no-wrap, priority:300
msgid ""
"$ git clone -l -s -n . ../copy\n"
"$ cd ../copy\n"
@@ -13854,7 +13872,7 @@ msgstr "Klone ein 'fernes' Projektarchiv w채hrend Objekte von einem lokalen Proj
#. type: delimited block -
#: en/git-clone.txt:325
-#, ignore-ellipsis, ignore-same, no-wrap, priority:300
+#, ignore-ellipsis, no-wrap, priority:300
msgid ""
"$ git clone --reference /git/linux.git \\\n"
"\tgit://git.kernel.org/pub/scm/.../linux.git \\\n"
@@ -13875,7 +13893,7 @@ msgstr "Erzeuge ein 'reines' Projektarchiv um 횆nderungen publik zu machen"
#. type: delimited block -
#: en/git-clone.txt:332
-#, ignore-same, no-wrap, priority:300
+#, no-wrap, priority:300
msgid "$ git clone --bare -l /home/proj/.git /pub/scm/proj.git\n"
msgstr "$ git clone --bare -l /home/proj/.git /pub/scm/proj.git\n"
@@ -14144,7 +14162,7 @@ msgid "Read the commit log message from the given file. Use `-` to read from the
msgstr "Lies die Commit-Beschreibung aus der spezifizierten Datei. Mit `-` wird die Beschreibung von der Standardeingabe gelesen."
#. type: Labeled list
-#: en/git-commit-tree.txt:68 en/git-commit.txt:339
+#: en/git-commit-tree.txt:68 en/git-commit.txt:341
#, ignore-same, no-wrap, priority:280
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
@@ -14229,7 +14247,7 @@ msgid "Discussion"
msgstr "Discussion"
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:477 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:428 en/git-svn.txt:1156
+#: en/git-commit-tree.txt:114 en/git-commit.txt:479 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:429 en/git-svn.txt:1156
#, no-wrap, priority:280
msgid "FILES"
msgstr "FILES"
@@ -14547,13 +14565,13 @@ msgid "When editing the commit message, start the editor with the contents in th
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:173 en/merge-options.txt:81
+#: en/git-commit.txt:173 en/merge-options.txt:85
#, priority:280
msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:175 en/git-rebase.txt:330
+#: en/git-commit.txt:175 en/git-rebase.txt:348 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14768,100 +14786,100 @@ msgid "Show untracked files."
msgstr "'no' - zeige keine von git nicht verwalteten Dateien an\n"
#. type: Plain text
-#: en/git-commit.txt:288
+#: en/git-commit.txt:289
#, fuzzy, priority:280
#| msgid "The mode parameter is optional, and is used to specify the handling of untracked files. The possible options are:"
msgid "The mode parameter is optional (defaults to 'all'), and is used to specify the handling of untracked files; when -u is not used, the default is 'normal', i.e. show untracked files and directories."
msgstr "Der <mode> Parameter ist optional, und steuert die Behandlung der Dateien. Die m철glichen Optionen sind:"
#. type: Plain text
-#: en/git-commit.txt:290 en/git-status.txt:67 en/git-status.txt:107
+#: en/git-commit.txt:291 en/git-status.txt:68 en/git-status.txt:110
#, priority:280
msgid "The possible options are:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:292
+#: en/git-commit.txt:293
#, no-wrap, priority:280
msgid "'no' - Show no untracked files\n"
msgstr "'no' - zeige keine von git nicht verwalteten Dateien an\n"
#. type: Plain text
-#: en/git-commit.txt:293
+#: en/git-commit.txt:294
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories\n"
msgstr "'normal' - zeige unverwaltete Dateien und Verzeichnisse\n"
#. type: Plain text
-#: en/git-commit.txt:294 en/git-status.txt:71
+#: en/git-commit.txt:295 en/git-status.txt:72
#, no-wrap, priority:280
msgid "'all' - Also shows individual files in untracked directories.\n"
msgstr "'all' - zeige zus채tzlich die einzelnen Dateien in den unverwalteten Verzeichnissen\n"
#. type: Plain text
-#: en/git-commit.txt:297 en/git-status.txt:84
+#: en/git-commit.txt:298 en/git-status.txt:85
#, fuzzy, priority:280
#| msgid "The remote configuration is achieved using the `remote.origin.url` and `remote.origin.fetch` configuration variables. (See linkgit:git-config[1])."
msgid "The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]."
msgstr "The remote configuration is achieved using the `remote.origin.url` and `remote.origin.fetch` configuration variables. (See linkgit:git-config[1]). Die Konfiguration entfernter Repositories wird durch die Konfigurationsvariablen `remote.origin.url` und `remote.origin.fetch` erreicht. (Siehe linkgit:git-config[1])."
#. type: Plain text
-#: en/git-commit.txt:308
+#: en/git-commit.txt:310
#, fuzzy, priority:280
#| msgid "Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template. Note that this diff output doesn't have its lines prefixed with '#'."
msgid "Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template to help the user describe the commit by reminding what changes the commit has. Note that this diff output doesn't have its lines prefixed with '#'. This diff will not be a part of the commit message. See the `commit.verbose` configuration variable in linkgit:git-config[1]."
msgstr "Zeige den Unterschied (diff) zwischen der HEAD Eintragung und dem was eingetragen werden w체rde am Ende der Eintragungsbemerkung. Beachte: Die Zeilen der diff Ausgabe enthalten keine f체hrenden Kommentarzeichen ('#')!"
#. type: Plain text
-#: en/git-commit.txt:312
+#: en/git-commit.txt:314
#, priority:280
msgid "If specified twice, show in addition the unified diff between what would be committed and the worktree files, i.e. the unstaged changes to tracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:316
+#: en/git-commit.txt:318
#, priority:280
msgid "Suppress commit summary message."
msgstr "Unterdr체cke die zusammenfassende Nachricht 체ber die Eintragung."
#. type: Plain text
-#: en/git-commit.txt:321
+#: en/git-commit.txt:323
#, priority:280
msgid "Do not create a commit, but show a list of paths that are to be committed, paths with local changes that will be left uncommitted and paths that are untracked."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:322
+#: en/git-commit.txt:324
#, ignore-same, no-wrap, priority:280
msgid "--status"
msgstr "--status"
#. type: Plain text
-#: en/git-commit.txt:327
+#: en/git-commit.txt:329
#, priority:280
msgid "Include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the commit message. Defaults to on, but can be used to override configuration variable commit.status."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:328
+#: en/git-commit.txt:330
#, ignore-same, no-wrap, priority:280
msgid "--no-status"
msgstr "--no-status"
#. type: Plain text
-#: en/git-commit.txt:332
+#: en/git-commit.txt:334
#, priority:280
msgid "Do not include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the default commit message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:342
+#: en/git-commit.txt:344
#, priority:280
msgid "Countermand `commit.gpgSign` configuration variable that is set to force each and every commit to be signed."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:346 en/git-rm.txt:29
+#: en/git-commit.txt:348 en/git-rm.txt:29
#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "<file>..."
msgstr ""
@@ -14871,21 +14889,21 @@ msgstr ""
"<Datei>..."
#. type: Plain text
-#: en/git-commit.txt:352
+#: en/git-commit.txt:354
#, priority:280
msgid "When files are given on the command line, the command commits the contents of the named files, without recording the changes already staged. The contents of these files are also staged for the next commit on top of what have been staged before."
msgstr "Werden in der Befehlszeile Dateien angegeben, so wird der Inhalt dieser Dateien eingetragen, ohne die bereits im Index vorbereiteten 횆nderungen aufzuzeichnen. Die Dateiinhalte werden au횩erdem f체r die n채chste Eintragung im Index bereitgestellt (zus채tzlich zu den dort bereits vorbereiteten 횆nderungen)."
#. type: Plain text
-#: en/git-commit.txt:369
+#: en/git-commit.txt:371
#, fuzzy, priority:280
#| msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git-add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git reset HEAD -- <file>`, which effectively reverts 'git-add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr "Beim Aufzeichnen der eigenen Arbeit, wird der Inhalt der ver채nderten Dateien im Arbeitsbereich mit 'git add' tempor채r in einem Zwischenbereich (\"Index\" genannt) abgelegt. Die mit 'git add' vorbereiteten 횆nderungen einer Datei k철nnen mit `git reset HEAD -- <file>` wieder aus dem Index entfernt werden, ohne dadurch die Datei selbst zu ver채ndern. Nachdem die gew체nschten 횆nderungen im Index vorbereitet wurden kann dieser mit dem 'git commit' Befehl im Projektarchiv eingetragen (commited) werden. Ein Beispiel:"
#. type: delimited block -
-#: en/git-commit.txt:375
-#, ignore-same, no-wrap, priority:280
+#: en/git-commit.txt:377
+#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
"$ git rm goodbye.c\n"
@@ -14898,14 +14916,14 @@ msgstr ""
"$ git commit\n"
#. type: Plain text
-#: en/git-commit.txt:383
+#: en/git-commit.txt:385
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr "Anstatt die Dateien nach jeder 횆nderung einzeln im Index vorzubereiten kann man 'git commit' anweisen die 횆nderungen aller aktuell in git verwalteten Dateien selbst채ndig mit 'git add' und 'git rm' vorzubereiten. Wurden keine anderen Dateien im Arbeitsbereich ge채ndert, erzielt das diese Beispiel das gleiche Resultat wie das vorhergehende Beispiel:"
#. type: delimited block -
-#: en/git-commit.txt:388
-#, ignore-same, no-wrap, priority:280
+#: en/git-commit.txt:390
+#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
"$ rm goodbye.c\n"
@@ -14916,20 +14934,20 @@ msgstr ""
"$ git commit -a\n"
#. type: Plain text
-#: en/git-commit.txt:393
+#: en/git-commit.txt:395
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr "Der Befehl 'git commit -a' betrachtet zuerst den Arbeitsbereich, erkennt das hello.c ge채ndert und goodbye.c entfernt wurden, und f체hrt intern die notwendigen 'git add' und 'git rm' funktionen aus."
#. type: Plain text
-#: en/git-commit.txt:398
+#: en/git-commit.txt:400
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr "Wurden im Index 횆nderungen an mehreren Dateien vorbereitet, kann die Reihenfolge in der diese 횆nderungen eingetragen (commited) werden, durch die Angabege einzelner Dateipfade ge채ndert werden. Werden Dateipfade angegeben, tr채gt der Befehl ausschlie횩lich 횆nderungen dieser Dateien im Projektarchiv ein:"
#. type: delimited block -
-#: en/git-commit.txt:404
-#, ignore-same, no-wrap, priority:280
+#: en/git-commit.txt:406
+#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
"$ git add hello.c hello.h\n"
@@ -14942,33 +14960,33 @@ msgstr ""
"$ git commit Makefile\n"
#. type: Plain text
-#: en/git-commit.txt:411
+#: en/git-commit.txt:413
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr "Die hier erzeugte Eintragung (commit) enth채lt ausschlie횩lich die 횆nderungen der Datei 'Makefile'. Die vorbereiteten 횆nderungen an 'hello.c' und 'hello.h' sind in dieser Eintragung nicht enthalten, sie bleiben allerdings weiterhin im Index vorbereitet und gehen nicht verloren. Wird anschlie횩end der folgende Befehl aufgerufen:"
#. type: delimited block -
-#: en/git-commit.txt:414 en/git-commit.txt:440
-#, ignore-same, no-wrap, priority:280
+#: en/git-commit.txt:416 en/git-commit.txt:442
+#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr "$ git commit\n"
#. type: Plain text
-#: en/git-commit.txt:418
+#: en/git-commit.txt:420
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr "werden in einer zweiten Eintragung (commit) die 횆nderungen an 'hello.c' und 'hello.h' im Projektarchiv eingetragen."
#. type: Plain text
-#: en/git-commit.txt:426
+#: en/git-commit.txt:428
#, fuzzy, priority:280
#| msgid "After a merge (initiated by 'git-merge' or 'git-pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git-status' and after fixing them manually in your working tree, you would stage the result as usual with 'git-add':"
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr "Nach einer Zusammenf체hrung (merge, durchgef체hrt mit 'git-merge' oder 'git-pull') die Aufgrund von Konflikten abgebrochen wird, sind sauber zusammengef체hrte Pfade bereits im Index vorbereitet und k철nnten eingetragen (commited) werden. Alle Pfade mit Konflikten bleiben im nicht zusammengef체hrten Zustand. Mittels 'git status' kann 체berpr체ft werden, welche Dateipfade die Konflikte enthalten. Nachdem die Konflikte im Arbeitsbereich manuell aufgel철st wurden k철nnen die betroffenen Dateien wie gewohnt mit 'git add' im Index f체r die Eintragung vorbereitet werden:"
#. type: delimited block -
-#: en/git-commit.txt:432
-#, ignore-same, no-wrap, priority:280
+#: en/git-commit.txt:434
+#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
"unmerged: hello.c\n"
@@ -14981,58 +14999,58 @@ msgstr ""
"$ git add hello.c\n"
#. type: Plain text
-#: en/git-commit.txt:437
+#: en/git-commit.txt:439
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr "Nachdem die Konflikte aufgel철st und im Index vorbereitet wurden zeigt 'git ls-files -u' die betreffenden Dateipfade nicht mehr an. Durch 'git commit' k철nnen die 횆nderungen abschlie횩end im Projektarchiv eingetragen (commited) werden:"
#. type: Plain text
-#: en/git-commit.txt:448
+#: en/git-commit.txt:450
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr "Mann kann die '-a' Option allerdings auch einfach dazu verwenden um weniger tippen zu m체ssen. Eine Einschr채nkung besteht allerdings dahingehend, da횩 dies bei einer Zusammenf체hrung (merge) nicht verwendet werden kann, da diese mit einer einzelnen Eintragung (commit) erfolgen mu횩. Bei Verwendung der '-a' Option sind keine weiteren Pfadangaben erlaubt (Ausnahme bei gleichzeitiger Verwendung der '-i' Option)."
#. type: Plain text
-#: en/git-commit.txt:460
+#: en/git-commit.txt:462
#, fuzzy, priority:280
#| msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. Tools that turn commits into email, for example, use the first line on the Subject: line and the rest of the commit in the body."
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr "Obwohl es technisch nicht erforderlich ist, ist es eine gebr채uchlich die Eintragungsbemerkung (commit message) mit einer einzelnen kurzen Zusammenfassung (weniger als 50 Zeichen) zu beginnen, gefolgt von einer Leerzeile und weiterf체hrender Information. So k철nnen zB Werkzeuge die Eintragungen in emails verpacken die erste Zeile als Betreff und den Rest als Mailinhalt verwenden."
#. type: Title -
-#: en/git-commit.txt:464
+#: en/git-commit.txt:466
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr "ENVIRONMENT AND CONFIGURATION VARIABLES"
#. type: Plain text
-#: en/git-commit.txt:469
+#: en/git-commit.txt:471
#, fuzzy, priority:280
#| msgid "The editor used to edit the commit log message will be chosen from the GIT_EDITOR environment variable, the core.editor configuration variable, the VISUAL environment variable, or the EDITOR environment variable (in that order)."
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr "Der Editor zum Bearbeiten der Eintragungsbemerkung wird durch die GIT_EDITOR Umgebungsvariable, die core.editor Konfigurationsvariable die VISUAL Umgebungsvariable oder die EDITOR Umgebungsvariable festgelegt (in dieser Reihenfolge)."
#. type: Plain text
-#: en/git-commit.txt:475
+#: en/git-commit.txt:477
#, fuzzy, priority:280
#| msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, and `post-commit` hooks. See linkgit:githooks[5] for more information."
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr "Dieser Befehl kann die folgenden Einsprungspunkte (hooks) aufrufen: `commit-msg`, `prepare-commit-msg`, `pre-commit` und `post-commit`. Siehe linkgit:githooks[5] f체r weitere Information."
#. type: Labeled list
-#: en/git-commit.txt:479
+#: en/git-commit.txt:481
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:485
+#: en/git-commit.txt:487
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:493
+#: en/git-commit.txt:495
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -15647,7 +15665,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:286
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "~/.gitconfig"
msgstr "~/.gitconfig"
@@ -15659,7 +15677,7 @@ msgstr "Benutzerspezifische Konfigurationsdatei. Auch \"globale\" Konfigurations
#. type: Labeled list
#: en/git-config.txt:290
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "$GIT_DIR/config"
msgstr "$GIT_DIR/config"
@@ -15753,15 +15771,21 @@ msgstr "Um Optionen zu lesen: Es wird nur aus der systemweiten Datei ${prefix}/e
msgid "Given a .git/config like this:"
msgstr "Es ist eine folgende .git/config-Datei gegeben:"
-#. type: Plain text
-#: en/git-config.txt:347
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/git-config.txt:348
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "\t#\n"
+#| "\t# This is the config file, and\n"
+#| "\t# a '#' or ';' character indicates\n"
+#| "\t# a comment\n"
+#| "\t#\n"
msgid ""
-"\t#\n"
-"\t# This is the config file, and\n"
-"\t# a '#' or ';' character indicates\n"
-"\t# a comment\n"
-"\t#\n"
+"#\n"
+"# This is the config file, and\n"
+"# a '#' or ';' character indicates\n"
+"# a comment\n"
+"#\n"
msgstr ""
"\t#\n"
"\t# Dies ist die Konfigurationsdatei und\n"
@@ -15769,36 +15793,41 @@ msgstr ""
"\t# Kommentar dar.\n"
"\t#\n"
-#. type: Plain text
-#: en/git-config.txt:352
+#. type: delimited block -
+#: en/git-config.txt:353 en/git.txt:310
#, no-wrap, priority:100
msgid ""
-"\t; core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"; core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-"\t; Kernvariablen\n"
-"\t[core]\n"
-"\t\t; Vertraue den Dateimodi nicht\n"
-"\t\tfilemode = false\n"
+"; Kernvariablen\n"
+"[core]\n"
+"\t; Vertraue den Dateimodi nicht\n"
+"\tfilemode = false\n"
-#. type: Plain text
-#: en/git-config.txt:357
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/git-config.txt:358
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "\t; Our diff algorithm\n"
+#| "\t[diff]\n"
+#| "\t\texternal = /usr/local/bin/diff-wrapper\n"
+#| "\t\trenames = true\n"
msgid ""
-"\t; Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"; Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
"\t; Unser diff-Algorithmus\n"
"\t[diff]\n"
"\t\texternal = /usr/local/bin/diff-wrapper\n"
"\t\trenames = true\n"
-#. type: Plain text
-#: en/git-config.txt:362
+#. type: delimited block -
+#: en/git-config.txt:363
#, fuzzy, no-wrap, priority:100
#| msgid ""
#| "\t; Proxy settings\n"
@@ -15806,182 +15835,182 @@ msgstr ""
#| "\t\tgitproxy=\"proxy-command\" for kernel.org\n"
#| "\t\tgitproxy=default-proxy ; for all the rest\n"
msgid ""
-"\t; Proxy settings\n"
-"\t[core]\n"
-"\t\tgitproxy=proxy-command for kernel.org\n"
-"\t\tgitproxy=default-proxy ; for all the rest\n"
+"; Proxy settings\n"
+"[core]\n"
+"\tgitproxy=proxy-command for kernel.org\n"
+"\tgitproxy=default-proxy ; for all the rest\n"
msgstr ""
"\t; Proxyeinstellungen\n"
"\t[core]\n"
"\t\tgitproxy=\"proxy-Befehl\" for kernel.org\n"
"\t\tgitproxy=default-proxy ; f체r den Rest\n"
-#. type: Plain text
-#: en/git-config.txt:369
+#. type: delimited block -
+#: en/git-config.txt:370
#, no-wrap, priority:100
msgid ""
-"\t; HTTP\n"
-"\t[http]\n"
-"\t\tsslVerify\n"
-"\t[http \"https://weak.example.com\"]\n"
-"\t\tsslVerify = false\n"
-"\t\tcookieFile = /tmp/cookie.txt\n"
+"; HTTP\n"
+"[http]\n"
+"\tsslVerify\n"
+"[http \"https://weak.example.com\"]\n"
+"\tsslVerify = false\n"
+"\tcookieFile = /tmp/cookie.txt\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:371
+#: en/git-config.txt:373
#, priority:100
msgid "you can set the filemode to true with"
msgstr "Sie k철nnen den Dateimodus auf \"true\" setzen mit"
#. type: delimited block -
-#: en/git-config.txt:374
-#, ignore-same, no-wrap, priority:100
+#: en/git-config.txt:376
+#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr "% git config core.filemode true\n"
#. type: Plain text
-#: en/git-config.txt:379
+#: en/git-config.txt:381
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr "Die hypothetischen Proxybefehlseintr채ge haben ein Anh채ngel, um unterscheiden zu k철nnen, auf welche URL sie sich beziehen. Hier folgt, wie Sie den Eintrag f체r kernel.org zu \"ssh\" 채ndern."
#. type: delimited block -
-#: en/git-config.txt:382
-#, ignore-same, no-wrap, priority:100
+#: en/git-config.txt:384
+#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
#. type: Plain text
-#: en/git-config.txt:385
+#: en/git-config.txt:387
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr "Dies stellt sicher, dass nur das Schl체ssel/Wertpaar f체r kernel.org ersetzt wird."
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:389
#, priority:100
msgid "To delete the entry for renames, do"
msgstr "Um den Eintrag f체r Umbenennungen zu l철schen, verwenden Sie"
#. type: delimited block -
-#: en/git-config.txt:390
-#, ignore-same, no-wrap, priority:100
+#: en/git-config.txt:392
+#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr "% git config --unset diff.renames\n"
#. type: Plain text
-#: en/git-config.txt:394
+#: en/git-config.txt:396
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr "Falls Sie einen Eintrag f체r eine Multivar (Eine Variable mit mehreren Eintr채gen), l철schen m철chten, m체ssen Sie eine Regex f체r den Wert exakt einer Zeile angeben."
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:398
#, priority:100
msgid "To query the value for a given key, do"
msgstr "Um den Wert f체r einen gegebenen Schl체ssel abzufragen, benutzen Sie"
#. type: delimited block -
-#: en/git-config.txt:399
-#, ignore-same, no-wrap, priority:100
+#: en/git-config.txt:401
+#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr "% git config --get core.filemode\n"
#. type: Plain text
-#: en/git-config.txt:402 en/git-gui.txt:120 en/git-merge-index.txt:64
+#: en/git-config.txt:404 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr "oder"
#. type: delimited block -
-#: en/git-config.txt:405
-#, ignore-same, no-wrap, priority:100
+#: en/git-config.txt:407
+#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr "% git config core.filemode\n"
#. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:410
#, priority:100
msgid "or, to query a multivar:"
msgstr "oder, um eine Multivar abzufragen:"
#. type: delimited block -
-#: en/git-config.txt:411
-#, ignore-same, no-wrap, priority:100
+#: en/git-config.txt:413
+#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr "% git config --get core.gitproxy \"for kernel.org$\"\n"
#. type: Plain text
-#: en/git-config.txt:414
+#: en/git-config.txt:416
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr "Falls Sie alle Werte einer Multivar wissen m철chten, verwenden Sie:"
#. type: delimited block -
-#: en/git-config.txt:417
-#, ignore-same, no-wrap, priority:100
+#: en/git-config.txt:419
+#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr "% git config --get-all core.gitproxy\n"
#. type: Plain text
-#: en/git-config.txt:421
+#: en/git-config.txt:423
#, fuzzy, priority:100
#| msgid "If you like to live dangerous, you can replace *all* core.gitproxy by a new one with"
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr "Wenn Sie gerne gef채hrlich leben, k철nnen Sie *alle* core.gitproxy-Eintr채ge mit einem neuen ersetzen durch"
#. type: delimited block -
-#: en/git-config.txt:424
-#, ignore-same, no-wrap, priority:100
+#: en/git-config.txt:426
+#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr "% git config --replace-all core.gitproxy ssh\n"
#. type: Plain text
-#: en/git-config.txt:428
+#: en/git-config.txt:430
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr "Wenn Sie jedoch wirklich nur eine Zeile f체r den Standardproxy ver채ndern m철chten, beispielsweise diejenige ohne ein Anh채ngsel \"for ...\", k철nnen Sie dies so tun:"
#. type: delimited block -
-#: en/git-config.txt:431
-#, ignore-same, no-wrap, priority:100
+#: en/git-config.txt:433
+#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr "% git config core.gitproxy ssh '! for '\n"
#. type: Plain text
-#: en/git-config.txt:434
+#: en/git-config.txt:436
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr "Um wirklich die Werte mit einem Ausrufezeichen auszulesen, m체ssen Sie"
#. type: delimited block -
-#: en/git-config.txt:437
-#, ignore-same, no-wrap, priority:100
+#: en/git-config.txt:439
+#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr "% git config section.key value '[!]'\n"
#. type: Plain text
-#: en/git-config.txt:440
+#: en/git-config.txt:442
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr "Um einen neuen Proxy hinzuzuf체gen, ohne einen der anderen der bereits vorhandenen zu ver채ndern, benutzen Sie"
#. type: delimited block -
-#: en/git-config.txt:443
+#: en/git-config.txt:445
#, fuzzy, no-wrap, priority:100
#| msgid "% git config core.gitproxy '\"proxy-command\" for example.com'\n"
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr "% git config core.gitproxy '\"proxy-command\" for example.com'\n"
#. type: Plain text
-#: en/git-config.txt:447
+#: en/git-config.txt:449
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr "Ein Beispiel, um angepasste Farbe der Konfigurationsdatei in Ihrem Script zu verwenden:"
#. type: delimited block -
-#: en/git-config.txt:453
+#: en/git-config.txt:455
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15995,13 +16024,13 @@ msgstr ""
"echo \"${WS}Ihre Whitespace-Farbe oder invertiertes Blau${RESET}\"\n"
#. type: Plain text
-#: en/git-config.txt:457
+#: en/git-config.txt:459
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:466
+#: en/git-config.txt:468
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16014,19 +16043,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:471 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1029 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
+#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:476
+#: en/git-config.txt:478
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:482
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -16034,13 +16063,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:483
+#: en/git-config.txt:485
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:488
+#: en/git-config.txt:490
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -16346,7 +16375,7 @@ msgstr "Wenn nicht explizit mit '--file' ver채ndert, gibt es drei Dateien, in we
#. type: Labeled list
#: en/git-credential-store.txt:50
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "~/.git-credentials"
msgstr "~/.git-credentials"
@@ -17406,7 +17435,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
msgstr ""
#. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:234
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
#, no-wrap, priority:100
msgid "LIMITATIONS"
msgstr ""
@@ -18408,7 +18437,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:235
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "upload-pack"
msgstr "upload-pack"
@@ -18420,7 +18449,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:241
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "upload-archive"
msgstr "upload-archive"
@@ -18923,7 +18952,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:976
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:992
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19486,7 +19515,7 @@ msgid "The id of a tree object."
msgstr "SHA1 eines git-Markierungobjektes."
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:422
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:423
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr "<path>..."
@@ -19582,13 +19611,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:982
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:998
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:988
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1004
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -19775,7 +19804,7 @@ msgstr "Verschiedene M철glichkeiten den Arbeitsbereich zu testen"
#. type: delimited block -
#: en/git-diff.txt:131
-#, ignore-same, no-wrap, priority:280
+#, no-wrap, priority:280
msgid ""
"$ git diff <1>\n"
"$ git diff --cached <2>\n"
@@ -19811,7 +19840,7 @@ msgstr "Vergleich mit beliegigen Eintragungen (commits)"
#. type: delimited block -
#: en/git-diff.txt:145
-#, ignore-same, no-wrap, priority:280
+#, no-wrap, priority:280
msgid ""
"$ git diff test <1>\n"
"$ git diff HEAD -- ./test <2>\n"
@@ -19847,7 +19876,7 @@ msgstr "Versionszweige (branches) vergleichen"
#. type: delimited block -
#: en/git-diff.txt:160
-#, ignore-ellipsis, ignore-same, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git diff topic master <1>\n"
"$ git diff topic..master <2>\n"
@@ -19883,7 +19912,7 @@ msgstr "Ausgabe von 'diff' einschr채nken"
#. type: delimited block -
#: en/git-diff.txt:173
-#, ignore-same, no-wrap, priority:280
+#, no-wrap, priority:280
msgid ""
"$ git diff --diff-filter=MRC <1>\n"
"$ git diff --name-status <2>\n"
@@ -19920,7 +19949,7 @@ msgstr "Ver채ndern (munging) der 'diff'-Ausgabe"
#. type: delimited block -
#: en/git-diff.txt:186
-#, ignore-same, no-wrap, priority:280
+#, no-wrap, priority:280
msgid ""
"$ git diff --find-copies-harder -B -C <1>\n"
"$ git diff -R <2>\n"
@@ -19942,7 +19971,7 @@ msgstr "Ausgabe in umgekehrter Reihenfolge."
#. type: Plain text
#: en/git-diff.txt:200
-#, ignore-same, priority:280
+#, priority:280
msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
msgstr "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
@@ -19971,9 +20000,9 @@ msgid "This program dumps the given revisions in a form suitable to be piped int
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:22
+#: en/git-fast-export.txt:23
#, priority:100
-msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a kind of an interactive 'git filter-branch'."
+msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
@@ -20060,146 +20089,158 @@ msgstr "--import-marks=<Datei>"
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
+#. type: Labeled list
+#: en/git-fast-export.txt:79
+#, ignore-same, no-wrap, priority:100
+msgid "--mark-tags"
+msgstr "--mark-tags"
+
+#. type: Plain text
+#: en/git-fast-export.txt:87
+#, priority:100
+msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
+msgstr ""
+
#. type: Plain text
-#: en/git-fast-export.txt:83
+#: en/git-fast-export.txt:92
#, priority:100
-msgid "Any commits that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
+msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:84
+#: en/git-fast-export.txt:93
#, ignore-same, no-wrap, priority:100
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
-#: en/git-fast-export.txt:89
+#: en/git-fast-export.txt:98
#, priority:100
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:90
+#: en/git-fast-export.txt:99
#, ignore-same, no-wrap, priority:100
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
-#: en/git-fast-export.txt:93
+#: en/git-fast-export.txt:102
#, priority:100
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:94
+#: en/git-fast-export.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
-#: en/git-fast-export.txt:101
+#: en/git-fast-export.txt:110
#, priority:100
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
+#: en/git-fast-export.txt:111 en/git-ls-tree.txt:72
#, ignore-same, no-wrap, priority:100
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
-#: en/git-fast-export.txt:107
+#: en/git-fast-export.txt:116
#, priority:100
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:108
+#: en/git-fast-export.txt:117
#, ignore-same, no-wrap, priority:100
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
-#: en/git-fast-export.txt:112
+#: en/git-fast-export.txt:121
#, priority:100
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:113
+#: en/git-fast-export.txt:122
#, ignore-same, no-wrap, priority:100
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
-#: en/git-fast-export.txt:124
+#: en/git-fast-export.txt:133
#, priority:100
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:125
+#: en/git-fast-export.txt:134
#, ignore-same, no-wrap, priority:100
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
-#: en/git-fast-export.txt:131
+#: en/git-fast-export.txt:140
#, priority:100
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:132
+#: en/git-fast-export.txt:141
#, no-wrap, priority:100
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:138
+#: en/git-fast-export.txt:147
#, priority:100
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be reencoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:139
+#: en/git-fast-export.txt:148
#, ignore-same, no-wrap, priority:100
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
-#: en/git-fast-export.txt:142
+#: en/git-fast-export.txt:151
#, priority:100
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:143
+#: en/git-fast-export.txt:152
#, ignore-ellipsis, no-wrap, priority:100
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:160
#, priority:100
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:157
+#: en/git-fast-export.txt:166
#, no-wrap, priority:100
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:162
+#: en/git-fast-export.txt:171
#, priority:100
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:167
+#: en/git-fast-export.txt:176
#, no-wrap, priority:100
msgid ""
"$ git fast-export master~5..master |\n"
@@ -20208,55 +20249,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:180
#, priority:100
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:175
+#: en/git-fast-export.txt:184
#, priority:100
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
-#: en/git-fast-export.txt:178
+#: en/git-fast-export.txt:187
#, no-wrap, priority:100
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:186
+#: en/git-fast-export.txt:195
#, priority:100
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:198
+#: en/git-fast-export.txt:207
#, priority:100
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:201
+#: en/git-fast-export.txt:210
#, priority:100
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:204
+#: en/git-fast-export.txt:213
#, no-wrap, priority:100
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:209
+#: en/git-fast-export.txt:218
#, priority:100
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:215
+#: en/git-fast-export.txt:224
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git init anon-repo\n"
@@ -20266,25 +20307,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:222
+#: en/git-fast-export.txt:231
#, priority:100
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:225
+#: en/git-fast-export.txt:234
#, no-wrap, priority:100
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:240
#, priority:100
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:239
+#: en/git-fast-export.txt:248
#, priority:100
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
@@ -20519,7 +20560,7 @@ msgid "See linkgit:git-config[1]"
msgstr "linkgit:git-add[1]"
#. type: Title -
-#: en/git-fast-import.txt:144 en/git-p4.txt:507
+#: en/git-fast-import.txt:144 en/git-filter-branch.txt:463 en/git-p4.txt:507
#, no-wrap, priority:100
msgid "PERFORMANCE"
msgstr ""
@@ -20760,7 +20801,7 @@ msgid "fast-import accepts several commands to update the current repository and
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:319 en/git-fast-import.txt:381
+#: en/git-fast-import.txt:319 en/git-fast-import.txt:388
#, ignore-same, no-wrap, priority:100
msgid "`commit`"
msgstr "`commit`"
@@ -20772,7 +20813,7 @@ msgid "Creates a new branch or updates an existing branch by creating a new comm
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:324 en/git-fast-import.txt:771
+#: en/git-fast-import.txt:324 en/git-fast-import.txt:778
#, ignore-same, no-wrap, priority:100
msgid "`tag`"
msgstr "`tag`"
@@ -20784,7 +20825,7 @@ msgid "Creates an annotated tag object from an existing commit or branch. Light
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:330 en/git-fast-import.txt:815
+#: en/git-fast-import.txt:330 en/git-fast-import.txt:823
#, ignore-same, no-wrap, priority:100
msgid "`reset`"
msgstr "`reset`"
@@ -20796,7 +20837,7 @@ msgid "Reset an existing branch (or a new branch) to a specific revision. This
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:335 en/git-fast-import.txt:844
+#: en/git-fast-import.txt:335 en/git-fast-import.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`blob`"
msgstr "`blob`"
@@ -20808,109 +20849,121 @@ msgid "Convert raw file data into a blob, for future use in a `commit` command.
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:340 en/git-fast-import.txt:917
+#: en/git-fast-import.txt:340 en/git-fast-import.txt:925
+#, ignore-same, no-wrap, priority:100
+msgid "`alias`"
+msgstr "`alias`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:346
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
+msgstr ""
+
+#. type: Title ~
+#: en/git-fast-import.txt:347 en/git-fast-import.txt:940
#, ignore-same, no-wrap, priority:100
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
-#: en/git-fast-import.txt:345
+#: en/git-fast-import.txt:352
#, priority:100
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:346 en/git-fast-import.txt:945
+#: en/git-fast-import.txt:353 en/git-fast-import.txt:968
#, ignore-same, no-wrap, priority:100
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
-#: en/git-fast-import.txt:350
+#: en/git-fast-import.txt:357
#, priority:100
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:351 en/git-fast-import.txt:1152
+#: en/git-fast-import.txt:358 en/git-fast-import.txt:1175
#, ignore-same, no-wrap, priority:100
msgid "`done`"
msgstr "`done`"
#. type: Plain text
-#: en/git-fast-import.txt:355
+#: en/git-fast-import.txt:362
#, priority:100
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:356 en/git-fast-import.txt:970
+#: en/git-fast-import.txt:363 en/git-fast-import.txt:993
#, ignore-same, no-wrap, priority:100
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
-#: en/git-fast-import.txt:360
+#: en/git-fast-import.txt:367
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:361 en/git-fast-import.txt:985
+#: en/git-fast-import.txt:368 en/git-fast-import.txt:1008
#, ignore-same, no-wrap, priority:100
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
-#: en/git-fast-import.txt:365
+#: en/git-fast-import.txt:372
#, priority:100
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:366 en/git-fast-import.txt:1016
+#: en/git-fast-import.txt:373 en/git-fast-import.txt:1039
#, ignore-same, no-wrap, priority:100
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
-#: en/git-fast-import.txt:370
+#: en/git-fast-import.txt:377
#, priority:100
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:371 en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:378 en/git-fast-import.txt:1092
#, ignore-same, no-wrap, priority:100
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
#, priority:100
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:1124
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:1147
#, ignore-same, no-wrap, priority:100
msgid "`option`"
msgstr "`option`"
#. type: Plain text
-#: en/git-fast-import.txt:379
+#: en/git-fast-import.txt:386
#, priority:100
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:384
+#: en/git-fast-import.txt:391
#, priority:100
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
#, no-wrap, priority:100
msgid ""
"\t'commit' SP <ref> LF\n"
@@ -20921,247 +20974,247 @@ msgid ""
"\t('encoding' SP <encoding>)?\n"
"\tdata\n"
"\t('from' SP <commit-ish> LF)?\n"
-"\t('merge' SP <commit-ish> LF)?\n"
+"\t('merge' SP <commit-ish> LF)*\n"
"\t(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*\n"
"\tLF?\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:405
+#: en/git-fast-import.txt:412
#, priority:100
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:411
+#: en/git-fast-import.txt:418
#, priority:100
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:417
+#: en/git-fast-import.txt:424
#, priority:100
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:425
+#: en/git-fast-import.txt:432
#, priority:100
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:432
+#: en/git-fast-import.txt:439
#, priority:100
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:434
+#: en/git-fast-import.txt:441
#, ignore-same, no-wrap, priority:100
msgid "`author`"
msgstr "`author`"
#. type: Plain text
-#: en/git-fast-import.txt:440
+#: en/git-fast-import.txt:447
#, priority:100
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:442
+#: en/git-fast-import.txt:449
#, ignore-same, no-wrap, priority:100
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
-#: en/git-fast-import.txt:445
+#: en/git-fast-import.txt:452
#, priority:100
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
#, priority:100
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:458
+#: en/git-fast-import.txt:465
#, priority:100
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:460
+#: en/git-fast-import.txt:467
#, ignore-same, no-wrap, priority:100
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
-#: en/git-fast-import.txt:464
+#: en/git-fast-import.txt:471
#, priority:100
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:466
+#: en/git-fast-import.txt:473
#, ignore-same, no-wrap, priority:100
msgid "`from`"
msgstr "`from`"
#. type: Plain text
-#: en/git-fast-import.txt:472
+#: en/git-fast-import.txt:479
#, priority:100
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
#, priority:100
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:485
+#: en/git-fast-import.txt:492
#, priority:100
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
#, priority:100
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:491
+#: en/git-fast-import.txt:498
#, priority:100
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:493
+#: en/git-fast-import.txt:500
#, priority:100
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:499
+#: en/git-fast-import.txt:506
#, priority:100
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:501
+#: en/git-fast-import.txt:508
#, priority:100
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:503
+#: en/git-fast-import.txt:510
#, priority:100
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
#, priority:100
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:509
+#: en/git-fast-import.txt:516
#, priority:100
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:512
+#: en/git-fast-import.txt:519
#, priority:100
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
#, no-wrap, priority:100
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:521
+#: en/git-fast-import.txt:528
#, priority:100
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:523
+#: en/git-fast-import.txt:530
#, ignore-same, no-wrap, priority:100
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
-#: en/git-fast-import.txt:531
+#: en/git-fast-import.txt:538
#, priority:100
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:534
+#: en/git-fast-import.txt:541
#, priority:100
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:536
+#: en/git-fast-import.txt:543
#, ignore-same, no-wrap, priority:100
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:540
+#: en/git-fast-import.txt:547
#, priority:100
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:541 en/git-fast-import.txt:708
+#: en/git-fast-import.txt:548 en/git-fast-import.txt:715
#, no-wrap, priority:100
msgid "External data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:544
+#: en/git-fast-import.txt:551
#, priority:100
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:547
+#: en/git-fast-import.txt:554
#, no-wrap, priority:100
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
#, priority:100
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:555 en/git-fast-import.txt:721
+#: en/git-fast-import.txt:562 en/git-fast-import.txt:728
#, no-wrap, priority:100
msgid "Inline data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:559
+#: en/git-fast-import.txt:566
#, priority:100
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
#, no-wrap, priority:100
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -21169,259 +21222,259 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:566 en/git-fast-import.txt:732
+#: en/git-fast-import.txt:573 en/git-fast-import.txt:739
#, priority:100
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:569
+#: en/git-fast-import.txt:576
#, priority:100
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
#, priority:100
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:574
+#: en/git-fast-import.txt:581
#, priority:100
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:575
+#: en/git-fast-import.txt:582
#, priority:100
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
#, priority:100
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:580
+#: en/git-fast-import.txt:587
#, priority:100
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:583
+#: en/git-fast-import.txt:590
#, priority:100
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:587
+#: en/git-fast-import.txt:594
#, priority:100
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:594
+#: en/git-fast-import.txt:601
#, priority:100
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
#, priority:100
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:598
+#: en/git-fast-import.txt:605
#, priority:100
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:599
+#: en/git-fast-import.txt:606
#, priority:100
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:600
+#: en/git-fast-import.txt:607
#, priority:100
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:602
+#: en/git-fast-import.txt:609
#, priority:100
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:604
+#: en/git-fast-import.txt:611
#, priority:100
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:606
+#: en/git-fast-import.txt:613
#, priority:100
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:608
+#: en/git-fast-import.txt:615
#, ignore-same, no-wrap, priority:100
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
-#: en/git-fast-import.txt:614
+#: en/git-fast-import.txt:621
#, priority:100
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
#, no-wrap, priority:100
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
#, priority:100
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:624
+#: en/git-fast-import.txt:631
#, ignore-same, no-wrap, priority:100
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
#, priority:100
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:632
+#: en/git-fast-import.txt:639
#, no-wrap, priority:100
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:638 en/git-fast-import.txt:658
+#: en/git-fast-import.txt:645 en/git-fast-import.txt:665
#, priority:100
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:643
+#: en/git-fast-import.txt:650
#, priority:100
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:645
+#: en/git-fast-import.txt:652
#, ignore-same, no-wrap, priority:100
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
-#: en/git-fast-import.txt:649
+#: en/git-fast-import.txt:656
#, priority:100
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:652
+#: en/git-fast-import.txt:659
#, no-wrap, priority:100
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:663
+#: en/git-fast-import.txt:670
#, priority:100
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:672
+#: en/git-fast-import.txt:679
#, priority:100
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
-#: en/git-fast-import.txt:679
+#: en/git-fast-import.txt:686
#, priority:100
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:682
+#: en/git-fast-import.txt:689
#, no-wrap, priority:100
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:688
+#: en/git-fast-import.txt:695
#, priority:100
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:696
+#: en/git-fast-import.txt:703
#, priority:100
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:698
+#: en/git-fast-import.txt:705
#, ignore-same, no-wrap, priority:100
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:707
+#: en/git-fast-import.txt:714
#, priority:100
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:712
+#: en/git-fast-import.txt:719
#, priority:100
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:715
+#: en/git-fast-import.txt:722
#, no-wrap, priority:100
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:720
+#: en/git-fast-import.txt:727
#, priority:100
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:725
+#: en/git-fast-import.txt:732
#, priority:100
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:729
+#: en/git-fast-import.txt:736
#, no-wrap, priority:100
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -21429,76 +21482,77 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:735
+#: en/git-fast-import.txt:742
#, priority:100
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:737
+#: en/git-fast-import.txt:744
#, ignore-same, no-wrap, priority:100
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
-#: en/git-fast-import.txt:743
+#: en/git-fast-import.txt:750
#, priority:100
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:746
+#: en/git-fast-import.txt:753
#, no-wrap, priority:100
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:752
+#: en/git-fast-import.txt:759
#, priority:100
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:756
+#: en/git-fast-import.txt:763
#, priority:100
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:758
+#: en/git-fast-import.txt:765
#, ignore-same, no-wrap, priority:100
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
-#: en/git-fast-import.txt:763
+#: en/git-fast-import.txt:770
#, priority:100
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:766
+#: en/git-fast-import.txt:773
#, no-wrap, priority:100
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:769
+#: en/git-fast-import.txt:776
#, priority:100
msgid "where `<object-identifer>` is any string not containing LF."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:774
+#: en/git-fast-import.txt:781
#, priority:100
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:781
+#: en/git-fast-import.txt:789
#, no-wrap, priority:100
msgid ""
"\t'tag' SP <name> LF\n"
+"\tmark?\n"
"\t'from' SP <commit-ish> LF\n"
"\toriginal-oid?\n"
"\t'tagger' (SP <name>)? SP LT <email> GT SP <when> LF\n"
@@ -21506,55 +21560,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:784
+#: en/git-fast-import.txt:792
#, priority:100
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:789
+#: en/git-fast-import.txt:797
#, priority:100
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:793
+#: en/git-fast-import.txt:801
#, priority:100
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:796
+#: en/git-fast-import.txt:804
#, priority:100
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:799
+#: en/git-fast-import.txt:807
#, priority:100
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:813
#, priority:100
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:813
+#: en/git-fast-import.txt:821
#, priority:100
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:820
+#: en/git-fast-import.txt:828
#, priority:100
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:825
+#: en/git-fast-import.txt:833
#, no-wrap, priority:100
msgid ""
"\t'reset' SP <ref> LF\n"
@@ -21563,25 +21617,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:829
+#: en/git-fast-import.txt:837
#, priority:100
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:831 en/git-fast-import.txt:943
+#: en/git-fast-import.txt:839 en/git-fast-import.txt:966
#, priority:100
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:834
+#: en/git-fast-import.txt:842
#, priority:100
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:838
+#: en/git-fast-import.txt:846
#, no-wrap, priority:100
msgid ""
"\treset refs/tags/938\n"
@@ -21589,19 +21643,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:850
#, priority:100
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:849
+#: en/git-fast-import.txt:857
#, priority:100
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:855
+#: en/git-fast-import.txt:863
#, no-wrap, priority:100
msgid ""
"\t'blob' LF\n"
@@ -21611,43 +21665,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:861
+#: en/git-fast-import.txt:869
#, priority:100
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:871
#, ignore-same, no-wrap, priority:100
msgid "`data`"
msgstr "`data`"
#. type: Plain text
-#: en/git-fast-import.txt:870
+#: en/git-fast-import.txt:878
#, priority:100
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:875
+#: en/git-fast-import.txt:883
#, priority:100
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:876
+#: en/git-fast-import.txt:884
#, no-wrap, priority:100
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:878
+#: en/git-fast-import.txt:886
#, priority:100
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:882
+#: en/git-fast-import.txt:890
#, no-wrap, priority:100
msgid ""
"\t'data' SP <count> LF\n"
@@ -21655,31 +21709,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:888
+#: en/git-fast-import.txt:896
#, priority:100
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:893
+#: en/git-fast-import.txt:901
#, priority:100
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:894
+#: en/git-fast-import.txt:902
#, no-wrap, priority:100
msgid "Delimited format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:899
+#: en/git-fast-import.txt:907
#, priority:100
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:905
+#: en/git-fast-import.txt:913
#, no-wrap, priority:100
msgid ""
"\t'data' SP '<<' <delim> LF\n"
@@ -21689,25 +21743,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:921
#, priority:100
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:915
+#: en/git-fast-import.txt:923
#, priority:100
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:920
+#: en/git-fast-import.txt:928
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object."
+msgstr ""
+
+#. type: delimited block .
+#: en/git-fast-import.txt:934
+#, no-wrap, priority:100
+msgid ""
+"\t'alias' LF\n"
+"\tmark\n"
+"\t'to' SP <commit-ish> LF\n"
+"\tLF?\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:937
+#, priority:100
+msgid "For a detailed description of `<commit-ish>` see above under `from`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:943
#, priority:100
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:924
+#: en/git-fast-import.txt:947
#, no-wrap, priority:100
msgid ""
"\t'checkpoint' LF\n"
@@ -21715,31 +21791,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:930
+#: en/git-fast-import.txt:953
#, priority:100
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:935
+#: en/git-fast-import.txt:958
#, priority:100
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:941
+#: en/git-fast-import.txt:964
#, priority:100
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:950
+#: en/git-fast-import.txt:973
#, priority:100
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:954
+#: en/git-fast-import.txt:977
#, no-wrap, priority:100
msgid ""
"\t'progress' SP <any> LF\n"
@@ -21747,67 +21823,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:960
+#: en/git-fast-import.txt:983
#, priority:100
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:986
#, no-wrap, priority:100
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:968
+#: en/git-fast-import.txt:991
#, priority:100
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:976
+#: en/git-fast-import.txt:999
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:979
+#: en/git-fast-import.txt:1002
#, no-wrap, priority:100
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:983 en/git-fast-import.txt:1014 en/git-fast-import.txt:1067
+#: en/git-fast-import.txt:1006 en/git-fast-import.txt:1037 en/git-fast-import.txt:1090
#, priority:100
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:991
+#: en/git-fast-import.txt:1014
#, priority:100
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:994
+#: en/git-fast-import.txt:1017
#, no-wrap, priority:100
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1022
#, priority:100
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:1024
#, priority:100
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1005
+#: en/git-fast-import.txt:1028
#, no-wrap, priority:100
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21815,286 +21891,286 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1011
+#: en/git-fast-import.txt:1034
#, priority:100
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1022
+#: en/git-fast-import.txt:1045
#, priority:100
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1025
+#: en/git-fast-import.txt:1048
#, priority:100
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1049
#, no-wrap, priority:100
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1030
+#: en/git-fast-import.txt:1053
#, priority:100
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1033
+#: en/git-fast-import.txt:1056
#, no-wrap, priority:100
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1035
+#: en/git-fast-import.txt:1058
#, no-wrap, priority:100
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1041
+#: en/git-fast-import.txt:1064
#, priority:100
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1044
+#: en/git-fast-import.txt:1067
#, no-wrap, priority:100
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1047
+#: en/git-fast-import.txt:1070
#, priority:100
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1072
#, priority:100
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1075
#, no-wrap, priority:100
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1080
#, priority:100
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1060
+#: en/git-fast-import.txt:1083
#, priority:100
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1086
#, no-wrap, priority:100
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1072
+#: en/git-fast-import.txt:1095
#, priority:100
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1075
+#: en/git-fast-import.txt:1098
#, no-wrap, priority:100
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1078
+#: en/git-fast-import.txt:1101
#, priority:100
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1079 en/git-fast-import.txt:1146
+#: en/git-fast-import.txt:1102 en/git-fast-import.txt:1169
#, no-wrap, priority:100
msgid "date-format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1080 en/git-fast-import.txt:1148
+#: en/git-fast-import.txt:1103 en/git-fast-import.txt:1171
#, no-wrap, priority:100
msgid "export-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1081
+#: en/git-fast-import.txt:1104
#, no-wrap, priority:100
msgid "relative-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1082
+#: en/git-fast-import.txt:1105
#, fuzzy, no-wrap, priority:100
msgid "no-relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
-#: en/git-fast-import.txt:1083 en/git-fast-import.txt:1150
+#: en/git-fast-import.txt:1106 en/git-fast-import.txt:1173
#, fuzzy, no-wrap, priority:100
#| msgid "--force"
msgid "force"
msgstr "--force"
#. type: Plain text
-#: en/git-fast-import.txt:1087
+#: en/git-fast-import.txt:1110
#, priority:100
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1088 en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1111 en/git-fast-import.txt:1170
#, no-wrap, priority:100
msgid "import-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1089
+#: en/git-fast-import.txt:1112
#, no-wrap, priority:100
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1097
+#: en/git-fast-import.txt:1120
#, priority:100
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1098
+#: en/git-fast-import.txt:1121
#, fuzzy, no-wrap, priority:100
msgid "get-mark"
msgstr "`get-mark`"
#. type: Labeled list
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1122
#, fuzzy, no-wrap, priority:100
msgid "cat-blob"
msgstr "`cat-blob`"
#. type: Labeled list
-#: en/git-fast-import.txt:1100
+#: en/git-fast-import.txt:1123
#, no-wrap, priority:100
msgid "ls"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1108
+#: en/git-fast-import.txt:1131
#, priority:100
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1109
+#: en/git-fast-import.txt:1132
#, fuzzy, no-wrap, priority:100
#| msgid "Notes"
msgid "notes"
msgstr "Notes"
#. type: Plain text
-#: en/git-fast-import.txt:1114
+#: en/git-fast-import.txt:1137
#, priority:100
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1138
#, no-wrap, priority:100
msgid "done"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1122
+#: en/git-fast-import.txt:1145
#, priority:100
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1129
+#: en/git-fast-import.txt:1152
#, priority:100
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1132
+#: en/git-fast-import.txt:1155
#, no-wrap, priority:100
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1137
+#: en/git-fast-import.txt:1160
#, priority:100
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1141
+#: en/git-fast-import.txt:1164
#, priority:100
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1144
+#: en/git-fast-import.txt:1167
#, priority:100
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1149
+#: en/git-fast-import.txt:1172
#, priority:100
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1178
#, priority:100
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1159
+#: en/git-fast-import.txt:1182
#, priority:100
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1161
+#: en/git-fast-import.txt:1184
#, fuzzy, no-wrap, priority:100
#| msgid "COMMANDS"
msgid "RESPONSES TO COMMANDS"
msgstr "COMMANDS"
#. type: Plain text
-#: en/git-fast-import.txt:1168
+#: en/git-fast-import.txt:1191
#, priority:100
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1175
+#: en/git-fast-import.txt:1198
#, priority:100
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1203
#, no-wrap, priority:100
msgid ""
"\tmkfifo fast-import-output\n"
@@ -22103,49 +22179,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1184
+#: en/git-fast-import.txt:1207
#, priority:100
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1188
+#: en/git-fast-import.txt:1211
#, priority:100
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1213
#, no-wrap, priority:100
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1196
+#: en/git-fast-import.txt:1219
#, priority:100
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1203
+#: en/git-fast-import.txt:1226
#, priority:100
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1211
+#: en/git-fast-import.txt:1234
#, priority:100
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1236
#, priority:100
msgid "An example crash:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1229
+#: en/git-fast-import.txt:1252
#, no-wrap, priority:100
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
@@ -22165,7 +22241,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1256
#, no-wrap, priority:100
msgid ""
"\t$ git fast-import <in\n"
@@ -22174,7 +22250,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1239
+#: en/git-fast-import.txt:1262
#, no-wrap, priority:100
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
@@ -22185,13 +22261,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1241
+#: en/git-fast-import.txt:1264
#, no-wrap, priority:100
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1251
+#: en/git-fast-import.txt:1274
#, no-wrap, priority:100
msgid ""
"\tMost Recent Commands Before Crash\n"
@@ -22206,13 +22282,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1252
+#: en/git-fast-import.txt:1275
#, no-wrap, priority:100
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1255
+#: en/git-fast-import.txt:1278
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
@@ -22220,25 +22296,25 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1256
+#: en/git-fast-import.txt:1279
#, no-wrap, priority:100
msgid "active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1259
+#: en/git-fast-import.txt:1282
#, priority:100
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1260
+#: en/git-fast-import.txt:1283
#, priority:100
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1264
+#: en/git-fast-import.txt:1287
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
@@ -22247,7 +22323,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1270
+#: en/git-fast-import.txt:1293
#, no-wrap, priority:100
msgid ""
"status : active loaded dirty\n"
@@ -22259,309 +22335,309 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1274
+#: en/git-fast-import.txt:1297
#, priority:100
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1277
+#: en/git-fast-import.txt:1300
#, no-wrap, priority:100
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1280
+#: en/git-fast-import.txt:1303
#, priority:100
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1282
+#: en/git-fast-import.txt:1305
#, no-wrap, priority:100
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1290
+#: en/git-fast-import.txt:1313
#, priority:100
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1294
+#: en/git-fast-import.txt:1317
#, priority:100
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1296
+#: en/git-fast-import.txt:1319
#, no-wrap, priority:100
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1301
+#: en/git-fast-import.txt:1324
#, priority:100
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1305
+#: en/git-fast-import.txt:1328
#, priority:100
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1307
+#: en/git-fast-import.txt:1330
#, no-wrap, priority:100
msgid "Handling Renames"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1312
+#: en/git-fast-import.txt:1335
#, priority:100
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1337
#, no-wrap, priority:100
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1341
#, priority:100
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1325
+#: en/git-fast-import.txt:1348
#, priority:100
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1331
+#: en/git-fast-import.txt:1354
#, priority:100
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1337
+#: en/git-fast-import.txt:1360
#, priority:100
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1363
#, priority:100
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1342
+#: en/git-fast-import.txt:1365
#, no-wrap, priority:100
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1346
+#: en/git-fast-import.txt:1369
#, priority:100
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1353
+#: en/git-fast-import.txt:1376
#, priority:100
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1358
+#: en/git-fast-import.txt:1381
#, priority:100
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1360
+#: en/git-fast-import.txt:1383
#, no-wrap, priority:100
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1367
+#: en/git-fast-import.txt:1390
#, priority:100
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1369
+#: en/git-fast-import.txt:1392
#, no-wrap, priority:100
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1399
#, priority:100
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1379
+#: en/git-fast-import.txt:1402
#, no-wrap, priority:100
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1385
+#: en/git-fast-import.txt:1408
#, priority:100
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1393
+#: en/git-fast-import.txt:1416
#, priority:100
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1423
#, priority:100
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1407
+#: en/git-fast-import.txt:1430
#, priority:100
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1415
+#: en/git-fast-import.txt:1438
#, priority:100
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1417
+#: en/git-fast-import.txt:1440
#, no-wrap, priority:100
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1423
+#: en/git-fast-import.txt:1446
#, priority:100
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1448
#, no-wrap, priority:100
msgid "per object"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1432
+#: en/git-fast-import.txt:1455
#, priority:100
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1438
+#: en/git-fast-import.txt:1461
#, priority:100
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1440
+#: en/git-fast-import.txt:1463
#, no-wrap, priority:100
msgid "per mark"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1446
+#: en/git-fast-import.txt:1469
#, priority:100
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1448
+#: en/git-fast-import.txt:1471
#, fuzzy, no-wrap, priority:100
#| msgid "<newbranch>"
msgid "per branch"
msgstr "<newbranch>"
#. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1474
#, priority:100
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1457
+#: en/git-fast-import.txt:1480
#, priority:100
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1464
+#: en/git-fast-import.txt:1487
#, priority:100
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1468
+#: en/git-fast-import.txt:1491
#, priority:100
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1496
#, priority:100
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1498
#, fuzzy, no-wrap, priority:100
#| msgid "Interactive mode"
msgid "per active tree"
msgstr "Interaktiver Modus"
#. type: Plain text
-#: en/git-fast-import.txt:1480
+#: en/git-fast-import.txt:1503
#, priority:100
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1482
+#: en/git-fast-import.txt:1505
#, no-wrap, priority:100
msgid "per active file entry"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1488
+#: en/git-fast-import.txt:1511
#, priority:100
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1493
+#: en/git-fast-import.txt:1516
#, priority:100
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1495
+#: en/git-fast-import.txt:1518
#, no-wrap, priority:100
msgid "SIGNALS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1501
+#: en/git-fast-import.txt:1524
#, priority:100
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -23132,7 +23208,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1041
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -23164,7 +23240,7 @@ msgstr "Auflisten oder L철schen (wenn die '-d' Option gleichzeitig verwendet wir
#. type: delimited block -
#: en/git-fetch.txt:248
-#, ignore-same, no-wrap, priority:220
+#, no-wrap, priority:220
msgid "$ git fetch origin\n"
msgstr "$ git fetch origin\n"
@@ -23257,20 +23333,32 @@ msgid ""
"\t[--state-branch <branch>] [--] [<rev-list options>...]\n"
msgstr ""
+#. type: Title -
+#: en/git-filter-branch.txt:20
+#, no-wrap, priority:100
+msgid "WARNING"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:31
+#, priority:100
+msgid "'git filter-branch' has a plethora of pitfalls that can produce non-obvious manglings of the intended history rewrite (and can leave you with little time to investigate such problems since it has such abysmal performance). These safety and performance issues cannot be backward compatibly fixed and as such, its use is not recommended. Please use an alternative history filtering tool such as https://github.com/newren/git-filter-repo/[git filter-repo]. If you still need to use 'git filter-branch', please carefully read <<SAFETY>> (and <<PERFORMANCE>>) to learn about the land mines of filter-branch, and then vigilantly avoid as many of the hazards listed there as reasonably possible."
+msgstr ""
+
#. type: Plain text
-#: en/git-filter-branch.txt:27
+#: en/git-filter-branch.txt:40
#, priority:100
msgid "Lets you rewrite Git revision history by rewriting the branches mentioned in the <rev-list options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge information) will be preserved."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:34
+#: en/git-filter-branch.txt:47
#, priority:100
msgid "The command will only rewrite the _positive_ refs mentioned in the command line (e.g. if you pass 'a..b', only 'b' will be rewritten). If you specify no filters, the commits will be recommitted without any changes, which would normally have no effect. Nevertheless, this may be useful in the future for compensating for some Git bugs or such, therefore such a usage is permitted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:39
+#: en/git-filter-branch.txt:52
#, no-wrap, priority:100
msgid ""
"*NOTE*: This command honors `.git/info/grafts` file and refs in\n"
@@ -23280,7 +23368,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:48
+#: en/git-filter-branch.txt:61
#, no-wrap, priority:100
msgid ""
"*WARNING*! The rewritten history will have different object names for all\n"
@@ -23294,340 +23382,340 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:52
+#: en/git-filter-branch.txt:65
#, priority:100
msgid "Always verify that the rewritten version is correct: The original refs, if different from the rewritten ones, will be stored in the namespace 'refs/original/'."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:56
+#: en/git-filter-branch.txt:69
#, priority:100
msgid "Note that since this operation is very I/O expensive, it might be a good idea to redirect the temporary directory off-disk with the `-d` option, e.g. on tmpfs. Reportedly the speedup is very noticeable."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:59
+#: en/git-filter-branch.txt:72
#, no-wrap, priority:100
msgid "Filters"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:71
+#: en/git-filter-branch.txt:84
#, priority:100
msgid "The filters are applied in the order as listed below. The <command> argument is always evaluated in the shell context using the 'eval' command (with the notable exception of the commit filter, for technical reasons). Prior to that, the `$GIT_COMMIT` environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, and GIT_COMMITTER_DATE are taken from the current commit and exported to the environment, in order to affect the author and committer identities of the replacement commit created by linkgit:git-commit-tree[1] after the filters have run."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:74
+#: en/git-filter-branch.txt:87
#, priority:100
msgid "If any evaluation of <command> returns a non-zero exit status, the whole operation will be aborted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:80
+#: en/git-filter-branch.txt:93
#, priority:100
msgid "A 'map' function is available that takes an \"original sha1 id\" argument and outputs a \"rewritten sha1 id\" if the commit has been already rewritten, and \"original sha1 id\" otherwise; the 'map' function can return several ids on separate lines if your commit filter emitted multiple commits."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:85
+#: en/git-filter-branch.txt:98
#, fuzzy, no-wrap, priority:100
#| msgid "-C <commit>"
msgid "--setup <command>"
msgstr "-C <commit>"
#. type: Plain text
-#: en/git-filter-branch.txt:91
+#: en/git-filter-branch.txt:104
#, priority:100
msgid "This is not a real filter executed for each commit but a one time setup just before the loop. Therefore no commit-specific variables are defined yet. Functions or variables defined here can be used or modified in the following filter steps except the commit filter, for technical reasons."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:92
+#: en/git-filter-branch.txt:105
#, no-wrap, priority:100
msgid "--subdirectory-filter <directory>"
msgstr "--subdirectory-filter <Verzeichnis>"
#. type: Plain text
-#: en/git-filter-branch.txt:96
+#: en/git-filter-branch.txt:109
#, priority:100
msgid "Only look at the history which touches the given subdirectory. The result will contain that directory (and only that) as its project root. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:97
+#: en/git-filter-branch.txt:110
#, no-wrap, priority:100
msgid "--env-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:102
+#: en/git-filter-branch.txt:115
#, priority:100
msgid "This filter may be used if you only need to modify the environment in which the commit will be performed. Specifically, you might want to rewrite the author/committer name/email/time environment variables (see linkgit:git-commit-tree[1] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:103
+#: en/git-filter-branch.txt:116
#, no-wrap, priority:100
msgid "--tree-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:110
+#: en/git-filter-branch.txt:123
#, priority:100
msgid "This is the filter for rewriting the tree and its contents. The argument is evaluated in shell with the working directory set to the root of the checked out tree. The new tree is then used as-is (new files are auto-added, disappeared files are auto-removed - neither .gitignore files nor any other ignore rules *HAVE ANY EFFECT*!)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:111
+#: en/git-filter-branch.txt:124
#, no-wrap, priority:100
msgid "--index-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:117
+#: en/git-filter-branch.txt:130
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the index. It is similar to the tree filter but does not check out the tree, which makes it much faster. Frequently used with `git rm --cached --ignore-unmatch ...`, see EXAMPLES below. For hairy cases, see linkgit:git-update-index[1]."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:118
+#: en/git-filter-branch.txt:131
#, no-wrap, priority:100
msgid "--parent-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:125
+#: en/git-filter-branch.txt:138
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the commit's parent list. It will receive the parent string on stdin and shall output the new parent string on stdout. The parent string is in the format described in linkgit:git-commit-tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and \"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:126
+#: en/git-filter-branch.txt:139
#, no-wrap, priority:100
msgid "--msg-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:131
+#: en/git-filter-branch.txt:144
#, priority:100
msgid "This is the filter for rewriting the commit messages. The argument is evaluated in the shell with the original commit message on standard input; its standard output is used as the new commit message."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:132
+#: en/git-filter-branch.txt:145
#, no-wrap, priority:100
msgid "--commit-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:138
+#: en/git-filter-branch.txt:151
#, ignore-ellipsis, priority:100
msgid "This is the filter for performing the commit. If this filter is specified, it will be called instead of the 'git commit-tree' command, with arguments of the form \"<TREE_ID> [(-p <PARENT_COMMIT_ID>)...]\" and the log message on stdin. The commit id is expected on stdout."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:142
+#: en/git-filter-branch.txt:155
#, priority:100
msgid "As a special extension, the commit filter may emit multiple commit ids; in that case, the rewritten children of the original commit will have all of them as parents."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:147
+#: en/git-filter-branch.txt:160
#, priority:100
msgid "You can use the 'map' convenience function in this filter, and other convenience functions, too. For example, calling 'skip_commit \"$@\"' will leave out the current commit (but not its changes! If you want that, use 'git rebase' instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:151
+#: en/git-filter-branch.txt:164
#, priority:100
msgid "You can also use the `git_commit_non_empty_tree \"$@\"` instead of `git commit-tree \"$@\"` if you don't wish to keep commits with a single parent and that makes no change to the tree."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:152
+#: en/git-filter-branch.txt:165
#, no-wrap, priority:100
msgid "--tag-name-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:158
+#: en/git-filter-branch.txt:171
#, priority:100
msgid "This is the filter for rewriting tag names. When passed, it will be called for every tag ref that points to a rewritten object (or to a tag object which points to a rewritten object). The original tag name is passed via standard input, and the new tag name is expected on standard output."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:163
+#: en/git-filter-branch.txt:176
#, priority:100
msgid "The original tags are not deleted, but can be overwritten; use \"--tag-name-filter cat\" to simply update the tags. In this case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:174
+#: en/git-filter-branch.txt:187
#, priority:100
msgid "Nearly proper rewriting of tag objects is supported. If the tag has a message attached, a new tag object will be created with the same message, author, and timestamp. If the tag has a signature attached, the signature will be stripped. It is by definition impossible to preserve signatures. The reason this is \"nearly\" proper, is because ideally if the tag did not change (points to the same object, has the same name, etc.) it should retain any signature. That is not the case, signatures will always be removed, buyer beware. There is also no support for changing the author or timestamp (or the tag message for that matter). Tags which point to other tags will be rewritten to point to the underlying commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:175
+#: en/git-filter-branch.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--prune-empty"
msgstr "--prune-empty"
#. type: Plain text
-#: en/git-filter-branch.txt:182
+#: en/git-filter-branch.txt:195
#, priority:100
msgid "Some filters will generate empty commits that leave the tree untouched. This option instructs git-filter-branch to remove such commits if they have exactly one or zero non-pruned parents; merge commits will therefore remain intact. This option cannot be used together with `--commit-filter`, though the same effect can be achieved by using the provided `git_commit_non_empty_tree` function in a commit filter."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:183
+#: en/git-filter-branch.txt:196
#, fuzzy, no-wrap, priority:100
#| msgid "--origin <name>"
msgid "--original <namespace>"
msgstr "--origin <name>"
#. type: Plain text
-#: en/git-filter-branch.txt:186
+#: en/git-filter-branch.txt:199
#, priority:100
msgid "Use this option to set the namespace where the original commits will be stored. The default value is 'refs/original'."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:187
+#: en/git-filter-branch.txt:200
#, no-wrap, priority:100
msgid "-d <directory>"
msgstr "-d <Verzeichnis>"
#. type: Plain text
-#: en/git-filter-branch.txt:194
+#: en/git-filter-branch.txt:207
#, priority:100
msgid "Use this option to set the path to the temporary directory used for rewriting. When applying a tree filter, the command needs to temporarily check out the tree to some directory, which may consume considerable space in case of large projects. By default it does this in the `.git-rewrite/` directory but you can override that choice by this parameter."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:200
+#: en/git-filter-branch.txt:213
#, priority:100
msgid "'git filter-branch' refuses to start with an existing temporary directory or when there are already refs starting with 'refs/original/', unless forced."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:201
+#: en/git-filter-branch.txt:214
#, no-wrap, priority:100
msgid "--state-branch <branch>"
msgstr "--state-branch <Branch>"
#. type: Plain text
-#: en/git-filter-branch.txt:206
+#: en/git-filter-branch.txt:219
#, priority:100
msgid "This option will cause the mapping from old to new objects to be loaded from named branch upon startup and saved as a new commit to that branch upon exit, enabling incremental of large trees. If '<branch>' does not exist it will be created."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:207
+#: en/git-filter-branch.txt:220
#, fuzzy, ignore-ellipsis, no-wrap, priority:100
#| msgid "'git log' <option>..."
msgid "<rev-list options>..."
msgstr "'git log' <option>..."
#. type: Plain text
-#: en/git-filter-branch.txt:212
+#: en/git-filter-branch.txt:225
#, priority:100
msgid "Arguments for 'git rev-list'. All positive refs included by these options are rewritten. You may also specify options such as `--all`, but you must use `--` to separate them from the 'git filter-branch' options. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:216
+#: en/git-filter-branch.txt:229
#, no-wrap, priority:100
msgid "Remap to ancestor"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:223
+#: en/git-filter-branch.txt:236
#, priority:100
msgid "By using linkgit:git-rev-list[1] arguments, e.g., path limiters, you can limit the set of revisions which get rewritten. However, positive refs on the command line are distinguished: we don't let them be excluded by such limiters. For this purpose, they are instead rewritten to point at the nearest ancestor that was not excluded."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:231
+#: en/git-filter-branch.txt:244
#, priority:100
msgid "On success, the exit status is `0`. If the filter can't find any commits to rewrite, the exit status is `2`. On any other error, the exit status may be any other non-zero value."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:238
+#: en/git-filter-branch.txt:251
#, priority:100
msgid "Suppose you want to remove a file (containing confidential information or copyright violation) from all commits:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:241
+#: en/git-filter-branch.txt:254
#, no-wrap, priority:100
msgid "git filter-branch --tree-filter 'rm filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:246
+#: en/git-filter-branch.txt:259
#, priority:100
msgid "However, if the file is absent from the tree of some commit, a simple `rm filename` will fail for that tree and commit. Thus you may instead want to use `rm -f filename` as the script."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:252
+#: en/git-filter-branch.txt:265
#, priority:100
msgid "Using `--index-filter` with 'git rm' yields a significantly faster version. Like with using `rm filename`, `git rm --cached filename` will fail if the file is absent from the tree of a commit. If you want to \"completely forget\" a file, it does not matter when it entered history, so we also add `--ignore-unmatch`:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:255
+#: en/git-filter-branch.txt:268
#, no-wrap, priority:100
msgid "git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:258
+#: en/git-filter-branch.txt:271
#, priority:100
msgid "Now, you will get the rewritten history saved in HEAD."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:261
+#: en/git-filter-branch.txt:274
#, priority:100
msgid "To rewrite the repository to look as if `foodir/` had been its project root, and discard all other history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:264
+#: en/git-filter-branch.txt:277
#, no-wrap, priority:100
msgid "git filter-branch --subdirectory-filter foodir -- --all\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:269
+#: en/git-filter-branch.txt:282
#, priority:100
msgid "Thus you can, e.g., turn a library subdirectory into a repository of its own. Note the `--` that separates 'filter-branch' options from revision options, and the `--all` to rewrite all branches and tags."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:273
+#: en/git-filter-branch.txt:286
#, priority:100
msgid "To set a commit (which typically is at the tip of another history) to be the parent of the current initial commit, in order to paste the other history behind the current history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:276
+#: en/git-filter-branch.txt:289
#, no-wrap, priority:100
msgid "git filter-branch --parent-filter 'sed \"s/^\\$/-p <graft-id>/\"' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:282
+#: en/git-filter-branch.txt:295
#, priority:100
msgid "(if the parent string is empty - which happens when we are dealing with the initial commit - add graftcommit as a parent). Note that this assumes history with a single root (that is, no merge without common ancestors happened). If this is not the case, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:286
+#: en/git-filter-branch.txt:299
#, no-wrap, priority:100
msgid ""
"git filter-branch --parent-filter \\\n"
@@ -23635,13 +23723,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:289
+#: en/git-filter-branch.txt:302
#, priority:100
msgid "or even simpler:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:293
+#: en/git-filter-branch.txt:306
#, no-wrap, priority:100
msgid ""
"git replace --graft $commit-id $graft-id\n"
@@ -23649,13 +23737,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:296
+#: en/git-filter-branch.txt:309
#, priority:100
msgid "To remove commits authored by \"Darl McBribe\" from the history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:305
+#: en/git-filter-branch.txt:318
#, no-wrap, priority:100
msgid ""
"git filter-branch --commit-filter '\n"
@@ -23668,13 +23756,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:308
+#: en/git-filter-branch.txt:321
#, priority:100
msgid "The function 'skip_commit' is defined as follows:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:320
+#: en/git-filter-branch.txt:333
#, no-wrap, priority:100
msgid ""
"skip_commit()\n"
@@ -23690,13 +23778,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:327
+#: en/git-filter-branch.txt:340
#, priority:100
msgid "The shift magic first throws away the tree id and then the -p parameters. Note that this handles merges properly! In case Darl committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 as their parents instead of the merge commit."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:332
+#: en/git-filter-branch.txt:345
#, no-wrap, priority:100
msgid ""
"*NOTE* the changes introduced by the commits, and which are not reverted\n"
@@ -23706,13 +23794,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:336
+#: en/git-filter-branch.txt:349
#, priority:100
msgid "You can rewrite the commit log messages using `--msg-filter`. For example, 'git svn-id' strings in a repository created by 'git svn' can be removed this way:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:341
+#: en/git-filter-branch.txt:354
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23721,13 +23809,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:345
+#: en/git-filter-branch.txt:358
#, priority:100
msgid "If you need to add 'Acked-by' lines to, say, the last 10 commits (none of which is a merge), use this command:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:351
+#: en/git-filter-branch.txt:364
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23737,13 +23825,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:357
+#: en/git-filter-branch.txt:370
#, priority:100
msgid "The `--env-filter` option can be used to modify committer and/or author identity. For example, if you found out that your commits have the wrong identity due to a misconfigured user.email, you can make a correction, before publishing the project, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:369
+#: en/git-filter-branch.txt:382
#, no-wrap, priority:100
msgid ""
"git filter-branch --env-filter '\n"
@@ -23759,19 +23847,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:375
+#: en/git-filter-branch.txt:388
#, priority:100
msgid "To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will point to the top-most revision that a 'git rev-list' of this range will print."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:377
+#: en/git-filter-branch.txt:390
#, priority:100
msgid "Consider this history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:382
+#: en/git-filter-branch.txt:395
#, no-wrap, priority:100
msgid ""
" D--E--F--G--H\n"
@@ -23780,25 +23868,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:385
+#: en/git-filter-branch.txt:398
#, priority:100
msgid "To rewrite only commits D,E,F,G,H, but leave A, B and C alone, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:388
+#: en/git-filter-branch.txt:401
#, ignore-ellipsis, no-wrap, priority:100
msgid "git filter-branch ... C..H\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:391
+#: en/git-filter-branch.txt:404
#, priority:100
msgid "To rewrite commits E,F,G,H, use one of these:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:395
+#: en/git-filter-branch.txt:408
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"git filter-branch ... C..H --not D\n"
@@ -23806,13 +23894,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:398
+#: en/git-filter-branch.txt:411
#, priority:100
msgid "To move the whole tree into a subdirectory, or remove it from there:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:405
+#: en/git-filter-branch.txt:418
#, no-wrap, priority:100
msgid ""
"git filter-branch --index-filter \\\n"
@@ -23823,87 +23911,279 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-filter-branch.txt:410
+#: en/git-filter-branch.txt:423
#, no-wrap, priority:100
msgid "CHECKLIST FOR SHRINKING A REPOSITORY"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:418
+#: en/git-filter-branch.txt:431
#, priority:100
msgid "git-filter-branch can be used to get rid of a subset of files, usually with some combination of `--index-filter` and `--subdirectory-filter`. People expect the resulting repository to be smaller than the original, but you need a few more steps to actually make it smaller, because Git tries hard not to lose your objects until you tell it to. First make sure that:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:422
+#: en/git-filter-branch.txt:435
#, priority:100
msgid "You really removed all variants of a filename, if a blob was moved over its lifetime. `git log --name-only --follow --all -- filename` can help you find renames."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:425
+#: en/git-filter-branch.txt:438
#, priority:100
msgid "You really filtered all refs: use `--tag-name-filter cat -- --all` when calling git-filter-branch."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:428
+#: en/git-filter-branch.txt:441
#, priority:100
msgid "Then there are two ways to get a smaller repository. A safer way is to clone, that keeps your original intact."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:432
+#: en/git-filter-branch.txt:445
#, priority:100
msgid "Clone it with `git clone file:///path/to/repo`. The clone will not have the removed objects. See linkgit:git-clone[1]. (Note that cloning with a plain path just hardlinks everything!)"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:437
+#: en/git-filter-branch.txt:450
#, priority:100
msgid "If you really don't want to clone it, for whatever reasons, check the following points instead (in this order). This is a very destructive approach, so *make a backup* or go back to cloning it. You have been warned."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:441
+#: en/git-filter-branch.txt:454
#, priority:100
msgid "Remove the original refs backed up by git-filter-branch: say `git for-each-ref --format=\"%(refname)\" refs/original/ | xargs -n 1 git update-ref -d`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:443
+#: en/git-filter-branch.txt:456
#, priority:100
msgid "Expire all reflogs with `git reflog expire --expire=now --all`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:447
+#: en/git-filter-branch.txt:460
#, priority:100
msgid "Garbage collect all unreferenced objects with `git gc --prune=now` (or if your git-gc is not new enough to support arguments to `--prune`, use `git repack -ad; git prune` instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:459
+#: en/git-filter-branch.txt:467
#, priority:100
-msgid "git-filter-branch allows you to make complex shell-scripted rewrites of your Git history, but you probably don't need this flexibility if you're simply _removing unwanted data_ like large files or passwords. For those operations you may want to consider http://rtyley.github.io/bfg-repo-cleaner/[The BFG Repo-Cleaner], a JVM-based alternative to git-filter-branch, typically at least 10-50x faster for those use-cases, and with quite different characteristics:"
+msgid "The performance of git-filter-branch is glacially slow; its design makes it impossible for a backward-compatible implementation to ever be fast:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:467
+#: en/git-filter-branch.txt:473
#, priority:100
-msgid "Any particular version of a file is cleaned exactly _once_. The BFG, unlike git-filter-branch, does not give you the opportunity to handle a file differently based on where or when it was committed within your history. This constraint gives the core performance benefit of The BFG, and is well-suited to the task of cleansing bad data - you don't care _where_ the bad data is, you just want it _gone_."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:473
+#: en/git-filter-branch.txt:476
+#, priority:100
+msgid "If you try and cheat and try to make git-filter-branch only work on files modified in a commit, then two things happen"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:482
+#, priority:100
+msgid "you run into problems with deletions whenever the user is simply trying to rename files (because attempting to delete files that don't exist looks like a no-op; it takes some chicanery to remap deletes across file renames when the renames happen via arbitrary user-provided shell)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:488
+#, priority:100
+msgid "even if you succeed at the map-deletes-for-renames chicanery, you still technically violate backward compatibility because users are allowed to filter files in ways that depend upon topology of commits instead of filtering solely based on file contents or names (though this has not been observed in the wild)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:494
+#, priority:100
+msgid "Even if you don't need to edit files but only want to e.g. rename or remove some and thus can avoid checking out each file (i.e. you can use --index-filter), you still are passing shell snippets for your filters. This means that for every commit, you have to have a prepared git repo where those filters can be run. That's a significant setup."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:505
#, priority:100
-msgid "By default The BFG takes full advantage of multi-core machines, cleansing commit file-trees in parallel. git-filter-branch cleans commits sequentially (i.e. in a single-threaded manner), though it _is_ possible to write filters that include their own parallelism, in the scripts executed against each commit."
+msgid "Further, several additional files are created or updated per commit by git-filter-branch. Some of these are for supporting the convenience functions provided by git-filter-branch (such as map()), while others are for keeping track of internal state (but could have also been accessed by user filters; one of git-filter-branch's regression tests does so). This essentially amounts to using the filesystem as an IPC mechanism between git-filter-branch and the user-provided filters. Disks tend to be a slow IPC mechanism, and writing these files also effectively represents a forced synchronization point between separate processes that we hit with every commit."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:478
+#: en/git-filter-branch.txt:511
#, priority:100
-msgid "The http://rtyley.github.io/bfg-repo-cleaner/#examples[command options] are much more restrictive than git-filter branch, and dedicated just to the tasks of removing unwanted data- e.g: `--strip-blobs-bigger-than 1M`."
+msgid "The user-provided shell commands will likely involve a pipeline of commands, resulting in the creation of many processes per commit. Creating and running another process takes a widely varying amount of time between operating systems, but on any platform it is very slow relative to invoking a function."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:517
+#, priority:100
+msgid "git-filter-branch itself is written in shell, which is kind of slow. This is the one performance issue that could be backward-compatibly fixed, but compared to the above problems that are intrinsic to the design of git-filter-branch, the language of the tool itself is a relatively minor issue."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:528
+#, priority:100
+msgid "Side note: Unfortunately, people tend to fixate on the written-in-shell aspect and periodically ask if git-filter-branch could be rewritten in another language to fix the performance issues. Not only does that ignore the bigger intrinsic problems with the design, it'd help less than you'd expect: if git-filter-branch itself were not shell, then the convenience functions (map(), skip_commit(), etc) and the `--setup` argument could no longer be executed once at the beginning of the program but would instead need to be prepended to every user filter (and thus re-executed with every commit)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:539
+#, priority:100
+msgid "The https://github.com/newren/git-filter-repo/[git filter-repo] tool is an alternative to git-filter-branch which does not suffer from these performance problems or the safety problems (mentioned below). For those with existing tooling which relies upon git-filter-branch, 'git repo-filter' also provides https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], a drop-in git-filter-branch replacement (with a few caveats). While filter-lamely suffers from all the same safety issues as git-filter-branch, it at least ameloriates the performance issues a little."
+msgstr ""
+
+#. type: Title -
+#: en/git-filter-branch.txt:542
+#, no-wrap, priority:100
+msgid "SAFETY"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:547
+#, priority:100
+msgid "git-filter-branch is riddled with gotchas resulting in various ways to easily corrupt repos or end up with a mess worse than what you started with:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:560
+#, priority:100
+msgid "Someone can have a set of \"working and tested filters\" which they document or provide to a coworker, who then runs them on a different OS where the same commands are not working/tested (some examples in the git-filter-branch manpage are also affected by this). BSD vs. GNU userland differences can really bite. If lucky, error messages are spewed. But just as likely, the commands either don't do the filtering requested, or silently corrupt by making some unwanted change. The unwanted change may only affect a few commits, so it's not necessarily obvious either. (The fact that problems won't necessarily be obvious means they are likely to go unnoticed until the rewritten history is in use for quite a while, at which point it's really hard to justify another flag-day for another rewrite.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:570
+#, priority:100
+msgid "Filenames with spaces are often mishandled by shell snippets since they cause problems for shell pipelines. Not everyone is familiar with find -print0, xargs -0, git-ls-files -z, etc. Even people who are familiar with these may assume such flags are not relevant because someone else renamed any such files in their repo back before the person doing the filtering joined the project. And often, even those familiar with handling arguments with spaces may not do so just because they aren't in the mindset of thinking about everything that could possibly go wrong."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:580
+#, priority:100
+msgid "Non-ascii filenames can be silently removed despite being in a desired directory. Keeping only wanted paths is often done using pipelines like `git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`. ls-files will only quote filenames if needed, so folks may not notice that one of the files didn't match the regex (at least not until it's much too late). Yes, someone who knows about core.quotePath can avoid this (unless they have other special characters like \\t, \\n, or \"), and people who use ls-files -z with something other than grep can avoid this, but that doesn't mean they will."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:586
+#, priority:100
+msgid "Similarly, when moving files around, one can find that filenames with non-ascii or special characters end up in a different directory, one that includes a double quote character. (This is technically the same issue as above with quoting, but perhaps an interesting different way that it can and has manifested as a problem.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:594
+#, priority:100
+msgid "It's far too easy to accidentally mix up old and new history. It's still possible with any tool, but git-filter-branch almost invites it. If lucky, the only downside is users getting frustrated that they don't know how to shrink their repo and remove the old stuff. If unlucky, they merge old and new history and end up with multiple \"copies\" of each commit, some of which have unwanted or sensitive files and others which don't. This comes about in multiple different ways:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:597
+#, priority:100
+msgid "the default to only doing a partial history rewrite ('--all' is not the default and few examples show it)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:599
+#, priority:100
+msgid "the fact that there's no automatic post-run cleanup"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:602
+#, priority:100
+msgid "the fact that --tag-name-filter (when used to rename tags) doesn't remove the old tags but just adds new ones with the new name"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:611
+#, priority:100
+msgid "the fact that little educational information is provided to inform users of the ramifications of a rewrite and how to avoid mixing old and new history. For example, this man page discusses how users need to understand that they need to rebase their changes for all their branches on top of new history (or delete and reclone), but that's only one of multiple concerns to consider. See the \"DISCUSSION\" section of the git filter-repo manual page for more details."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:614
+#, priority:100
+msgid "Annotated tags can be accidentally converted to lightweight tags, due to either of two issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:619
+#, priority:100
+msgid "Someone can do a history rewrite, realize they messed up, restore from the backups in refs/original/, and then redo their git-filter-branch command. (The backup in refs/original/ is not a real backup; it dereferences tags first.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:624
+#, priority:100
+msgid "Running git-filter-branch with either --tags or --all in your <rev-list options>. In order to retain annotated tags as annotated, you must use --tag-name-filter (and must not have restored from refs/original/ in a previously botched rewrite)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:629
+#, priority:100
+msgid "Any commit messages that specify an encoding will become corrupted by the rewrite; git-filter-branch ignores the encoding, takes the original bytes, and feeds it to commit-tree without telling it the proper encoding. (This happens whether or not --msg-filter is used.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:633
+#, priority:100
+msgid "Commit messages (even if they are all UTF-8) by default become corrupted due to not being updated -- any references to other commit hashes in commit messages will now refer to no-longer-extant commits."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:644
+#, priority:100
+msgid "There are no facilities for helping users find what unwanted crud they should delete, which means they are much more likely to have incomplete or partial cleanups that sometimes result in confusion and people wasting time trying to understand. (For example, folks tend to just look for big files to delete instead of big directories or extensions, and once they do so, then sometime later folks using the new repository who are going through history will notice a build artifact directory that has some files but not others, or a cache of dependencies (node_modules or similar) which couldn't have ever been functional since it's missing some files.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:647
+#, priority:100
+msgid "If --prune-empty isn't specified, then the filtering process can create hoards of confusing empty commits"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:651
+#, priority:100
+msgid "If --prune-empty is specified, then intentionally placed empty commits from before the filtering operation are also pruned instead of just pruning commits that became empty due to filtering rules."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:654
+#, ignore-ellipsis, priority:100
+msgid "If --prune empty is specified, sometimes empty commits are missed and left around anyway (a somewhat rare bug, but it happens...)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:658
+#, priority:100
+msgid "A minor issue, but users who have a goal to update all names and emails in a repository may be led to --env-filter which will only update authors and committers, missing taggers."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:664
+#, priority:100
+msgid "If the user provides a --tag-name-filter that maps multiple tags to the same name, no warning or error is provided; git-filter-branch simply overwrites each tag in some undocumented pre-defined order resulting in only one tag at the end. (A git-filter-branch regression test requires this surprising behavior.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:667
+#, priority:100
+msgid "Also, the poor performance of git-filter-branch often leads to safety issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:683
+#, priority:100
+msgid "Coming up with the correct shell snippet to do the filtering you want is sometimes difficult unless you're just doing a trivial modification such as deleting a couple files. Unfortunately, people often learn if the snippet is right or wrong by trying it out, but the rightness or wrongness can vary depending on special circumstances (spaces in filenames, non-ascii filenames, funny author names or emails, invalid timezones, presence of grafts or replace objects, etc.), meaning they may have to wait a long time, hit an error, then restart. The performance of git-filter-branch is so bad that this cycle is painful, reducing the time available to carefully re-check (to say nothing about what it does to the patience of the person doing the rewrite even if they do technically have more time available). This problem is extra compounded because errors from broken filters may not be shown for a long time and/or get lost in a sea of output. Even worse, broken filters often just result in silent incorrect rewrites."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:691
+#, priority:100
+msgid "To top it all off, even when users finally find working commands, they naturally want to share them. But they may be unaware that their repo didn't have some special cases that someone else's does. So, when someone else with a different repository runs the same commands, they get hit by the problems above. Or, the user just runs commands that really were vetted for special cases, but they run it on a different OS where it doesn't work, as noted above."
msgstr ""
#. type: Title =
@@ -23939,7 +24219,7 @@ msgid "This command is intended mostly for internal use by scripts automatically
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:64
+#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:68
#, no-wrap, priority:240
msgid "--log[=<n>]"
msgstr "--log[=<Anz>]"
@@ -23951,7 +24231,7 @@ msgid "In addition to branch names, populate the log message with one-line descr
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:65
+#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:69
#, ignore-same, no-wrap, priority:240
msgid "--no-log"
msgstr "--no-log"
@@ -24636,9 +24916,9 @@ msgid ""
"\t\t [--signature-file=<file>]\n"
"\t\t [-n | --numbered | -N | --no-numbered]\n"
"\t\t [--start-number <n>] [--numbered-files]\n"
-"\t\t [--in-reply-to=Message-Id] [--suffix=.<sfx>]\n"
+"\t\t [--in-reply-to=<message id>] [--suffix=.<sfx>]\n"
"\t\t [--ignore-if-in-upstream]\n"
-"\t\t [--rfc] [--subject-prefix=Subject-Prefix]\n"
+"\t\t [--rfc] [--subject-prefix=<subject prefix>]\n"
"\t\t [(--reroll-count|-v) <n>]\n"
"\t\t [--to=<email>] [--cc=<email>]\n"
"\t\t [--[no-]cover-letter] [--quiet]\n"
@@ -24687,526 +24967,527 @@ msgid "By default, each output file is numbered sequentially from 1, and uses th
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:70
+#: en/git-format-patch.txt:71
#, priority:100
-msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`."
+msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`. All directory components will be created."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:74
+#: en/git-format-patch.txt:75
#, priority:100
msgid "By default, the subject of a single patch is \"[PATCH] \" followed by the concatenation of lines from the commit message up to the first blank line (see the DISCUSSION section of linkgit:git-commit[1])."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:78
+#: en/git-format-patch.txt:79
#, priority:100
msgid "When multiple patches are output, the subject prefix will instead be \"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. To omit patch numbers from the subject, use `-N`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:83
+#: en/git-format-patch.txt:84
#, priority:100
msgid "If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a `Message-Id` header to reference."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:89
+#: en/git-format-patch.txt:90
#, no-wrap, priority:100
msgid "-<n>"
msgstr "-<Anz>"
#. type: Plain text
-#: en/git-format-patch.txt:91
+#: en/git-format-patch.txt:92
#, priority:100
msgid "Prepare patches from the topmost <n> commits."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:92
+#: en/git-format-patch.txt:93
#, no-wrap, priority:100
msgid "-o <dir>"
msgstr "-o <Verzeichnis>"
#. type: Labeled list
-#: en/git-format-patch.txt:93
+#: en/git-format-patch.txt:94
#, no-wrap, priority:100
msgid "--output-directory <dir>"
msgstr "--output-directory <Verzeichnis>"
#. type: Plain text
-#: en/git-format-patch.txt:96
+#: en/git-format-patch.txt:97
#, priority:100
msgid "Use <dir> to store the resulting files, instead of the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:98 en/git-shortlog.txt:30
+#: en/git-format-patch.txt:99 en/git-shortlog.txt:30
#, ignore-same, no-wrap, priority:260
msgid "--numbered"
msgstr "--numbered"
#. type: Plain text
-#: en/git-format-patch.txt:100
+#: en/git-format-patch.txt:101
#, priority:100
msgid "Name output in '[PATCH n/m]' format, even with a single patch."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:102
+#: en/git-format-patch.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-numbered"
msgstr "--no-numbered"
#. type: Plain text
-#: en/git-format-patch.txt:104
+#: en/git-format-patch.txt:105
#, priority:100
msgid "Name output in '[PATCH]' format."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:105
+#: en/git-format-patch.txt:106
#, no-wrap, priority:100
msgid "--start-number <n>"
msgstr "--start-number <Anz>"
#. type: Plain text
-#: en/git-format-patch.txt:107
+#: en/git-format-patch.txt:108
#, priority:100
msgid "Start numbering the patches at <n> instead of 1."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:108
+#: en/git-format-patch.txt:109
#, ignore-same, no-wrap, priority:100
msgid "--numbered-files"
msgstr "--numbered-files"
#. type: Plain text
-#: en/git-format-patch.txt:111
+#: en/git-format-patch.txt:112
#, priority:100
msgid "Output file names will be a simple number sequence without the default first line of the commit appended."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:113
+#: en/git-format-patch.txt:114
#, ignore-same, no-wrap, priority:100
msgid "--keep-subject"
msgstr "--keep-subject"
#. type: Plain text
-#: en/git-format-patch.txt:116
+#: en/git-format-patch.txt:117
#, priority:100
msgid "Do not strip/add '[PATCH]' from the first line of the commit log message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:122
+#: en/git-format-patch.txt:123
#, priority:100
msgid "Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:123 en/git-pack-objects.txt:59
+#: en/git-format-patch.txt:124 en/git-pack-objects.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--stdout"
msgstr "--stdout"
#. type: Plain text
-#: en/git-format-patch.txt:126
+#: en/git-format-patch.txt:127
#, priority:100
msgid "Print all commits to the standard output in mbox format, instead of creating a file for each one."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:127
+#: en/git-format-patch.txt:128
#, no-wrap, priority:100
msgid "--attach[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:131
+#: en/git-format-patch.txt:132
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: attachment`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:132
+#: en/git-format-patch.txt:133
#, ignore-same, no-wrap, priority:100
msgid "--no-attach"
msgstr "--no-attach"
#. type: Plain text
-#: en/git-format-patch.txt:135
+#: en/git-format-patch.txt:136
#, priority:100
msgid "Disable the creation of an attachment, overriding the configuration setting."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:136
+#: en/git-format-patch.txt:137
#, no-wrap, priority:100
msgid "--inline[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:140
+#: en/git-format-patch.txt:141
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: inline`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:141
+#: en/git-format-patch.txt:142
#, no-wrap, priority:100
msgid "--thread[=<style>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:142
+#: en/git-format-patch.txt:143
#, ignore-same, no-wrap, priority:100
msgid "--no-thread"
msgstr "--no-thread"
#. type: Plain text
-#: en/git-format-patch.txt:147
+#: en/git-format-patch.txt:148
#, priority:100
msgid "Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the first. Also controls generation of the `Message-Id` header to reference."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:153
+#: en/git-format-patch.txt:154
#, priority:100
msgid "The optional <style> argument can be either `shallow` or `deep`. 'shallow' threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order. 'deep' threading makes every mail a reply to the previous one."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:157
+#: en/git-format-patch.txt:158
#, priority:100
msgid "The default is `--no-thread`, unless the `format.thread` configuration is set. If `--thread` is specified without a style, it defaults to the style specified by `format.thread` if any, or else `shallow`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:161
+#: en/git-format-patch.txt:162
#, priority:100
msgid "Beware that the default for 'git send-email' is to thread emails itself. If you want `git format-patch` to take care of threading, you will want to ensure that threading is disabled for `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:162
-#, no-wrap, priority:100
-msgid "--in-reply-to=Message-Id"
-msgstr ""
+#: en/git-format-patch.txt:163
+#, fuzzy, no-wrap, priority:100
+#| msgid "--reply-to=<address>"
+msgid "--in-reply-to=<message id>"
+msgstr "--reply-to=<Adresse>"
#. type: Plain text
-#: en/git-format-patch.txt:166
+#: en/git-format-patch.txt:167
#, priority:100
-msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given Message-Id, which avoids breaking threads to provide a new patch series."
+msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given <message id>, which avoids breaking threads to provide a new patch series."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:167
+#: en/git-format-patch.txt:168
#, ignore-same, no-wrap, priority:100
msgid "--ignore-if-in-upstream"
msgstr "--ignore-if-in-upstream"
#. type: Plain text
-#: en/git-format-patch.txt:173
+#: en/git-format-patch.txt:174
#, priority:100
msgid "Do not include a patch that matches a commit in <until>..<since>. This will examine all patches reachable from <since> but not from <until> and compare them with the patches being generated, and any patch that matches is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:174
+#: en/git-format-patch.txt:175
#, fuzzy, no-wrap, priority:100
#| msgid "--prefix=<prefix>/"
-msgid "--subject-prefix=<Subject-Prefix>"
+msgid "--subject-prefix=<subject prefix>"
msgstr "--prefix=<Pr채fix>/"
#. type: Plain text
-#: en/git-format-patch.txt:179
+#: en/git-format-patch.txt:180
#, priority:100
-msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<Subject-Prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
+msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<subject prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:180
+#: en/git-format-patch.txt:181
#, ignore-same, no-wrap, priority:100
msgid "--rfc"
msgstr "--rfc"
#. type: Plain text
-#: en/git-format-patch.txt:184
+#: en/git-format-patch.txt:185
#, priority:100
msgid "Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For Comments\"; use this when sending an experimental patch for discussion rather than application."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:185
+#: en/git-format-patch.txt:186
#, no-wrap, priority:100
msgid "-v <n>"
msgstr "-v <Anz>"
#. type: Labeled list
-#: en/git-format-patch.txt:186
+#: en/git-format-patch.txt:187
#, no-wrap, priority:100
msgid "--reroll-count=<n>"
msgstr "--reroll-count=<Anz>"
#. type: Plain text
-#: en/git-format-patch.txt:193
+#: en/git-format-patch.txt:194
#, priority:100
msgid "Mark the series as the <n>-th iteration of the topic. The output filenames have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default, but configurable via the `--subject-prefix` option) has ` v<n>` appended to it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:194
+#: en/git-format-patch.txt:195
#, no-wrap, priority:100
msgid "--to=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:199
+#: en/git-format-patch.txt:200
#, priority:100
msgid "Add a `To:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-to` discards all `To:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:200
+#: en/git-format-patch.txt:201
#, no-wrap, priority:100
msgid "--cc=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:205
+#: en/git-format-patch.txt:206
#, priority:100
msgid "Add a `Cc:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-cc` discards all `Cc:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:206
+#: en/git-format-patch.txt:207
#, ignore-same, no-wrap, priority:100
msgid "--from"
msgstr "--from"
#. type: Labeled list
-#: en/git-format-patch.txt:207
+#: en/git-format-patch.txt:208
#, no-wrap, priority:100
msgid "--from=<ident>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:213
+#: en/git-format-patch.txt:214
#, priority:100
msgid "Use `ident` in the `From:` header of each commit email. If the author ident of the commit is not textually identical to the provided `ident`, place a `From:` header in the body of the message with the original author. If no `ident` is given, use the committer ident."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:220
+#: en/git-format-patch.txt:221
#, priority:100
msgid "Note that this option is only useful if you are actually sending the emails and want to identify yourself as the sender, but retain the original author (and `git am` will correctly pick up the in-body header). Note also that `git send-email` already handles this transformation for you, and this option should not be used if you are feeding the result to `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:221
+#: en/git-format-patch.txt:222
#, no-wrap, priority:100
msgid "--add-header=<header>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:228
+#: en/git-format-patch.txt:229
#, priority:100
msgid "Add an arbitrary header to the email headers. This is in addition to any configured headers, and may be used multiple times. For example, `--add-header=\"Organization: git-foo\"`. The negated form `--no-add-header` discards *all* (`To:`, `Cc:`, and custom) headers added so far from config or command line."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:229
+#: en/git-format-patch.txt:230
#, ignore-same, no-wrap, priority:100
msgid "--[no-]cover-letter"
msgstr "--[no-]cover-letter"
#. type: Plain text
-#: en/git-format-patch.txt:233
+#: en/git-format-patch.txt:234
#, priority:100
msgid "In addition to the patches, generate a cover letter file containing the branch description, shortlog and the overall diffstat. You can fill in a description in the file before sending it out."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:234
+#: en/git-format-patch.txt:235
#, fuzzy, no-wrap, priority:100
#| msgid "--prefix=<prefix>/"
msgid "--interdiff=<previous>"
msgstr "--prefix=<Pr채fix>/"
#. type: Plain text
-#: en/git-format-patch.txt:242
+#: en/git-format-patch.txt:243
#, priority:100
msgid "As a reviewer aid, insert an interdiff into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` is a single revision naming the tip of the previous series which shares a common base with the series being formatted (for example `git format-patch --cover-letter --interdiff=feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:243
+#: en/git-format-patch.txt:244
#, fuzzy, no-wrap, priority:100
#| msgid "--prefix=<prefix>/"
msgid "--range-diff=<previous>"
msgstr "--prefix=<Pr채fix>/"
#. type: Plain text
-#: en/git-format-patch.txt:254
+#: en/git-format-patch.txt:255
#, priority:100
msgid "As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1]) into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` can be a single revision naming the tip of the previous series if it shares a common base with the series being formatted (for example `git format-patch --cover-letter --range-diff=feature/v1 -3 feature/v2`), or a revision range if the two versions of the series are disjoint (for example `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:259
+#: en/git-format-patch.txt:260
#, priority:100
msgid "Note that diff options passed to the command affect how the primary product of `format-patch` is generated, and they are not passed to the underlying `range-diff` machinery used to generate the cover-letter material (this may change in the future)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:260
+#: en/git-format-patch.txt:261
#, no-wrap, priority:100
msgid "--creation-factor=<percent>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:265
+#: en/git-format-patch.txt:266
#, priority:100
msgid "Used with `--range-diff`, tweak the heuristic which matches up commits between the previous and current series of patches by adjusting the creation/deletion cost fudge factor. See linkgit:git-range-diff[1]) for details."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:266
+#: en/git-format-patch.txt:267
#, no-wrap, priority:100
msgid "--notes[=<ref>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:267 en/pretty-options.txt:81
+#: en/git-format-patch.txt:268 en/pretty-options.txt:81
#, ignore-same, no-wrap, priority:260
msgid "--no-notes"
msgstr "--no-notes"
#. type: Plain text
-#: en/git-format-patch.txt:270
+#: en/git-format-patch.txt:271
#, priority:100
msgid "Append the notes (see linkgit:git-notes[1]) for the commit after the three-dash line."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:278
+#: en/git-format-patch.txt:279
#, priority:100
msgid "The expected use case of this is to write supporting explanation for the commit that does not belong to the commit log message proper, and include it with the patch submission. While one can simply write these explanations after `format-patch` has run but before sending, keeping them as Git notes allows them to be maintained between versions of the patch series (but see the discussion of the `notes.rewrite` configuration options in linkgit:git-notes[1] to use this workflow)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:281
+#: en/git-format-patch.txt:282
#, priority:100
msgid "The default is `--no-notes`, unless the `format.notes` configuration is set."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:282
+#: en/git-format-patch.txt:283
#, no-wrap, priority:100
msgid "--[no-]signature=<signature>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:287
+#: en/git-format-patch.txt:288
#, priority:100
msgid "Add a signature to each message produced. Per RFC 3676 the signature is separated from the body by a line with '-- ' on it. If the signature option is omitted the signature defaults to the Git version number."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:288
+#: en/git-format-patch.txt:289
#, no-wrap, priority:100
msgid "--signature-file=<file>"
msgstr "--signature-file=<Datei>"
#. type: Plain text
-#: en/git-format-patch.txt:290
+#: en/git-format-patch.txt:291
#, priority:100
msgid "Works just like --signature except the signature is read from a file."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:291
+#: en/git-format-patch.txt:292
#, no-wrap, priority:100
msgid "--suffix=.<sfx>"
msgstr "--suffix=.<Suffix>"
#. type: Plain text
-#: en/git-format-patch.txt:296
+#: en/git-format-patch.txt:297
#, priority:100
msgid "Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is `--suffix=.txt`. Leaving this empty will remove the `.patch` suffix."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:299
+#: en/git-format-patch.txt:300
#, priority:100
msgid "Note that the leading character does not have to be a dot; for example, you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:303
+#: en/git-format-patch.txt:304
#, priority:100
msgid "Do not print the names of the generated files to standard output."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:304
+#: en/git-format-patch.txt:305
#, ignore-same, no-wrap, priority:100
msgid "--no-binary"
msgstr "--no-binary"
#. type: Plain text
-#: en/git-format-patch.txt:309
+#: en/git-format-patch.txt:310
#, priority:100
msgid "Do not output contents of changes in binary files, instead display a notice that those files changed. Patches generated using this option cannot be applied properly, but they are still useful for code review."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:310
+#: en/git-format-patch.txt:311
#, ignore-same, no-wrap, priority:100
msgid "--zero-commit"
msgstr "--zero-commit"
#. type: Plain text
-#: en/git-format-patch.txt:313
+#: en/git-format-patch.txt:314
#, priority:100
msgid "Output an all-zero hash in each patch's From header instead of the hash of the commit."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:314
+#: en/git-format-patch.txt:315
#, no-wrap, priority:100
msgid "--base=<commit>"
msgstr "--base=<Commit>"
#. type: Plain text
-#: en/git-format-patch.txt:318
+#: en/git-format-patch.txt:320
#, priority:100
-msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details."
+msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details. If <commit> is \"auto\", a base commit is automatically chosen."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:325
+#: en/git-format-patch.txt:327
#, priority:100
msgid "Treat the revision argument as a <revision range>, even if it is just a single commit (that would normally be treated as a <since>). Note that root commits included in the specified range are always formatted as creation patches, independently of this flag."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:328
+#: en/git-format-patch.txt:330
#, priority:100
msgid "Show progress reports on stderr as patches are generated."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:335
+#: en/git-format-patch.txt:338
#, priority:100
-msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To\" or \"Cc:\" headers, configure attachments, and sign off patches with configuration variables."
+msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To:\" or \"Cc:\" headers, configure attachments, change the patch output directory, and sign off patches with configuration variables."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:347
+#: en/git-format-patch.txt:351
#, no-wrap, priority:100
msgid ""
"[format]\n"
@@ -25218,17 +25499,18 @@ msgid ""
"\tcc = <email>\n"
"\tattach [ = mime-boundary-string ]\n"
"\tsignOff = true\n"
-"\tcoverletter = auto\n"
+"\toutputDirectory = <directory>\n"
+"\tcoverLetter = auto\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:356
+#: en/git-format-patch.txt:360
#, priority:100
msgid "The patch produced by 'git format-patch' is in UNIX mailbox format, with a fixed \"magic\" time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:366
+#: en/git-format-patch.txt:370
#, no-wrap, priority:100
msgid ""
"From 8f72bad1baf19a53459661343e21d6491c3908d3 Mon Sep 17 00:00:00 2001\n"
@@ -25242,7 +25524,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:369
+#: en/git-format-patch.txt:373
#, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -25250,7 +25532,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:372
+#: en/git-format-patch.txt:376
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"Do the same for ia64 so we can have sleek & trim looking\n"
@@ -25258,19 +25540,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:380
+#: en/git-format-patch.txt:384
#, ignore-ellipsis, priority:100
msgid "Typically it will be placed in a MUA's drafts folder, edited to add timely commentary that should not go in the changelog after the three dashes, and then sent as a message whose body, in our example, starts with \"arch/arm config files were...\". On the receiving end, readers can save interesting patches in a UNIX mailbox and apply them with linkgit:git-am[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:386
+#: en/git-format-patch.txt:390
#, priority:100
msgid "When a patch is part of an ongoing discussion, the patch generated by 'git format-patch' can be tweaked to take advantage of the 'git am --scissors' feature. After your response to the discussion comes a line that consists solely of \"`-- >8 --`\" (scissors and perforation), followed by the patch with unnecessary header fields removed:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:390
+#: en/git-format-patch.txt:394
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"...\n"
@@ -25278,13 +25560,13 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:392
+#: en/git-format-patch.txt:396
#, no-wrap, priority:100
msgid "Makes sense to me. How about this patch?\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:395
+#: en/git-format-patch.txt:399
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
@@ -25292,7 +25574,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:398
+#: en/git-format-patch.txt:402
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -25300,61 +25582,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:406
+#: en/git-format-patch.txt:410
#, priority:100
msgid "When sending a patch this way, most often you are sending your own patch, so in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit `From:` and `Date:` lines from the patch file. The patch title is likely to be different from the subject of the discussion the patch is in response to, so it is likely that you would want to keep the Subject: line, like the example above."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:408
+#: en/git-format-patch.txt:412
#, no-wrap, priority:100
msgid "Checking for patch corruption"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:411
+#: en/git-format-patch.txt:415
#, priority:100
msgid "Many mailers if not set up properly will corrupt whitespace. Here are two common types of corruption:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:413
+#: en/git-format-patch.txt:417
#, priority:100
msgid "Empty context lines that do not have _any_ whitespace."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:416
+#: en/git-format-patch.txt:420
#, priority:100
msgid "Non-empty context lines that have one extra whitespace at the beginning."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:418
+#: en/git-format-patch.txt:422
#, priority:100
msgid "One way to test if your MUA is set up correctly is:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:422
+#: en/git-format-patch.txt:426
#, priority:100
msgid "Send the patch to yourself, exactly the way you would, except with To: and Cc: lines that do not contain the list and maintainer address."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:425
+#: en/git-format-patch.txt:429
#, priority:100
msgid "Save that patch to a file in UNIX mailbox format. Call it a.patch, say."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:427
+#: en/git-format-patch.txt:431
#, priority:100
msgid "Apply it:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:432
+#: en/git-format-patch.txt:436
#, no-wrap, priority:100
msgid ""
"$ git fetch <project> master:test-apply\n"
@@ -25364,176 +25646,176 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:434
+#: en/git-format-patch.txt:438
#, priority:100
msgid "If it does not apply correctly, there can be various reasons."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:439
+#: en/git-format-patch.txt:443
#, priority:100
msgid "The patch itself does not apply cleanly. That is _bad_ but does not have much to do with your MUA. You might want to rebase the patch with linkgit:git-rebase[1] before regenerating it in this case."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:444
+#: en/git-format-patch.txt:448
#, priority:100
msgid "The MUA corrupted your patch; \"am\" would complain that the patch does not apply. Look in the .git/rebase-apply/ subdirectory and see what 'patch' file contains and check for the common corruption patterns mentioned above."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:452
+#: en/git-format-patch.txt:456
#, priority:100
msgid "While at it, check the 'info' and 'final-commit' files as well. If what is in 'final-commit' is not exactly what you would want to see in the commit log message, it is very likely that the receiver would end up hand editing the log message when applying your patch. Things like \"Hi, this is my first patch.\\n\" in the patch e-mail should come after the three-dash line that signals the end of the commit message."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:454
+#: en/git-format-patch.txt:458
#, no-wrap, priority:100
msgid "MUA-SPECIFIC HINTS"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:457
+#: en/git-format-patch.txt:461
#, priority:100
msgid "Here are some hints on how to successfully submit patches inline using various mailers."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:459
+#: en/git-format-patch.txt:463
#, no-wrap, priority:100
msgid "GMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:465
+#: en/git-format-patch.txt:469
#, priority:100
msgid "GMail does not have any way to turn off line wrapping in the web interface, so it will mangle any emails that you send. You can however use \"git send-email\" and send your patches through the GMail SMTP server, or use any IMAP email client to connect to the google IMAP server and forward the emails through that."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:468
+#: en/git-format-patch.txt:472
#, priority:100
msgid "For hints on using 'git send-email' to send your patches through the GMail SMTP server, see the EXAMPLE section of linkgit:git-send-email[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:471
+#: en/git-format-patch.txt:475
#, priority:100
msgid "For hints on submission using the IMAP interface, see the EXAMPLE section of linkgit:git-imap-send[1]."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:473
+#: en/git-format-patch.txt:477
#, no-wrap, priority:100
msgid "Thunderbird"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:477
+#: en/git-format-patch.txt:481
#, priority:100
msgid "By default, Thunderbird will both wrap emails as well as flag them as being 'format=flowed', both of which will make the resulting email unusable by Git."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:481
+#: en/git-format-patch.txt:485
#, priority:100
msgid "There are three different approaches: use an add-on to turn off line wraps, configure Thunderbird to not mangle patches, or use an external editor to keep Thunderbird from mangling the patches."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:483
+#: en/git-format-patch.txt:487
#, no-wrap, priority:100
msgid "Approach #1 (add-on)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:491
+#: en/git-format-patch.txt:495
#, priority:100
msgid "Install the Toggle Word Wrap add-on that is available from https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you can tick off. Now you can compose the message as you otherwise do (cut + paste, 'git format-patch' | 'git imap-send', etc), but you have to insert line breaks manually in any text that you type."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:493
+#: en/git-format-patch.txt:497
#, fuzzy, no-wrap, priority:100
#| msgid "Configuration"
msgid "Approach #2 (configuration)"
msgstr "Configuration"
#. type: Plain text
-#: en/git-format-patch.txt:495
+#: en/git-format-patch.txt:499
#, priority:100
msgid "Three steps:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:499
+#: en/git-format-patch.txt:503
#, ignore-ellipsis, priority:100
msgid "Configure your mail server composition as plain text: Edit...Account Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:501
+#: en/git-format-patch.txt:505
#, priority:100
msgid "Configure your general composition window to not wrap."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:504
+#: en/git-format-patch.txt:508
#, priority:100
msgid "In Thunderbird 2: Edit..Preferences..Composition, wrap plain text messages at 0"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:510
+#: en/git-format-patch.txt:514
#, priority:100
msgid "In Thunderbird 3: Edit..Preferences..Advanced..Config Editor. Search for \"mail.wrap_long_lines\". Toggle it to make sure it is set to `false`. Also, search for \"mailnews.wraplength\" and set the value to 0."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:515
+#: en/git-format-patch.txt:519
#, priority:100
msgid "Disable the use of format=flowed: Edit..Preferences..Advanced..Config Editor. Search for \"mailnews.send_plaintext_flowed\". Toggle it to make sure it is set to `false`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:519
+#: en/git-format-patch.txt:523
#, priority:100
msgid "After that is done, you should be able to compose email as you otherwise would (cut + paste, 'git format-patch' | 'git imap-send', etc), and the patches will not be mangled."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:521
+#: en/git-format-patch.txt:525
#, no-wrap, priority:100
msgid "Approach #3 (external editor)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:526
+#: en/git-format-patch.txt:530
#, priority:100
msgid "The following Thunderbird extensions are needed: AboutConfig from http://aboutconfig.mozdev.org/ and External Editor from http://globs.org/articles.php?lng=en&pg=8"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:528
+#: en/git-format-patch.txt:532
#, priority:100
msgid "Prepare the patch as a text file using your method of choice."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:533
+#: en/git-format-patch.txt:537
#, priority:100
msgid "Before opening a compose window, use Edit->Account Settings to uncheck the \"Compose messages in HTML format\" setting in the \"Composition & Addressing\" panel of the account to be used to send the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:537
+#: en/git-format-patch.txt:541
#, priority:100
msgid "In the main Thunderbird window, 'before' you open the compose window for the patch, use Tools->about:config to set the following to the indicated values:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:541
+#: en/git-format-patch.txt:545
#, no-wrap, priority:100
msgid ""
"\tmailnews.send_plaintext_flowed => false\n"
@@ -25541,25 +25823,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:544
+#: en/git-format-patch.txt:548
#, priority:100
msgid "Open a compose window and click the external editor icon."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:547
+#: en/git-format-patch.txt:551
#, priority:100
msgid "In the external editor window, read in the patch file and exit the editor normally."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:550
+#: en/git-format-patch.txt:554
#, priority:100
msgid "Side note: it may be possible to do step 2 with about:config and the following settings but no one's tried yet."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:555
+#: en/git-format-patch.txt:559
#, no-wrap, priority:100
msgid ""
"\tmail.html_compose => false\n"
@@ -25568,91 +25850,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:560
+#: en/git-format-patch.txt:564
#, priority:100
msgid "There is a script in contrib/thunderbird-patch-inline which can help you include patches with Thunderbird in an easy way. To use it, do the steps above and then use the script as the external editor."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:562
+#: en/git-format-patch.txt:566
#, no-wrap, priority:100
msgid "KMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:564
+#: en/git-format-patch.txt:568
#, priority:100
msgid "This should help you to submit patches inline using KMail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:566
+#: en/git-format-patch.txt:570
#, priority:100
msgid "Prepare the patch as a text file."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:568
+#: en/git-format-patch.txt:572
#, priority:100
msgid "Click on New Mail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:571
+#: en/git-format-patch.txt:575
#, priority:100
msgid "Go under \"Options\" in the Composer window and be sure that \"Word wrap\" is not set."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:573
+#: en/git-format-patch.txt:577
#, ignore-ellipsis, priority:100
msgid "Use Message -> Insert file... and insert the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:576
+#: en/git-format-patch.txt:580
#, priority:100
msgid "Back in the compose window: add whatever other text you wish to the message, complete the addressing and subject fields, and press send."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:578
+#: en/git-format-patch.txt:582
#, no-wrap, priority:100
msgid "BASE TREE INFORMATION"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:587
+#: en/git-format-patch.txt:591
#, priority:100
msgid "The base tree information block is used for maintainers or third party testers to know the exact state the patch series applies to. It consists of the 'base commit', which is a well-known commit that is part of the stable part of the project history everybody else works off of, and zero or more 'prerequisite patches', which are well-known patches in flight that is not yet part of the 'base commit' that need to be applied on top of 'base commit' in topological order before the patches can be applied."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:593
+#: en/git-format-patch.txt:597
#, priority:100
msgid "The 'base commit' is shown as \"base-commit: \" followed by the 40-hex of the commit object name. A 'prerequisite patch' is shown as \"prerequisite-patch-id: \" followed by the 40-hex 'patch id', which can be obtained by passing the patch through the `git patch-id --stable` command."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:597
+#: en/git-format-patch.txt:601
#, priority:100
msgid "Imagine that on top of the public commit P, you applied well-known patches X, Y and Z from somebody else, and then built your three-patch series A, B, C, the history would be like:"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:600
+#: en/git-format-patch.txt:604
#, no-wrap, priority:100
msgid "---P---X---Y---Z---A---B---C\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:607
+#: en/git-format-patch.txt:611
#, priority:100
msgid "With `git format-patch --base=P -3 C` (or variants thereof, e.g. with `--cover-letter` or using `Z..C` instead of `-3 C` to specify the range), the base tree information block is shown at the end of the first message the command outputs (either the first patch, or the cover letter), like this:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:613
+#: en/git-format-patch.txt:617
#, no-wrap, priority:100
msgid ""
"base-commit: P\n"
@@ -25662,13 +25944,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:616
+#: en/git-format-patch.txt:620
#, priority:100
msgid "For non-linear topology, such as"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:621
+#: en/git-format-patch.txt:625
#, no-wrap, priority:100
msgid ""
"---P---X---A---M---C\n"
@@ -25677,38 +25959,38 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:626
+#: en/git-format-patch.txt:630
#, priority:100
msgid "You can also use `git format-patch --base=P -3 C` to generate patches for A, B and C, and the identifiers for P, X, Y, Z are appended at the end of the first message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:632
+#: en/git-format-patch.txt:636
#, priority:100
msgid "If set `--base=auto` in cmdline, it will track base commit automatically, the base commit will be the merge base of tip commit of the remote-tracking branch and revision-range specified in cmdline. For a local branch, you need to track a remote branch by `git branch --set-upstream-to` before using this option."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:638
+#: en/git-format-patch.txt:642
#, priority:100
msgid "Extract commits between revisions R1 and R2, and apply them on top of the current branch using 'git am' to cherry-pick them:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:641
+#: en/git-format-patch.txt:645
#, no-wrap, priority:100
msgid "$ git format-patch -k --stdout R1..R2 | git am -3 -k\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:645
+#: en/git-format-patch.txt:649
#, fuzzy, priority:100
#| msgid "will list commits made in the experimental branch but not in the stable branch, while"
msgid "Extract all commits which are in the current branch but not in the origin branch:"
msgstr "die Commits an, die im Zweig \"experimentell\" aber nicht im Zweig \"stabil\" get채tigt wurden. Dagegen zeigt"
#. type: delimited block -
-#: en/git-format-patch.txt:648
+#: en/git-format-patch.txt:652
#, fuzzy, no-wrap, priority:100
msgid "$ git format-patch origin\n"
msgstr ""
@@ -25716,32 +25998,32 @@ msgstr ""
" origin/master\n"
#. type: Plain text
-#: en/git-format-patch.txt:651
+#: en/git-format-patch.txt:655
#, fuzzy, priority:100
#| msgid "If you leave out the commit name, 'git-grep' will search any of the files it manages in your current directory. So"
msgid "For each commit a separate file is created in the current directory."
msgstr "Falls Sie den Namen des Commits nicht angeben sucht 'git-grep' in den Dateien in ihrem aktuellen Arbeitsverzeichnis."
#. type: Plain text
-#: en/git-format-patch.txt:654
+#: en/git-format-patch.txt:658
#, priority:100
msgid "Extract all commits that lead to 'origin' since the inception of the project:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:657
-#, ignore-same, no-wrap, priority:100
+#: en/git-format-patch.txt:661
+#, no-wrap, priority:100
msgid "$ git format-patch --root origin\n"
msgstr "$ git format-patch --root origin\n"
#. type: Plain text
-#: en/git-format-patch.txt:660
+#: en/git-format-patch.txt:664
#, priority:100
msgid "The same as the previous one:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:663
+#: en/git-format-patch.txt:667
#, fuzzy, no-wrap, priority:100
#| msgid ""
#| "bob$ git branch -r\n"
@@ -25752,26 +26034,26 @@ msgstr ""
" origin/master\n"
#. type: Plain text
-#: en/git-format-patch.txt:670
+#: en/git-format-patch.txt:674
#, priority:100
msgid "Additionally, it detects and handles renames and complete rewrites intelligently to produce a renaming patch. A renaming patch reduces the amount of text output, and generally makes it easier to review. Note that non-Git \"patch\" programs won't understand renaming patches, so use it only when you know the recipient uses Git to apply your patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:673
+#: en/git-format-patch.txt:677
#, priority:100
msgid "Extract three topmost commits from the current branch and format them as e-mailable patches:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:676
+#: en/git-format-patch.txt:680
#, fuzzy, no-wrap, priority:100
#| msgid "$ git commit -a\n"
msgid "$ git format-patch -3\n"
msgstr "$ git commit -a\n"
#. type: Plain text
-#: en/git-format-patch.txt:681
+#: en/git-format-patch.txt:685
#, ignore-same, priority:100
msgid "linkgit:git-am[1], linkgit:git-send-email[1]"
msgstr "linkgit:git-am[1], linkgit:git-send-email[1]"
@@ -25790,7 +26072,7 @@ msgstr "git-fsck-objects - 체berpr체ft die Verbundenheit und Korrektheit der Obj
#. type: Plain text
#: en/git-fsck-objects.txt:13
-#, ignore-ellipsis, ignore-same, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git fsck-objects' ...\n"
msgstr "'git fsck-objects' ...\n"
@@ -26269,44 +26551,44 @@ msgid "The below documentation is the same as what's found in linkgit:git-config
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:127
+#: en/git-gc.txt:126
#, priority:100
-msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, refs saved by 'git filter-branch' in refs/original/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
+msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, notes saved by 'git notes' under refs/notes/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:134
+#: en/git-gc.txt:133
#, priority:100
msgid "On the other hand, when 'git gc' runs concurrently with another process, there is a risk of it deleting an object that the other process is using but hasn't created a reference to. This may just cause the other process to fail or may corrupt the repository if the other process later adds a reference to the deleted object. Git has two features that significantly mitigate this problem:"
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:137
+#: en/git-gc.txt:136
#, priority:100
msgid "Any object with modification time newer than the `--prune` date is kept, along with everything reachable from it."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:141
+#: en/git-gc.txt:140
#, priority:100
msgid "Most operations that add an object to the database update the modification time of the object if it is already present so that #1 applies."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:145
+#: en/git-gc.txt:144
#, priority:100
msgid "However, these features fall short of a complete solution, so users who run commands concurrently have to live with some risk of corruption (which seems to be low in practice)."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:151
+#: en/git-gc.txt:150
#, fuzzy, priority:100
#| msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, and `post-commit` hooks. See linkgit:githooks[5] for more information."
msgid "The 'git gc --auto' command will run the 'pre-auto-gc' hook. See linkgit:githooks[5] for more information."
msgstr "Dieser Befehl kann die folgenden Einsprungspunkte (hooks) aufrufen: `commit-msg`, `prepare-commit-msg`, `pre-commit` und `post-commit`. Siehe linkgit:githooks[5] f체r weitere Information."
#. type: Plain text
-#: en/git-gc.txt:159
+#: en/git-gc.txt:158
#, ignore-same, priority:100
msgid "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
msgstr "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
@@ -26574,7 +26856,7 @@ msgid "For each <pathspec> given on command line, descend at most <depth> levels
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:399
+#: en/git-grep.txt:128 en/git-submodule.txt:400
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
@@ -26790,7 +27072,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:951
+#: en/git-grep.txt:217 en/rev-list-options.txt:967
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -26941,61 +27223,85 @@ msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:280
+#: en/git-grep.txt:277
+#, priority:100
+msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:282
+#, priority:100
+msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:287
+#, priority:100
+msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:291
+#, priority:100
+msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:297
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:281
+#: en/git-grep.txt:298
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:282
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:283 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:284
+#: en/git-grep.txt:301
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:289
+#: en/git-grep.txt:306
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:290 en/rev-list-options.txt:65
+#: en/git-grep.txt:307 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:294
+#: en/git-grep.txt:311
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:299
+#: en/git-grep.txt:316
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:300
+#: en/git-grep.txt:317
#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
@@ -27005,69 +27311,69 @@ msgstr ""
"<Datei>..."
#. type: Plain text
-#: en/git-grep.txt:303
+#: en/git-grep.txt:320
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:307
+#: en/git-grep.txt:324
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:328
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:318
+#: en/git-grep.txt:335
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:321
+#: en/git-grep.txt:338
#, fuzzy, priority:100
#| msgid "Adds content from all `\\*.txt` files under `Documentation` directory and its subdirectories:"
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr "F체ge die Inhalte aller `\\*.txt` Dateien unter dem `Documentation` Verzeichnis und seinen Unterverzeichnissen hinzu:"
#. type: Labeled list
-#: en/git-grep.txt:322
+#: en/git-grep.txt:339
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:325
+#: en/git-grep.txt:342
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:326
+#: en/git-grep.txt:343
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:329
+#: en/git-grep.txt:346
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:330
+#: en/git-grep.txt:347
#, fuzzy, no-wrap, priority:100
#| msgid "`git rm Documentation/\\*.txt`"
msgid "`git grep solution -- :^Documentation`"
msgstr "git rm Documentation/\\*.txt"
#. type: Plain text
-#: en/git-grep.txt:332
+#: en/git-grep.txt:349
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
@@ -27215,7 +27521,7 @@ msgstr ""
#. type: Labeled list
#: en/git-gui.txt:74
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "`git gui citool`"
msgstr "`git gui citool`"
@@ -27251,7 +27557,7 @@ msgstr ""
#. type: Labeled list
#: en/git-gui.txt:92
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "`git citool`"
msgstr "`git citool`"
@@ -27294,25 +27600,13 @@ msgstr ""
#. type: Plain text
#: en/git-gui.txt:116
#, priority:100
-msgid "A 'git gui' development repository can be obtained from:"
+msgid "The official repository of the 'git gui' project can be found at:"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:118
#, no-wrap, priority:100
-msgid " git clone git://repo.or.cz/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:122
-#, no-wrap, priority:100
-msgid " git clone http://repo.or.cz/r/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:124
-#, priority:100
-msgid "or browsed online at http://repo.or.cz/w/git-gui.git/[]."
+msgid " https://github.com/prati0100/git-gui.git/\n"
msgstr ""
#. type: Title =
@@ -30978,29 +31272,29 @@ msgstr ""
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
-#. type: Plain text
-#: en/git-ls-remote.txt:110
+#. type: delimited block -
+#: en/git-ls-remote.txt:111
#, no-wrap, priority:100
msgid ""
-"\t$ git ls-remote --tags ./.\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"\t$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
-"\t5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"\tc781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
-"\t$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
-"\t$ git ls-remote --tags korg v\\*\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"$ git ls-remote --tags ./.\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
+"$ git ls-remote --tags korg v\\*\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:114
+#: en/git-ls-remote.txt:116
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -31511,7 +31805,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:358
+#: en/git-merge-base.txt:60 en/git-rebase.txt:376
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -31540,236 +31834,236 @@ msgstr ""
msgid "For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:86
+#. type: delimited block .
+#: en/git-merge-base.txt:87
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---B\n"
-"\t /\n"
-"\t---o---1---o---o---o---A\n"
+"\t o---o---o---B\n"
+"\t/\n"
+"---o---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:88
+#: en/git-merge-base.txt:90
#, priority:100
msgid "the merge base between 'A' and 'B' is '1'."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:92
+#: en/git-merge-base.txt:94
#, priority:100
msgid "Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the merge base between 'A' and a hypothetical commit 'M', which is a merge between 'B' and 'C'. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:98
+#. type: delimited block .
+#: en/git-merge-base.txt:101
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---C\n"
-"\t /\n"
-"\t / o---o---o---B\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---C\n"
+" /\n"
+" / o---o---o---B\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:101
+#: en/git-merge-base.txt:105
#, priority:100
msgid "the result of `git merge-base A B C` is '1'. This is because the equivalent topology with a merge commit 'M' between 'B' and 'C' is:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:108
+#. type: delimited block .
+#: en/git-merge-base.txt:113
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---o\n"
-"\t / \\\n"
-"\t / o---o---o---o---M\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---o\n"
+" / \\\n"
+" / o---o---o---o---M\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:112
+#: en/git-merge-base.txt:118
#, priority:100
msgid "and the result of `git merge-base A M` is '1'. Commit '2' is also a common ancestor between 'A' and 'M', but '1' is a better common ancestor, because '2' is an ancestor of '1'. Hence, '2' is not a merge base."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:115
+#: en/git-merge-base.txt:121
#, priority:100
msgid "The result of `git merge-base --octopus A B C` is '2', because '2' is the best common ancestor of all commits."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:118
+#: en/git-merge-base.txt:124
#, priority:100
msgid "When the history involves criss-cross merges, there can be more than one 'best' common ancestor for two commits. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:124
+#. type: delimited block .
+#: en/git-merge-base.txt:131
#, no-wrap, priority:100
msgid ""
-"\t---1---o---A\n"
-"\t \\ /\n"
-"\t X\n"
-"\t / \\\n"
-"\t---2---o---o---B\n"
+"---1---o---A\n"
+" \\ /\n"
+" X\n"
+" / \\\n"
+"---2---o---o---B\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:128
+#: en/git-merge-base.txt:136
#, priority:100
msgid "both '1' and '2' are merge-bases of A and B. Neither one is better than the other (both are 'best' merge bases). When the `--all` option is not given, it is unspecified which best one is output."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:133
+#: en/git-merge-base.txt:141
#, priority:100
msgid "A common idiom to check \"fast-forward-ness\" between two commits A and B is (or at least used to be) to compute the merge base between A and B, and check if it is the same as A, in which case, A is an ancestor of B. You will see this idiom used often in older scripts."
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:139
+#. type: delimited block .
+#: en/git-merge-base.txt:148
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tA=$(git rev-parse --verify A)\n"
-"\tif test \"$A\" = \"$(git merge-base A B)\"\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"A=$(git rev-parse --verify A)\n"
+"if test \"$A\" = \"$(git merge-base A B)\"\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:141
+#: en/git-merge-base.txt:151
#, priority:100
msgid "In modern git, you can say this in a more direct way:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:146
+#. type: delimited block .
+#: en/git-merge-base.txt:157
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tif git merge-base --is-ancestor A B\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"if git merge-base --is-ancestor A B\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:148
+#: en/git-merge-base.txt:160
#, priority:100
msgid "instead."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:150
+#: en/git-merge-base.txt:162
#, no-wrap, priority:100
msgid "Discussion on fork-point mode"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:156
+#: en/git-merge-base.txt:168
#, priority:100
msgid "After working on the `topic` branch created with `git switch -c topic origin/master`, the history of remote-tracking branch `origin/master` may have been rewound and rebuilt, leading to a history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:164
+#. type: delimited block .
+#: en/git-merge-base.txt:177
#, no-wrap, priority:100
msgid ""
-"\t o---B2\n"
-"\t /\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t \\\n"
-"\t B0\n"
-"\t \\\n"
-"\t D0---D1---D (topic)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\\n"
+"\t B0\n"
+"\t \\\n"
+"\t D0---D1---D (topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:170
+#: en/git-merge-base.txt:184
#, priority:100
msgid "where `origin/master` used to point at commits B0, B1, B2 and now it points at B, and your `topic` branch was started on top of it back when `origin/master` was at B0, and you built three commits, D0, D1, and D, on top of it. Imagine that you now want to rebase the work you did on the topic on top of the updated origin/master."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:176
+#: en/git-merge-base.txt:190
#, priority:100
msgid "In such a case, `git merge-base origin/master topic` would return the parent of B0 in the above picture, but B0^..D is *not* the range of commits you would want to replay on top of B (it includes B0, which is not what you wrote; it is a commit the other side discarded when it moved its tip from B0 to B1)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:184
+#: en/git-merge-base.txt:198
#, priority:100
msgid "`git merge-base --fork-point origin/master topic` is designed to help in such a case. It takes not only B but also B0, B1, and B2 (i.e. old tips of the remote-tracking branches your repository's reflog knows about) into account to see on which commit your topic branch was built and finds B0, allowing you to replay only the commits on your topic, excluding the commits the other side later discarded."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:186
+#: en/git-merge-base.txt:200
#, priority:100
msgid "Hence"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:188
+#: en/git-merge-base.txt:202
#, no-wrap, priority:100
msgid " $ fork_point=$(git merge-base --fork-point origin/master topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:190
+#: en/git-merge-base.txt:204
#, priority:100
msgid "will find B0, and"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:192
+#: en/git-merge-base.txt:206
#, fuzzy, no-wrap, priority:100
#| msgid "$ git checkout mytopic\n"
msgid " $ git rebase --onto origin/master $fork_point topic\n"
msgstr "$ git checkout mytopic\n"
#. type: Plain text
-#: en/git-merge-base.txt:195
+#: en/git-merge-base.txt:209
#, priority:100
msgid "will replay D0, D1 and D on top of B to create a new history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:203
+#. type: delimited block .
+#: en/git-merge-base.txt:218
#, no-wrap, priority:100
msgid ""
-"\t\t\t o---B2\n"
-"\t\t\t/\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t\t\\ \\\n"
-"\t\t B0 D0'--D1'--D' (topic - updated)\n"
-"\t\t \\\n"
-"\t\t D0---D1---D (topic - old)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\ \\\n"
+"\t B0 D0'--D1'--D' (topic - updated)\n"
+"\t \\\n"
+"\t D0---D1---D (topic - old)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:210
+#: en/git-merge-base.txt:226
#, priority:100
msgid "A caveat is that older reflog entries in your repository may be expired by `git gc`. If B0 no longer appears in the reflog of the remote-tracking branch `origin/master`, the `--fork-point` mode obviously cannot find it and fails, avoiding to give a random and useless result (such as the parent of B0, like the same command without the `--fork-point` option gives)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:221
+#: en/git-merge-base.txt:237
#, priority:100
msgid "Also, the remote-tracking branch you use the `--fork-point` mode with must be the one your topic forked from its tip. If you forked from an older commit than the tip, this mode would not find the fork point (imagine in the above sample history B0 did not exist, origin/master started at B1, moved to B2 and then B, and you forked your topic at origin/master^ when origin/master was B1; the shape of the history would be the same as above, without B0, and the parent of B1 is what `git merge-base origin/master topic` correctly finds, but the `--fork-point` mode will not, because it is not one of the commits that used to be at the tip of origin/master)."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:224
+#: en/git-merge-base.txt:240
#, no-wrap, priority:100
msgid "See also"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:228
+#: en/git-merge-base.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
msgstr "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
@@ -31988,31 +32282,31 @@ msgstr ""
"#-#-#-#-# git-remote-de.po (PACKAGE VERSION) #-#-#-#-#\n"
"Beispiele"
-#. type: Plain text
-#: en/git-merge-index.txt:62
+#. type: delimited block -
+#: en/git-merge-index.txt:63
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
-" This is MM from the original tree.\t\t\t# original\n"
-" This is modified MM in the branch A.\t\t\t# merge1\n"
-" This is modified MM in the branch B.\t\t\t# merge2\n"
-" This is modified MM in the branch B.\t\t\t# current contents\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
+"This is MM from the original tree.\t\t# original\n"
+"This is modified MM in the branch A.\t\t# merge1\n"
+"This is modified MM in the branch B.\t\t# merge2\n"
+"This is modified MM in the branch B.\t\t# current contents\n"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:71
+#. type: delimited block -
+#: en/git-merge-index.txt:74
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
-" cat: : No such file or directory\n"
-" This is added AA in the branch A.\n"
-" This is added AA in the branch B.\n"
-" This is added AA in the branch B.\n"
-" fatal: merge program failed\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
+"cat: : No such file or directory\n"
+"This is added AA in the branch A.\n"
+"This is added AA in the branch B.\n"
+"This is added AA in the branch B.\n"
+"fatal: merge program failed\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-index.txt:76
+#: en/git-merge-index.txt:80
#, priority:100
msgid "where the latter example shows how 'git merge-index' will stop trying to merge once anything has returned an error (i.e., `cat` returned an error for the AA file, because it didn't exist in the original, and thus 'git merge-index' didn't even try to merge the MM thing)."
msgstr ""
@@ -32314,7 +32608,7 @@ msgstr "Zwei oder mehr Entwicklungszweige zusammenf체hren."
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n"
-"\t[-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
+"\t[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
"\t[--[no-]allow-unrelated-histories]\n"
"\t[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]\n"
"'git merge' (--continue | --abort | --quit)\n"
@@ -33419,7 +33713,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:281 en/merge-options.txt:108
+#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -33886,7 +34180,7 @@ msgstr ""
#. type: delimited block -
#: en/git-p4.txt:94
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "$ git p4 sync\n"
msgstr "$ git p4 sync\n"
@@ -34410,7 +34704,7 @@ msgid "Conflicts can occur when applying a commit to p4. When this happens, the
msgstr ""
#. type: Labeled list
-#: en/git-p4.txt:359 en/git-submodule.txt:270
+#: en/git-p4.txt:359 en/git-submodule.txt:271
#, no-wrap, priority:220
msgid "--branch <branch>"
msgstr "--branch <Branch>"
@@ -35548,7 +35842,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:263 en/rev-list-options.txt:760
+#: en/git-pack-objects.txt:263 en/rev-list-options.txt:776
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -35560,13 +35854,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:266 en/rev-list-options.txt:767
+#: en/git-pack-objects.txt:266 en/rev-list-options.txt:783
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:269 en/rev-list-options.txt:770
+#: en/git-pack-objects.txt:269 en/rev-list-options.txt:786
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -35578,7 +35872,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:276 en/rev-list-options.txt:777
+#: en/git-pack-objects.txt:276 en/rev-list-options.txt:793
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -35590,7 +35884,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:281 en/rev-list-options.txt:785
+#: en/git-pack-objects.txt:281 en/rev-list-options.txt:801
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -36357,13 +36651,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:502
+#: en/git-pull.txt:136 en/git-rebase.txt:524
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:503
+#: en/git-pull.txt:137 en/git-rebase.txt:525
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -37307,7 +37601,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:597
-#, ignore-same, no-wrap, priority:220
+#, no-wrap, priority:220
msgid "`git push origin master`"
msgstr "`git push origin master`"
@@ -38165,8 +38459,8 @@ msgstr ""
#: en/git-rebase.txt:16
#, no-wrap, priority:100
msgid ""
-"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
-"\t[<upstream> [<branch>]]\n"
+"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>]\n"
+"\t[--onto <newbase> | --keep-base] [<upstream> [<branch>]]\n"
"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
"\t--root [<branch>]\n"
"'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch)\n"
@@ -38486,518 +38780,548 @@ msgstr ""
msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:220
+#, ignore-same, no-wrap, priority:100
+msgid "--keep-base"
+msgstr "--keep-base"
+
+#. type: Plain text
+#: en/git-rebase.txt:225
+#, ignore-ellipsis, priority:100
+msgid "Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running 'git rebase --keep-base <upstream> <branch>' is equivalent to running 'git rebase --onto <upstream>... <upstream>'."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:230
+#, priority:100
+msgid "This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is."
+msgstr ""
+
#. type: Plain text
-#: en/git-rebase.txt:224
+#: en/git-rebase.txt:235
+#, priority:100
+msgid "Although both this option and --fork-point find the merge base between <upstream> and <branch>, this option uses the merge base as the _starting point_ on which new commits will be created, whereas --fork-point uses the merge base to determine the _set of commits_ which will be rebased."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#, priority:100
+msgid "See also INCOMPATIBLE OPTIONS below."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:242
#, priority:100
msgid "Upstream branch to compare against. May be any valid commit, not just an existing branch name. Defaults to the configured upstream for the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:230
+#: en/git-rebase.txt:248
#, priority:100
msgid "Restart the rebasing process after having resolved a merge conflict."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237
+#: en/git-rebase.txt:255
#, priority:100
msgid "Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:242
+#: en/git-rebase.txt:260
#, priority:100
msgid "Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:243 en/git-rebase.txt:538
+#: en/git-rebase.txt:261 en/git-rebase.txt:560
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:246
+#: en/git-rebase.txt:264
#, priority:100
msgid "Keep the commits that do not change anything from its parents in the result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:248 en/git-rebase.txt:255 en/git-rebase.txt:280 en/git-rebase.txt:293 en/git-rebase.txt:302 en/git-rebase.txt:344 en/git-rebase.txt:379 en/git-rebase.txt:386 en/git-rebase.txt:393 en/git-rebase.txt:405 en/git-rebase.txt:445 en/git-rebase.txt:470 en/git-rebase.txt:482 en/git-rebase.txt:501
-#, priority:100
-msgid "See also INCOMPATIBLE OPTIONS below."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rebase.txt:253
+#: en/git-rebase.txt:271
#, priority:100
msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:258
+#: en/git-rebase.txt:276
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:259 en/git-rebase.txt:539
+#: en/git-rebase.txt:277 en/git-rebase.txt:561
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:261
+#: en/git-rebase.txt:279
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:266
+#: en/git-rebase.txt:284
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:272
+#: en/git-rebase.txt:290
#, priority:100
msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:278
+#: en/git-rebase.txt:296
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:286
+#: en/git-rebase.txt:304
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:291
+#: en/git-rebase.txt:309
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:294
+#: en/git-rebase.txt:312
#, fuzzy, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr "--strategy-option"
#. type: Labeled list
-#: en/git-rebase.txt:295
+#: en/git-rebase.txt:313
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:300
+#: en/git-rebase.txt:318
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:317
+#: en/git-rebase.txt:335
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:321
+#: en/git-rebase.txt:339
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:325
+#: en/git-rebase.txt:343
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:329
+#: en/git-rebase.txt:347
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:332
+#: en/git-rebase.txt:350
#, fuzzy, priority:100
#| msgid "This option bypasses the pre-commit and commit-msg hooks. See also linkgit:githooks[5]."
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr "Diese Option schaltet die pre-commit und commit-msg Einsprungspunkte (hooks) aus. Siehe auch linkgit:githooks[5]."
#. type: Labeled list
-#: en/git-rebase.txt:333 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:336
+#: en/git-rebase.txt:354
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:345 en/merge-options.txt:47
+#: en/git-rebase.txt:363 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:346
+#: en/git-rebase.txt:364
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:351
+#: en/git-rebase.txt:369
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:357
+#: en/git-rebase.txt:375
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:359
+#: en/git-rebase.txt:377
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:363
+#: en/git-rebase.txt:381
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:387
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:372
+#: en/git-rebase.txt:390
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:394
+#, priority:100
+msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:399
#, priority:100
msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:384
+#: en/git-rebase.txt:406
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:391
+#: en/git-rebase.txt:413
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:421
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:403
+#: en/git-rebase.txt:425
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:407
+#: en/git-rebase.txt:429
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:415
+#: en/git-rebase.txt:437
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:422
+#: en/git-rebase.txt:444
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:426
+#: en/git-rebase.txt:448
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges`, but in contrast to that option works well in interactive rebases: commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:430
+#: en/git-rebase.txt:452
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:432
+#: en/git-rebase.txt:454
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:434 en/git-rebase.txt:535 en/git-svn.txt:680
+#: en/git-rebase.txt:456 en/git-rebase.txt:557 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:439
+#: en/git-rebase.txt:461
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:443
+#: en/git-rebase.txt:465
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:446
+#: en/git-rebase.txt:468
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:447
+#: en/git-rebase.txt:469
#, fuzzy, no-wrap, priority:100
#| msgid "-c <commit>"
msgid "--exec <cmd>"
msgstr "-c <commit>"
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:474
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:455
+#: en/git-rebase.txt:477
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:457
+#: en/git-rebase.txt:479
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:459
+#: en/git-rebase.txt:481
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:483
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:487
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:490
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:480
+#: en/git-rebase.txt:502
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:505
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:484
+#: en/git-rebase.txt:506
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:495
+#: en/git-rebase.txt:517
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:499
+#: en/git-rebase.txt:521
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:509
+#: en/git-rebase.txt:531
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:510
+#: en/git-rebase.txt:532
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:511
+#: en/git-rebase.txt:533
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:514
+#: en/git-rebase.txt:536
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:516
+#: en/git-rebase.txt:538
#, fuzzy, no-wrap, priority:100
#| msgid "OPTIONS"
msgid "INCOMPATIBLE OPTIONS"
msgstr "OPTIONS"
#. type: Plain text
-#: en/git-rebase.txt:519
+#: en/git-rebase.txt:541
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:523
+#: en/git-rebase.txt:545
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:527
+#: en/git-rebase.txt:549
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:530
+#: en/git-rebase.txt:552
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:553
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:555
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Plain text
-#: en/git-rebase.txt:534
+#: en/git-rebase.txt:556
#, ignore-same, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:537
+#: en/git-rebase.txt:559
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:540
+#: en/git-rebase.txt:562
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:542
+#: en/git-rebase.txt:564
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:544
+#: en/git-rebase.txt:566
#, fuzzy, priority:100
#| msgid "--preserve-merges"
msgid "--preserve-merges and --interactive"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:567
#, fuzzy, priority:100
#| msgid "--preserve-merges"
msgid "--preserve-merges and --signoff"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:546
+#: en/git-rebase.txt:568
#, fuzzy, priority:100
#| msgid "--preserve-merges"
msgid "--preserve-merges and --rebase-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:547
+#: en/git-rebase.txt:569
#, priority:100
-msgid "--rebase-merges and --strategy"
+msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:548
+#: en/git-rebase.txt:570
#, priority:100
-msgid "--rebase-merges and --strategy-option"
+msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:550
+#: en/git-rebase.txt:572
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:575
#, no-wrap, priority:100
msgid "There are some subtle differences how the backends behave.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:556
+#: en/git-rebase.txt:578
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -39005,7 +39329,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:561
+#: en/git-rebase.txt:583
#, no-wrap, priority:100
msgid ""
"The am backend drops any \"empty\" commits, regardless of whether the\n"
@@ -39015,7 +39339,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:588
#, no-wrap, priority:100
msgid ""
"The interactive backend drops commits by default that\n"
@@ -39025,7 +39349,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:591
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -39033,7 +39357,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:573
+#: en/git-rebase.txt:595
#, no-wrap, priority:100
msgid ""
"Directory rename heuristics are enabled in the merge and interactive\n"
@@ -39042,147 +39366,147 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:597
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:577
+#: en/git-rebase.txt:599
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:582
+#: en/git-rebase.txt:604
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:587
+#: en/git-rebase.txt:609
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:589
+#: en/git-rebase.txt:611
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:596
+#: en/git-rebase.txt:618
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:598
+#: en/git-rebase.txt:620
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:600
+#: en/git-rebase.txt:622
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:601
+#: en/git-rebase.txt:623
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:602
+#: en/git-rebase.txt:624
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:603
+#: en/git-rebase.txt:625
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:605
+#: en/git-rebase.txt:627
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:607
+#: en/git-rebase.txt:629
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:631
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:610
+#: en/git-rebase.txt:632
#, fuzzy, priority:100
#| msgid "-C <commit>"
msgid "commit"
msgstr "-C <commit>"
#. type: Plain text
-#: en/git-rebase.txt:612
+#: en/git-rebase.txt:634
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:614
+#: en/git-rebase.txt:636
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:615
+#: en/git-rebase.txt:637
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:616
+#: en/git-rebase.txt:638
#, fuzzy, priority:100
#| msgid "-C <commit>"
msgid "commit it"
msgstr "-C <commit>"
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:644
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:646
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:626
+#: en/git-rebase.txt:648
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:653
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:658
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -39191,74 +39515,74 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:641
+#: en/git-rebase.txt:663
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:668
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:649
+#: en/git-rebase.txt:671
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:652
+#: en/git-rebase.txt:674
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:655
+#: en/git-rebase.txt:677
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:685
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:667
+#: en/git-rebase.txt:689
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:693
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:696
#, fuzzy, no-wrap, priority:100
#| msgid "$ git log -g -2 HEAD\n"
msgid "$ git rebase -i HEAD~5\n"
msgstr "$ git log -g -2 HEAD\n"
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:699
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:680
+#: en/git-rebase.txt:702
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:687
+#: en/git-rebase.txt:709
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -39269,26 +39593,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:691
+#: en/git-rebase.txt:713
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:694
+#: en/git-rebase.txt:716
#, fuzzy, no-wrap, priority:100
#| msgid "$ git log -g -2 HEAD\n"
msgid "$ git rebase -i -r --onto Q O\n"
msgstr "$ git log -g -2 HEAD\n"
#. type: Plain text
-#: en/git-rebase.txt:701
+#: en/git-rebase.txt:723
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:710
+#: en/git-rebase.txt:732
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -39301,31 +39625,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:715
+#: en/git-rebase.txt:737
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:720
+#: en/git-rebase.txt:742
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:745
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:727
+#: en/git-rebase.txt:749
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:759
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -39339,85 +39663,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:740
+#: en/git-rebase.txt:762
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:746
+#: en/git-rebase.txt:768
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:750
+#: en/git-rebase.txt:772
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:752
+#: en/git-rebase.txt:774
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:756
+#: en/git-rebase.txt:778
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:760
+#: en/git-rebase.txt:782
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:763
+#: en/git-rebase.txt:785
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:765
+#: en/git-rebase.txt:787
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:767
+#: en/git-rebase.txt:789
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:794
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:775
+#: en/git-rebase.txt:797
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:804
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:809
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:816
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39428,13 +39752,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:819
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:826
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39445,13 +39769,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:808
+#: en/git-rebase.txt:830
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:815
+#: en/git-rebase.txt:837
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39462,73 +39786,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:822
+#: en/git-rebase.txt:844
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:824
+#: en/git-rebase.txt:846
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:825
+#: en/git-rebase.txt:847
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:829
+#: en/git-rebase.txt:851
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:836
+#: en/git-rebase.txt:859
#, priority:100
-msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or `filter-branch`."
+msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:839
+#: en/git-rebase.txt:862
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:867
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:848
+#: en/git-rebase.txt:871
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:850
+#: en/git-rebase.txt:873
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:875
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:858
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39539,19 +39863,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:885
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:866
+#: en/git-rebase.txt:889
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:894
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -39561,67 +39885,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:876
+#: en/git-rebase.txt:899
#, priority:100
-msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge-base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
+msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:880
+#: en/git-rebase.txt:903
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:883
+#: en/git-rebase.txt:906
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:886
+#: en/git-rebase.txt:909
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:888
+#: en/git-rebase.txt:911
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:893
+#: en/git-rebase.txt:916
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:895
+#: en/git-rebase.txt:918
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:926
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:907
+#: en/git-rebase.txt:930
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:912
+#: en/git-rebase.txt:935
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:922
+#: en/git-rebase.txt:945
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -39635,25 +39959,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:929
+#: en/git-rebase.txt:952
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:932
+#: en/git-rebase.txt:955
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:935 en/git-rebase.txt:1012
+#: en/git-rebase.txt:958 en/git-rebase.txt:1035
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:941
+#: en/git-rebase.txt:964
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39664,7 +39988,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:946
+#: en/git-rebase.txt:969
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39674,7 +39998,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:950
+#: en/git-rebase.txt:973
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39683,55 +40007,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:954
+#: en/git-rebase.txt:977
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:962
+#: en/git-rebase.txt:985
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:992
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:975
+#: en/git-rebase.txt:998
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:978
+#: en/git-rebase.txt:1001
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1008
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:989
+#: en/git-rebase.txt:1012
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:996
+#: en/git-rebase.txt:1019
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1003
+#: en/git-rebase.txt:1026
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39742,13 +40066,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1009
+#: en/git-rebase.txt:1032
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1015
+#: en/git-rebase.txt:1038
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39756,7 +40080,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1022
+#: en/git-rebase.txt:1045
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39768,7 +40092,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1049
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39777,37 +40101,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1035
+#: en/git-rebase.txt:1058
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1037
+#: en/git-rebase.txt:1060
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1039
+#: en/git-rebase.txt:1062
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1043
+#: en/git-rebase.txt:1066
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1068
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1072
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -40116,118 +40440,119 @@ msgstr ""
msgid "Using this hook, it is easy to generate mails describing the updates to the repository. This example script sends one mail message per ref listing the commits pushed to the repository, and logs the push certificates of signed pushes with good signatures to a logger service:"
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:191
+#. type: delimited block -
+#: en/git-receive-pack.txt:192
#, no-wrap, priority:100
msgid ""
-"\t#!/bin/sh\n"
-"\t# mail out commit update information.\n"
-"\twhile read oval nval ref\n"
-"\tdo\n"
-"\t\tif expr \"$oval\" : '0*$' >/dev/null\n"
-"\t\tthen\n"
-"\t\t\techo \"Created a new ref, with the following commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\"\n"
-"\t\telse\n"
-"\t\t\techo \"New commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
-"\t\tfi |\n"
-"\t\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
-"\tdone\n"
-"\t# log signed push certificate, if any\n"
-"\tif test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"#!/bin/sh\n"
+"# mail out commit update information.\n"
+"while read oval nval ref\n"
+"do\n"
+"\tif expr \"$oval\" : '0*$' >/dev/null\n"
"\tthen\n"
-"\t\t(\n"
-"\t\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
-"\t\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
-"\t\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
-"\tfi\n"
-"\texit 0\n"
+"\t\techo \"Created a new ref, with the following commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\"\n"
+"\telse\n"
+"\t\techo \"New commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
+"\tfi |\n"
+"\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
+"done\n"
+"# log signed push certificate, if any\n"
+"if test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"then\n"
+"\t(\n"
+"\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
+"\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
+"\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
+"fi\n"
+"exit 0\n"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:194
+#: en/git-receive-pack.txt:196
#, priority:100
msgid "The exit code from this hook invocation is ignored, however a non-zero exit code will generate an error message."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:200
+#: en/git-receive-pack.txt:202
#, priority:100
msgid "Note that it is possible for refname to not have sha1-new when this hook runs. This can easily occur if another user modifies the ref after it was updated by 'git-receive-pack', but before the hook was able to evaluate it. It is recommended that hooks rely on sha1-new rather than the current value of refname."
msgstr ""
#. type: Title -
-#: en/git-receive-pack.txt:202
+#: en/git-receive-pack.txt:204
#, no-wrap, priority:100
msgid "POST-UPDATE HOOK"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:207
+#: en/git-receive-pack.txt:209
#, priority:100
msgid "After all other processing, if at least one ref was updated, and if $GIT_DIR/hooks/post-update file exists and is executable, then post-update will be called with the list of refs that have been updated. This can be used to implement any repository wide cleanup tasks."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:211
+#: en/git-receive-pack.txt:213
#, priority:100
msgid "The exit code from this hook invocation is ignored; the only thing left for 'git-receive-pack' to do at that point is to exit itself anyway."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:214
+#: en/git-receive-pack.txt:216
#, priority:100
msgid "This hook can be used, for example, to run `git update-server-info` if the repository is packed and is served via a dumb transport."
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:217
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/git-receive-pack.txt:220
+#, fuzzy, no-wrap, priority:100
+#| msgid "'git update-server-info'\n"
msgid ""
-"\t#!/bin/sh\n"
-"\texec git update-server-info\n"
-msgstr ""
+"#!/bin/sh\n"
+"exec git update-server-info\n"
+msgstr "'git-update-server-info'\n"
#. type: Title -
-#: en/git-receive-pack.txt:220
+#: en/git-receive-pack.txt:224
#, fuzzy, no-wrap, priority:100
#| msgid "ENVIRONMENT"
msgid "QUARANTINE ENVIRONMENT"
msgstr "ENVIRONMENT"
#. type: Plain text
-#: en/git-receive-pack.txt:227
+#: en/git-receive-pack.txt:231
#, priority:100
msgid "When `receive-pack` takes in objects, they are placed into a temporary \"quarantine\" directory within the `$GIT_DIR/objects` directory and migrated into the main object store only after the `pre-receive` hook has completed. If the push fails before then, the temporary directory is removed entirely."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:229
+#: en/git-receive-pack.txt:233
#, priority:100
msgid "This has a few user-visible effects and caveats:"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:235
+#: en/git-receive-pack.txt:239
#, priority:100
msgid "Pushes which fail due to problems with the incoming pack, missing objects, or due to the `pre-receive` hook will not leave any on-disk data. This is usually helpful to prevent repeated failed pushes from filling up your disk, but can make debugging more challenging."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:238
+#: en/git-receive-pack.txt:242
#, priority:100
msgid "Any objects created by the `pre-receive` hook will be created in the quarantine directory (and migrated only if it succeeds)."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:244
+#: en/git-receive-pack.txt:248
#, priority:100
msgid "The `pre-receive` hook MUST NOT update any refs to point to quarantined objects. Other programs accessing the repository will not be able to see the objects (and if the pre-receive hook fails, those refs would become corrupted). For safety, any ref updates from within `pre-receive` are automatically rejected."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:249
+#: en/git-receive-pack.txt:253
#, ignore-same, priority:100
msgid "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
msgstr "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
@@ -40811,7 +41136,7 @@ msgstr "Ohne Argumente wird eine Liste der vorhandenen Remotes angezeigt. Mehre
#. type: Labeled list
#: en/git-remote.txt:47
-#, ignore-same, no-wrap, priority:220
+#, no-wrap, priority:220
msgid "'add'"
msgstr "'add'"
@@ -40901,7 +41226,7 @@ msgstr ""
#. type: Labeled list
#: en/git-remote.txt:93
-#, ignore-same, no-wrap, priority:220
+#, no-wrap, priority:220
msgid "'rm'"
msgstr "'rm'"
@@ -41028,7 +41353,7 @@ msgstr ""
#. type: Labeled list
#: en/git-remote.txt:166
-#, ignore-same, no-wrap, priority:220
+#, no-wrap, priority:220
msgid "'show'"
msgstr "'show'"
@@ -41046,7 +41371,7 @@ msgstr "Mit der Option `-n`, werden die entfernten Heads nicht zuerst mit `git l
#. type: Labeled list
#: en/git-remote.txt:173
-#, ignore-same, no-wrap, priority:220
+#, no-wrap, priority:220
msgid "'prune'"
msgstr "'prune'"
@@ -41071,7 +41396,7 @@ msgstr "Mit der Option `--dry-run`, wird lediglich angezeigt, welche Zweige gel
#. type: Labeled list
#: en/git-remote.txt:187
-#, ignore-same, no-wrap, priority:220
+#, no-wrap, priority:220
msgid "'update'"
msgstr "'update'"
@@ -41424,7 +41749,7 @@ msgstr "Gibt Informationen 체ber das entfernte Repository <Name> aus."
#. type: delimited block -
#: en/git-replace.txt:51
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "$ git cat-file commit foo\n"
msgstr "$ git cat-file commit foo\n"
@@ -41577,7 +41902,7 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:131
#, priority:100
-msgid "linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and linkgit:git-rebase[1], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
+msgid "linkgit:git-hash-object[1], linkgit:git-rebase[1], and https://github.com/newren/git-filter-repo[git-filter-repo], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
msgstr ""
#. type: Plain text
@@ -41600,8 +41925,9 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:158
-#, priority:100
-msgid "linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1]"
+#, fuzzy, priority:100
+#| msgid "linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1]"
+msgid "linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] https://github.com/newren/git-filter-repo[git-filter-repo]"
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title =
@@ -41806,7 +42132,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rerere.txt:49
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "'diff'"
msgstr "'diff'"
@@ -42413,7 +42739,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:228 en/git-stash.txt:229
+#: en/git-reset.txt:228 en/git-stash.txt:230
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -43165,102 +43491,50 @@ msgid "git-rev-list - Lists commit objects in reverse chronological order"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:65
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"'git rev-list' [ --max-count=<number> ]\n"
-"\t [ --skip=<number> ]\n"
-"\t [ --max-age=<timestamp> ]\n"
-"\t [ --min-age=<timestamp> ]\n"
-"\t [ --sparse ]\n"
-"\t [ --merges ]\n"
-"\t [ --no-merges ]\n"
-"\t [ --min-parents=<number> ]\n"
-"\t [ --no-min-parents ]\n"
-"\t [ --max-parents=<number> ]\n"
-"\t [ --no-max-parents ]\n"
-"\t [ --first-parent ]\n"
-"\t [ --remove-empty ]\n"
-"\t [ --full-history ]\n"
-"\t [ --not ]\n"
-"\t [ --all ]\n"
-"\t [ --branches[=<pattern>] ]\n"
-"\t [ --tags[=<pattern>] ]\n"
-"\t [ --remotes[=<pattern>] ]\n"
-"\t [ --glob=<glob-pattern> ]\n"
-"\t [ --ignore-missing ]\n"
-"\t [ --stdin ]\n"
-"\t [ --quiet ]\n"
-"\t [ --topo-order ]\n"
-"\t [ --parents ]\n"
-"\t [ --timestamp ]\n"
-"\t [ --left-right ]\n"
-"\t [ --left-only ]\n"
-"\t [ --right-only ]\n"
-"\t [ --cherry-mark ]\n"
-"\t [ --cherry-pick ]\n"
-"\t [ --encoding=<encoding> ]\n"
-"\t [ --(author|committer|grep)=<pattern> ]\n"
-"\t [ --regexp-ignore-case | -i ]\n"
-"\t [ --extended-regexp | -E ]\n"
-"\t [ --fixed-strings | -F ]\n"
-"\t [ --date=<format>]\n"
-"\t [ [ --objects | --objects-edge | --objects-edge-aggressive ]\n"
-"\t [ --unpacked ]\n"
-"\t [ --object-names | --no-object-names ]\n"
-"\t [ --filter=<filter-spec> [ --filter-print-omitted ] ] ]\n"
-"\t [ --missing=<missing-action> ]\n"
-"\t [ --pretty | --header ]\n"
-"\t [ --bisect ]\n"
-"\t [ --bisect-vars ]\n"
-"\t [ --bisect-all ]\n"
-"\t [ --merge ]\n"
-"\t [ --reverse ]\n"
-"\t [ --walk-reflogs ]\n"
-"\t [ --no-walk ] [ --do-walk ]\n"
-"\t [ --count ]\n"
-"\t [ --use-bitmap-index ]\n"
-"\t <commit>... [ \\-- <paths>... ]\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:73
+#: en/git-rev-list.txt:13
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
+#| msgid "'git diff' [--options] <commit> [--] [<path>...]"
+msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n"
+msgstr "'git diff' [--options] <commit> [--] [<path>...]"
+
+#. type: Plain text
+#: en/git-rev-list.txt:21
#, priority:100
msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:80
+#: en/git-rev-list.txt:28
#, priority:100
msgid "You can think of this as a set operation. Commits given on the command line form a set of commits that are reachable from any of them, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:82
+#: en/git-rev-list.txt:30
#, priority:100
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:85
+#: en/git-rev-list.txt:33
#, no-wrap, priority:100
msgid "\t$ git rev-list foo bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:89
+#: en/git-rev-list.txt:37
#, priority:100
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:93
+#: en/git-rev-list.txt:41
#, priority:100
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:97
+#: en/git-rev-list.txt:45
#, no-wrap, priority:100
msgid ""
"\t$ git rev-list origin..HEAD\n"
@@ -43268,13 +43542,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:102
+#: en/git-rev-list.txt:50
#, ignore-ellipsis, priority:100
msgid "Another special notation is \"'<commit1>'...'<commit2>'\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:106
+#: en/git-rev-list.txt:54
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git rev-list A B --not $(git merge-base --all A B)\n"
@@ -43282,7 +43556,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:113
+#: en/git-rev-list.txt:61
#, priority:100
msgid "'rev-list' is a very essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For this reason, it has a lot of different options that enables it to be used by commands as different as 'git bisect' and 'git repack'."
msgstr ""
@@ -44858,7 +45132,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:230
-#, priority:100
+#, no-wrap, priority:100
msgid "--smtp-server-option=<option>"
msgstr "--smtp-server-option=<Option>"
@@ -45425,31 +45699,31 @@ msgstr ""
msgid "To use 'git send-email' to send your patches through the GMail SMTP server, edit ~/.gitconfig to specify your account settings:"
msgstr ""
-#. type: Plain text
-#: en/git-send-email.txt:494
+#. type: delimited block -
+#: en/git-send-email.txt:495
#, no-wrap, priority:100
msgid ""
-"\t[sendemail]\n"
-"\t\tsmtpEncryption = tls\n"
-"\t\tsmtpServer = smtp.gmail.com\n"
-"\t\tsmtpUser = yourname@gmail.com\n"
-"\t\tsmtpServerPort = 587\n"
+"[sendemail]\n"
+"\tsmtpEncryption = tls\n"
+"\tsmtpServer = smtp.gmail.com\n"
+"\tsmtpUser = yourname@gmail.com\n"
+"\tsmtpServerPort = 587\n"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:498
+#: en/git-send-email.txt:500
#, priority:100
msgid "If you have multifactor authentication setup on your gmail account, you will need to generate an app-specific password for use with 'git send-email'. Visit https://security.google.com/settings/security/apppasswords to create it."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:501
+#: en/git-send-email.txt:503
#, priority:100
msgid "Once your commits are ready to be sent to the mailing list, run the following commands:"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:505
+#: en/git-send-email.txt:507
#, no-wrap, priority:100
msgid ""
"\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -45458,20 +45732,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:510
+#: en/git-send-email.txt:512
#, priority:100
msgid "The first time you run it, you will be prompted for your credentials. Enter the app-specific or your regular password as appropriate. If you have credential helper configured (see linkgit:git-credential[1]), the password will be saved in the credential store so you won't have to type it the next time."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:518
#, priority:100
msgid "Note: the following core Perl modules that may be installed with your distribution of Perl are required: MIME::Base64, MIME::QuotedPrint, Net::Domain and Net::SMTP. These additional Perl modules are also required: Authen::SASL and Mail::Address."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:521
-#, ignore-same, priority:100
+#: en/git-send-email.txt:523
+#, priority:100
msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
msgstr "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
@@ -45760,7 +46034,7 @@ msgstr ""
#. type: Title =
#: en/git-sh-i18n--envsubst.txt:2
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "git-sh-i18n{litdd}envsubst(1)"
msgstr "git-sh-i18n{litdd}envsubst(1)"
@@ -47071,25 +47345,25 @@ msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--a
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:92
+#: en/git-stash.txt:93
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs, and any non-option arguments form the message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:93
+#: en/git-stash.txt:94
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:100
+#: en/git-stash.txt:101
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:104
+#: en/git-stash.txt:105
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -47097,140 +47371,140 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:108
+#: en/git-stash.txt:109
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr "Der Befehl akzeptiert dieselben Optionen wie 'git log' um die Ausgabe zu steuern. Siehe linkgit:git-log[1]."
#. type: Labeled list
-#: en/git-stash.txt:109
+#: en/git-stash.txt:110
#, fuzzy, no-wrap, priority:240
#| msgid "'git log' <option>..."
msgid "show [<options>] [<stash>]"
msgstr "'git log' <option>..."
#. type: Plain text
-#: en/git-stash.txt:119
+#: en/git-stash.txt:120
#, priority:240
msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:120
+#: en/git-stash.txt:121
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:126
+#: en/git-stash.txt:127
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:130
+#: en/git-stash.txt:131
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:135
+#: en/git-stash.txt:136
#, priority:240
msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:138
+#: en/git-stash.txt:139
#, priority:240
msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:139
+#: en/git-stash.txt:140
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:145
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:145
+#: en/git-stash.txt:146
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:153
+#: en/git-stash.txt:154
#, priority:240
msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:159
+#: en/git-stash.txt:160
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:160
+#: en/git-stash.txt:161
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:164
+#: en/git-stash.txt:165
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:165
+#: en/git-stash.txt:166
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:171
+#: en/git-stash.txt:172
#, priority:240
msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:172 en/git-update-ref.txt:100
+#: en/git-stash.txt:173 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:179
+#: en/git-stash.txt:180
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:180
+#: en/git-stash.txt:181
#, no-wrap, priority:240
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:186
+#: en/git-stash.txt:187
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:195
+#: en/git-stash.txt:196
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:199
+#: en/git-stash.txt:200
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -47239,31 +47513,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:203
+#: en/git-stash.txt:204
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:208
+#: en/git-stash.txt:209
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:214
+#: en/git-stash.txt:215
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:219
+#: en/git-stash.txt:220
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:227
+#: en/git-stash.txt:228
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -47275,13 +47549,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:235
+#: en/git-stash.txt:236
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:246
+#: en/git-stash.txt:247
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47296,13 +47570,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:249
+#: en/git-stash.txt:250
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:257
+#: en/git-stash.txt:258
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47314,19 +47588,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:259
+#: en/git-stash.txt:260
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:264
+#: en/git-stash.txt:265
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:275
+#: en/git-stash.txt:276
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47341,19 +47615,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:277
+#: en/git-stash.txt:278
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:283
+#: en/git-stash.txt:284
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:288
+#: en/git-stash.txt:289
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -47362,7 +47636,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:298
+#: en/git-stash.txt:299
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -47441,62 +47715,62 @@ msgid "In addition to the names of files that have been changed, also show the t
msgstr ""
#. type: Plain text
-#: en/git-status.txt:65
+#: en/git-status.txt:66
#, priority:280
msgid "The mode parameter is used to specify the handling of untracked files. It is optional: it defaults to 'all', and if specified, it must be stuck to the option (e.g. `-uno`, but not `-u no`)."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:69
+#: en/git-status.txt:70
#, no-wrap, priority:280
msgid "'no' - Show no untracked files.\n"
msgstr "'no' - zeige keine von git nicht verwalteten Dateien an.\n"
#. type: Plain text
-#: en/git-status.txt:70
+#: en/git-status.txt:71
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories.\n"
msgstr "'normal' - zeige unverwaltete Dateien und Verzeichnisse.\n"
#. type: Plain text
-#: en/git-status.txt:81
+#: en/git-status.txt:82
#, priority:280
msgid "When `-u` option is not used, untracked files and directories are shown (i.e. the same as specifying `normal`), to help you avoid forgetting to add newly created files. Because it takes extra work to find untracked files in the filesystem, this mode may take some time in a large working tree. Consider enabling untracked cache and split index if supported (see `git update-index --untracked-cache` and `git update-index --split-index`), Otherwise you can use `no` to have `git status` return more quickly without showing untracked files."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:99
+#: en/git-status.txt:101
#, priority:280
msgid "Ignore changes to submodules when looking for changes. <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 before 1.7.0). Using \"all\" hides all changes to submodules (and suppresses the output of submodule summaries when the config option `status.submoduleSummary` is set)."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:100
+#: en/git-status.txt:102
#, no-wrap, priority:280
msgid "--ignored[=<mode>]"
msgstr "--ignored[=<Modus>]"
#. type: Plain text
-#: en/git-status.txt:102
+#: en/git-status.txt:104
#, priority:280
msgid "Show ignored files as well."
msgstr "Zeige auch ignorierte Dateien an."
#. type: Plain text
-#: en/git-status.txt:105
+#: en/git-status.txt:108
#, fuzzy, priority:280
#| msgid "The mode parameter is optional, and is used to specify the handling of untracked files. The possible options are:"
msgid "The mode parameter is used to specify the handling of ignored files. It is optional: it defaults to 'traditional'."
msgstr "Der <mode> Parameter ist optional, und steuert die Behandlung der Dateien. Die m철glichen Optionen sind:"
#. type: Plain text
-#: en/git-status.txt:109
+#: en/git-status.txt:112
#, priority:280
msgid "'traditional' - Shows ignored files and directories, unless"
msgstr "'traditional' - zeige ignorierte Dateien und Verzeichnisse an, au횩er wenn"
#. type: Plain text
-#: en/git-status.txt:112
+#: en/git-status.txt:115
#, no-wrap, priority:280
msgid ""
"--untracked-files=all is specified, in which case\n"
@@ -47505,109 +47779,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:113
+#: en/git-status.txt:116
#, no-wrap, priority:280
msgid "'no'\t - Show no ignored files.\n"
msgstr "'no'\t - zeige keine ignorierten Dateien an\n"
#. type: Plain text
-#: en/git-status.txt:114
+#: en/git-status.txt:117
#, no-wrap, priority:280
msgid "'matching' - Shows ignored files and directories matching an\n"
msgstr "'matching' - zeige ignorierte Dateien und Verzeichnisse an, die einem\n"
#. type: Plain text
-#: en/git-status.txt:115
+#: en/git-status.txt:118
#, no-wrap, priority:280
msgid "ignore pattern.\n"
msgstr "Ignore-Muster entsprechen.\n"
#. type: Plain text
-#: en/git-status.txt:121
+#: en/git-status.txt:124
#, priority:280
msgid "When 'matching' mode is specified, paths that explicitly match an ignored pattern are shown. If a directory matches an ignore pattern, then it is shown, but not paths contained in the ignored directory. If a directory does not match an ignore pattern, but all contents are ignored, then the directory is not shown, but all contents are shown."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:125
+#: en/git-status.txt:129
#, priority:280
msgid "Terminate entries with NUL, instead of LF. This implies the `--porcelain=v1` output format if no other format is given."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:132
+#: en/git-status.txt:136
#, priority:280
msgid "Display untracked files in columns. See configuration variable column.status for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:133
+#: en/git-status.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--ahead-behind"
msgstr "--ahead-behind"
#. type: Labeled list
-#: en/git-status.txt:134
+#: en/git-status.txt:138
#, ignore-same, no-wrap, priority:280
msgid "--no-ahead-behind"
msgstr "--no-ahead-behind"
#. type: Plain text
-#: en/git-status.txt:137
+#: en/git-status.txt:141
#, priority:280
msgid "Display or do not display detailed ahead/behind counts for the branch relative to its upstream branch. Defaults to true."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:138
+#: en/git-status.txt:142
#, ignore-same, no-wrap, priority:280
msgid "--renames"
msgstr "--renames"
#. type: Plain text
-#: en/git-status.txt:142
+#: en/git-status.txt:146
#, priority:280
msgid "Turn on/off rename detection regardless of user configuration. See also linkgit:git-diff[1] `--no-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:147
+#: en/git-status.txt:151
#, priority:280
msgid "Turn on rename detection, optionally setting the similarity threshold. See also linkgit:git-diff[1] `--find-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:150
+#: en/git-status.txt:154
#, priority:280
msgid "See the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:158
+#: en/git-status.txt:162
#, priority:280
msgid "The output from this command is designed to be used as a commit template comment. The default, long format, is designed to be human readable, verbose and descriptive. Its contents and format are subject to change at any time."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:163
+#: en/git-status.txt:167
#, priority:280
msgid "The paths mentioned in the output, unlike many other Git commands, are made relative to the current directory if you are working in a subdirectory (this is on purpose, to help cutting and pasting). See the status.relativePaths config option below."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:165
+#: en/git-status.txt:169
#, no-wrap, priority:280
msgid "Short Format"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:169
+#: en/git-status.txt:173
#, priority:280
msgid "In the short-format, the status of each path is shown as one of these forms"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:172
+#: en/git-status.txt:176
#, no-wrap, priority:280
msgid ""
"\tXY PATH\n"
@@ -47615,73 +47889,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:176
+#: en/git-status.txt:180
#, priority:280
msgid "where `ORIG_PATH` is where the renamed/copied contents came from. `ORIG_PATH` is only shown when the entry is renamed or copied. The `XY` is a two-letter status code."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:182
+#: en/git-status.txt:186
#, priority:280
msgid "The fields (including the `->`) are separated from each other by a single space. If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash-escaped."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:188
+#: en/git-status.txt:192
#, priority:280
msgid "For paths with merge conflicts, `X` and `Y` show the modification states of each side of the merge. For paths that do not have merge conflicts, `X` shows the status of the index, and `Y` shows the status of the work tree. For untracked paths, `XY` are `??`. Other status codes can be interpreted as follows:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:190
+#: en/git-status.txt:194
#, priority:280
msgid "' ' = unmodified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:191
+#: en/git-status.txt:195
#, priority:280
msgid "'M' = modified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:192
+#: en/git-status.txt:196
#, priority:280
msgid "'A' = added"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:193
+#: en/git-status.txt:197
#, priority:280
msgid "'D' = deleted"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:194
+#: en/git-status.txt:198
#, priority:280
msgid "'R' = renamed"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:195
+#: en/git-status.txt:199
#, priority:280
msgid "'C' = copied"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:196
+#: en/git-status.txt:200
#, priority:280
msgid "'U' = updated but unmerged"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:199
+#: en/git-status.txt:203
#, priority:280
msgid "Ignored files are not listed, unless `--ignored` option is in effect, in which case `XY` are `!!`."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:226
+#: en/git-status.txt:230
#, no-wrap, priority:280
msgid ""
"X Y Meaning\n"
@@ -47712,7 +47986,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:235
+#: en/git-status.txt:239
#, no-wrap, priority:280
msgid ""
"Submodules have more state and instead report\n"
@@ -47725,92 +47999,92 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:238
+#: en/git-status.txt:242
#, priority:280
msgid "'m' and '?' are applied recursively. For example if a nested submodule in a submodule contains an untracked file, this is reported as '?' as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:240
+#: en/git-status.txt:244
#, priority:280
msgid "If -b is used the short-format status is preceded by a line"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:242
+#: en/git-status.txt:246
#, no-wrap, priority:280
msgid " ## branchname tracking info\n"
msgstr ""
#. type: Title ~
-#: en/git-status.txt:244
+#: en/git-status.txt:248
#, no-wrap, priority:280
msgid "Porcelain Format Version 1"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:251
+#: en/git-status.txt:255
#, priority:280
msgid "Version 1 porcelain format is similar to the short format, but is guaranteed not to change in a backwards-incompatible way between Git versions or based on user configuration. This makes it ideal for parsing by scripts. The description of the short format above also describes the porcelain format, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:254
+#: en/git-status.txt:258
#, priority:280
msgid "The user's color.status configuration is not respected; color will always be off."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:257
+#: en/git-status.txt:261
#, priority:280
msgid "The user's status.relativePaths configuration is not respected; paths shown will always be relative to the repository root."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:267
+#: en/git-status.txt:271
#, priority:280
msgid "There is also an alternate -z format recommended for machine parsing. In that format, the status field is the same, but some other things change. First, the '\\->' is omitted from rename entries and the field order is reversed (e.g 'from \\-> to' becomes 'to from'). Second, a NUL (ASCII 0) follows each filename, replacing space as a field separator and the terminating newline (but a space still separates the status field from the first filename). Third, filenames containing special characters are not specially formatted; no quoting or backslash-escaping is performed."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:269
+#: en/git-status.txt:273
#, priority:280
msgid "Any submodule changes are reported as modified `M` instead of `m` or single `?`."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:271
+#: en/git-status.txt:275
#, no-wrap, priority:280
msgid "Porcelain Format Version 2"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:276
+#: en/git-status.txt:280
#, priority:280
msgid "Version 2 format adds more detailed information about the state of the worktree and changed items. Version 2 also defines an extensible set of easy to parse optional headers."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:280
+#: en/git-status.txt:284
#, priority:280
msgid "Header lines start with \"#\" and are added in response to specific command line arguments. Parsers should ignore headers they don't recognize."
msgstr ""
#. type: Title ^
-#: en/git-status.txt:282
+#: en/git-status.txt:286
#, fuzzy, no-wrap, priority:280
#| msgid "format.headers"
msgid "Branch Headers"
msgstr "format.headers"
#. type: Plain text
-#: en/git-status.txt:286
+#: en/git-status.txt:290
#, priority:280
msgid "If `--branch` is given, a series of header lines are printed with information about the current branch."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:296
+#: en/git-status.txt:300
#, no-wrap, priority:280
msgid ""
"Line Notes\n"
@@ -47824,43 +48098,43 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:299
+#: en/git-status.txt:303
#, no-wrap, priority:280
msgid "Changed Tracked Entries"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:306
+#: en/git-status.txt:310
#, priority:280
msgid "Following the headers, a series of lines are printed for tracked entries. One of three different line formats may be used to describe an entry depending on the type of change. Tracked entries are printed in an undefined order; parsers should allow for a mixture of the 3 line types in any order."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:308
+#: en/git-status.txt:312
#, priority:280
msgid "Ordinary changed entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:310
+#: en/git-status.txt:314
#, no-wrap, priority:280
msgid " 1 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:312
+#: en/git-status.txt:316
#, priority:280
msgid "Renamed or copied entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:314
+#: en/git-status.txt:318
#, no-wrap, priority:280
msgid " 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:345
+#: en/git-status.txt:349
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47895,19 +48169,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:349
+#: en/git-status.txt:353
#, priority:280
msgid "Unmerged entries have the following format; the first character is a \"u\" to distinguish from ordinary changed entries."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:351
+#: en/git-status.txt:355
#, no-wrap, priority:280
msgid " u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:368
+#: en/git-status.txt:372
#, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47928,86 +48202,86 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:371
+#: en/git-status.txt:375
#, no-wrap, priority:280
msgid "Other Items"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:376
+#: en/git-status.txt:380
#, priority:280
msgid "Following the tracked entries (and if requested), a series of lines will be printed for untracked and then ignored items found in the worktree."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:378
+#: en/git-status.txt:382
#, priority:280
msgid "Untracked items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:380
+#: en/git-status.txt:384
#, no-wrap, priority:280
msgid " ? <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:382
+#: en/git-status.txt:386
#, priority:280
msgid "Ignored items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:384
+#: en/git-status.txt:388
#, no-wrap, priority:280
msgid " ! <path>\n"
msgstr ""
#. type: Title ^
-#: en/git-status.txt:386
+#: en/git-status.txt:390
#, no-wrap, priority:280
msgid "Pathname Format Notes and -z"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:391
+#: en/git-status.txt:395
#, priority:280
msgid "When the `-z` option is given, pathnames are printed as is and without any quoting and lines are terminated with a NUL (ASCII 0x00) byte."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:395
+#: en/git-status.txt:399
#, 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])."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:404
+#: en/git-status.txt:408
#, priority:280
msgid "The command honors `color.status` (or `status.color` -- they mean the same thing and the latter is kept for backward compatibility) and `color.status.<slot>` configuration variables to colorize its output."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:408
+#: en/git-status.txt:412
#, fuzzy, priority:280
#| msgid "Repository specific configuration file. (The filename is of course relative to the repository root, not the working directory.)"
msgid "If the config variable `status.relativePaths` is set to false, then all paths shown are relative to the repository root, not to the current directory."
msgstr "Die repositoryspezifische Konfigurationsdatei (Der Dateiname ist nat체rlich relativ zur Repositorywurzel, nicht dem Arbeitsverzeichnis)."
#. type: Plain text
-#: en/git-status.txt:419
+#: en/git-status.txt:423
#, priority:280
msgid "If `status.submoduleSummary` is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). Please note that the summary output from the status command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings."
msgstr ""
#. type: Title -
-#: en/git-status.txt:421
+#: en/git-status.txt:425
#, no-wrap, priority:280
msgid "BACKGROUND REFRESH"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:432
+#: en/git-status.txt:436
#, priority:280
msgid "By default, `git status` will automatically refresh the index, updating the cached stat information from the working tree and writing out the result. Writing out the updated index is an optimization that isn't strictly necessary (`status` computes the values for itself, but writing them out is just to save subsequent programs from repeating our computation). When `status` is run in the background, the lock held during the write may conflict with other simultaneous processes, causing them to fail. Scripts running `status` in the background should consider using `git --no-optional-locks status` (see linkgit:git[1] for details)."
msgstr ""
@@ -48462,281 +48736,287 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:176
#, no-wrap, priority:220
-msgid "set-branch ((-d|--default)|(-b|--branch <branch>)) [--] <path>"
+msgid "set-branch (-b|--branch) <branch> [--] <path>"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-submodule.txt:177
+#, no-wrap, priority:220
+msgid "set-branch (-d|--default) [--] <path>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:181
+#: en/git-submodule.txt:182
#, priority:220
msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:182
+#: en/git-submodule.txt:183
#, ignore-ellipsis, no-wrap, priority:220
msgid "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:191
+#: en/git-submodule.txt:192
#, priority:220
msgid "Show commit summary between the given commit (defaults to HEAD) and working tree/index. For a submodule in question, a series of commits in the submodule between the given super project commit and the index or working tree (switched by `--cached`) are shown. If the option `--files` is given, show the series of commits in the submodule between the index of the super project and the working tree of the submodule (this option doesn't allow to use the `--cached` option or to provide an explicit commit)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:194
+#: en/git-submodule.txt:195
#, priority:220
msgid "Using the `--submodule=log` option with linkgit:git-diff[1] will provide that information too."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:195
+#: en/git-submodule.txt:196
#, no-wrap, priority:220
msgid "foreach [--recursive] <command>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:216
+#: en/git-submodule.txt:217
#, priority:220
msgid "Evaluates an arbitrary shell command in each checked out submodule. The command has access to the variables $name, $sm_path, $displaypath, $sha1 and $toplevel: $name is the name of the relevant submodule section in `.gitmodules`, $sm_path is the path of the submodule as recorded in the immediate superproject, $displaypath contains the relative path from the current working directory to the submodules root directory, $sha1 is the commit as recorded in the immediate superproject, and $toplevel is the absolute path to the top-level of the immediate superproject. Note that to avoid conflicts with '$PATH' on Windows, the '$path' variable is now a deprecated synonym of '$sm_path' variable. Any submodules defined in the superproject but not checked out are ignored by this command. Unless given `--quiet`, foreach prints the name of each submodule before evaluating the command. If `--recursive` is given, submodules are traversed recursively (i.e. the given shell command is evaluated in nested submodules as well). A non-zero return from the command in any submodule causes the processing to terminate. This can be overridden by adding '|| :' to the end of the command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:219
+#: en/git-submodule.txt:220
#, priority:220
msgid "As an example, the command below will show the path and currently checked out commit for each submodule:"
msgstr ""
#. type: delimited block -
-#: en/git-submodule.txt:222
+#: en/git-submodule.txt:223
#, no-wrap, priority:220
msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:224
+#: en/git-submodule.txt:225
#, ignore-ellipsis, no-wrap, priority:220
msgid "sync [--recursive] [--] [<path>...]"
msgstr "sync [--recursive] [--] [<Pfad>...]"
#. type: Plain text
-#: en/git-submodule.txt:231
+#: en/git-submodule.txt:232
#, priority:220
msgid "Synchronizes submodules' remote URL configuration setting to the value specified in `.gitmodules`. It will only affect those submodules which already have a URL entry in .git/config (that is the case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:234
+#: en/git-submodule.txt:235
#, priority:220
msgid "`git submodule sync` synchronizes all submodules while `git submodule sync -- A` synchronizes submodule \"A\" only."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:237
+#: en/git-submodule.txt:238
#, priority:220
msgid "If `--recursive` is specified, this command will recurse into the registered submodules, and sync any nested submodules within."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:238
+#: en/git-submodule.txt:239
#, no-wrap, priority:220
msgid "absorbgitdirs"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:245
+#: en/git-submodule.txt:246
#, priority:220
msgid "If a git directory of a submodule is inside the submodule, move the git directory of the submodule into its superprojects `$GIT_DIR/modules` path and then connect the git directory and its working directory by setting the `core.worktree` and adding a .git file pointing to the git directory embedded in the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:249
+#: en/git-submodule.txt:250
#, priority:220
msgid "A repository that was cloned independently and later added as a submodule or old setups have the submodules git directory inside the submodule instead of embedded into the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:251
+#: en/git-submodule.txt:252
#, priority:220
msgid "This command is recursive by default."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:257
+#: en/git-submodule.txt:258
#, priority:220
msgid "Only print error messages."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:264
+#: en/git-submodule.txt:265
#, fuzzy, priority:220
msgid "This option is only valid for add and update commands. Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr "Der Fortschritt wird nur standardm채횩ig auf der Standardfehlerausgabe angezeigt, wenn dieser an ein Terminal angebunden ist. Dieses Flag erlaubt die Fortschrittsanzeige auch ohne Terminalanbindung. `--progress` kann nicht zusammen mit `--porcelain` oder `--incremental` verwendet werden."
#. type: Plain text
-#: en/git-submodule.txt:268
+#: en/git-submodule.txt:269
#, priority:220
msgid "This option is only valid for the deinit command. Unregister all submodules in the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:269
+#: en/git-submodule.txt:270
#, no-wrap, priority:220
msgid "-b <branch>"
msgstr "-b <Branch>"
#. type: Plain text
-#: en/git-submodule.txt:277
+#: en/git-submodule.txt:278
#, priority:220
msgid "Branch of repository to add as submodule. The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository. If the option is not specified, it defaults to 'master'."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:290
+#: en/git-submodule.txt:291
#, priority:220
msgid "This option is only valid for add, deinit and update commands. When running add, allow adding an otherwise ignored submodule path. When running deinit the submodule working trees will be removed even if they contain local changes. When running update (only effective with the checkout procedure), throw away local changes in submodules when switching to a different commit; and always run a checkout operation in the submodule, even if the commit listed in the index of the containing repository matches the commit checked out in the submodule."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:295
+#: en/git-submodule.txt:296
#, priority:220
msgid "This option is only valid for status and summary commands. These commands typically use the commit found in the submodule HEAD, but with this option, the commit stored in the index is used instead."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:296
+#: en/git-submodule.txt:297
#, ignore-same, no-wrap, priority:220
msgid "--files"
msgstr "--files"
#. type: Plain text
-#: en/git-submodule.txt:300
+#: en/git-submodule.txt:301
#, priority:220
msgid "This option is only valid for the summary command. This command compares the commit in the index with that in the submodule HEAD when this option is used."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:302
+#: en/git-submodule.txt:303
#, ignore-same, no-wrap, priority:220
msgid "--summary-limit"
msgstr "--summary-limit"
#. type: Plain text
-#: en/git-submodule.txt:308
+#: en/git-submodule.txt:309
#, priority:220
msgid "This option is only valid for the summary command. Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:309
+#: en/git-submodule.txt:310
#, ignore-same, no-wrap, priority:220
msgid "--remote"
msgstr "--remote"
#. type: Plain text
-#: en/git-submodule.txt:318
+#: en/git-submodule.txt:319
#, priority:220
msgid "This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:324
+#: en/git-submodule.txt:325
#, priority:220
msgid "This works for any of the supported update procedures (`--checkout`, `--rebase`, etc.). The only change is the source of the target SHA-1. For example, `submodule update --remote --merge` will merge upstream submodule changes into the submodules, while `submodule update --merge` will merge superproject gitlink changes into the submodules."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:329
+#: en/git-submodule.txt:330
#, priority:220
msgid "In order to ensure a current tracking branch state, `update --remote` fetches the submodule's remote repository before calculating the SHA-1. If you don't want to fetch, you should use `submodule update --remote --no-fetch`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:339
+#: en/git-submodule.txt:340
#, priority:220
msgid "Use this option to integrate changes from the upstream subproject with your submodule's current HEAD. Alternatively, you can run `git pull` from the submodule, which is equivalent except for the remote branch name: `update --remote` uses the default upstream repository and `submodule.<name>.branch`, while `git pull` uses the submodule's `branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want to distribute the default upstream branch with the superproject and `branch.<name>.merge` if you want a more native feel while working in the submodule itself."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:341
+#: en/git-submodule.txt:342
#, ignore-same, no-wrap, priority:220
msgid "--no-fetch"
msgstr "--no-fetch"
#. type: Plain text
-#: en/git-submodule.txt:344
+#: en/git-submodule.txt:345
#, priority:220
msgid "This option is only valid for the update command. Don't fetch new objects from the remote site."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:345
+#: en/git-submodule.txt:346
#, ignore-same, no-wrap, priority:220
msgid "--checkout"
msgstr "--checkout"
#. type: Plain text
-#: en/git-submodule.txt:353
+#: en/git-submodule.txt:354
#, priority:220
msgid "This option is only valid for the update command. Checkout the commit recorded in the superproject on a detached HEAD in the submodule. This is the default behavior, the main use of this option is to override `submodule.$name.update` when set to a value other than `checkout`. If the key `submodule.$name.update` is either not explicitly set or set to `checkout`, this option is implicit."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:363
+#: en/git-submodule.txt:364
#, priority:220
msgid "This option is only valid for the update command. Merge the commit recorded in the superproject into the current branch of the submodule. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve the resulting conflicts within the submodule with the usual conflict resolution tools. If the key `submodule.$name.update` is set to `merge`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:364
+#: en/git-submodule.txt:365
#, ignore-same, no-wrap, priority:220
msgid "--rebase"
msgstr "--rebase"
#. type: Plain text
-#: en/git-submodule.txt:372
+#: en/git-submodule.txt:373
#, priority:220
msgid "This option is only valid for the update command. Rebase the current branch onto the commit recorded in the superproject. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve these failures with linkgit:git-rebase[1]. If the key `submodule.$name.update` is set to `rebase`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:373
+#: en/git-submodule.txt:374
#, ignore-same, no-wrap, priority:220
msgid "--init"
msgstr "--init"
#. type: Plain text
-#: en/git-submodule.txt:377
+#: en/git-submodule.txt:378
#, priority:220
msgid "This option is only valid for the update command. Initialize all submodules for which \"git submodule init\" has not been called so far before updating."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:378
+#: en/git-submodule.txt:379
#, ignore-same, no-wrap, priority:220
msgid "--name"
msgstr "--name"
#. type: Plain text
-#: en/git-submodule.txt:382
+#: en/git-submodule.txt:383
#, priority:220
msgid "This option is only valid for the add command. It sets the submodule's name to the given string instead of defaulting to its path. The name must be valid as a directory name and may not end with a '/'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:383
+#: en/git-submodule.txt:384
#, no-wrap, priority:220
msgid "--reference <repository>"
msgstr "--reference <Repository>"
#. type: Plain text
-#: en/git-submodule.txt:387 en/git-submodule.txt:396
+#: en/git-submodule.txt:388 en/git-submodule.txt:397
#, priority:220
msgid "This option is only valid for add and update commands. These commands sometimes need to clone a remote repository. In this case, this option will be passed to the linkgit:git-clone[1] command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:391
+#: en/git-submodule.txt:392
#, no-wrap, priority:220
msgid ""
"*NOTE*: Do *not* use this option unless you have read the note\n"
@@ -48745,61 +49025,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:398
+#: en/git-submodule.txt:399
#, no-wrap, priority:220
msgid "*NOTE*: see the NOTE for the `--reference` option.\n"
msgstr "*HINWEIS*: siehe HINWEIS zur `--reference` Option.\n"
#. type: Plain text
-#: en/git-submodule.txt:404
+#: en/git-submodule.txt:405
#, priority:220
msgid "This option is only valid for foreach, update, status and sync commands. Traverse submodules recursively. The operation is performed not only in the submodules of the current repo, but also in any nested submodules inside those submodules (and so on)."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:405
+#: en/git-submodule.txt:406
#, ignore-same, no-wrap, priority:220
msgid "--depth"
msgstr "--depth"
#. type: Plain text
-#: en/git-submodule.txt:409
+#: en/git-submodule.txt:410
#, priority:220
msgid "This option is valid for add and update commands. Create a 'shallow' clone with a history truncated to the specified number of revisions. See linkgit:git-clone[1]"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:410
+#: en/git-submodule.txt:411
#, ignore-same, no-wrap, priority:220
msgid "--[no-]recommend-shallow"
msgstr "--[no-]recommend-shallow"
#. type: Plain text
-#: en/git-submodule.txt:415
+#: en/git-submodule.txt:416
#, priority:220
msgid "This option is only valid for the update command. The initial clone of a submodule will use the recommended `submodule.<name>.shallow` as provided by the `.gitmodules` file by default. To ignore the suggestions use `--no-recommend-shallow`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:421
+#: en/git-submodule.txt:422
#, priority:220
msgid "This option is only valid for the update command. Clone new submodules in parallel with as many jobs. Defaults to the `submodule.fetchJobs` option."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:426
+#: en/git-submodule.txt:427
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:434
+#: en/git-submodule.txt:435
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:438
+#: en/git-submodule.txt:439
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -49125,7 +49405,7 @@ msgstr ""
#. type: delimited block -
#: en/git-svn.txt:177
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "--ignore-paths=\"^doc\"\n"
msgstr "--ignore-paths=\"^doc\"\n"
@@ -49434,7 +49714,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr "git config --get-all svn-remote.<Name>.commiturl"
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:889
+#: en/git-svn.txt:346 en/rev-list-options.txt:905
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -49778,7 +50058,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:507
-#, no-wrap, ignore-same, priority:100
+#, no-wrap, priority:100
msgid "'show-externals'"
msgstr "'show-externals'"
@@ -49796,7 +50076,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:515
-#, no-wrap, ignore-same, priority:100
+#, no-wrap, priority:100
msgid "'reset'"
msgstr "'reset'"
@@ -49939,7 +50219,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:594
-#, no-wrap, ignore-same, priority:100
+#, no-wrap, priority:100
msgid "-"
msgstr "-"
@@ -50250,7 +50530,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:777
#, priority:100
-msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider linkgit:git-filter-branch[1] instead. filter-branch also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
+msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports, and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider https://github.com/newren/git-filter-repo[git-filter-repo] instead. filter-repo also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
msgstr ""
#. type: Labeled list
@@ -50962,13 +51242,13 @@ msgstr ""
#. type: delimited block -
#: en/git-switch.txt:197
-#, no-wrap, ignore-same, priority:100
+#, no-wrap, priority:100
msgid "$ git switch master\n"
msgstr "$ git switch master\n"
#. type: delimited block -
#: en/git-switch.txt:204
-#, no-wrap, ignore-same, priority:100
+#, no-wrap, priority:100
msgid "$ git switch mytopic\n"
msgstr "$ git switch mytopic\n"
@@ -51013,7 +51293,7 @@ msgstr "Um zur체ck auf den vorherigen Branch bevor wir auf mytopic gewechselt si
#. type: delimited block -
#: en/git-switch.txt:232
-#, no-wrap, ignore-same, priority:100
+#, no-wrap, priority:100
msgid "$ git switch -\n"
msgstr "$ git switch -\n"
@@ -51684,7 +51964,7 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:384
-#, ignore-same, priority:240
+#, priority:240
msgid "linkgit:git-check-ref-format[1]. linkgit:git-config[1]."
msgstr "linkgit:git-check-ref-format[1]. linkgit:git-config[1]."
@@ -51780,7 +52060,7 @@ msgstr "Diese Option beeinflusst andere Optionen, die Pfade erwarten, wie `--git
#. type: Plain text
#: en/git.txt:70
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid ""
" git --git-dir=a.git --work-tree=b -C c status\n"
" git --git-dir=c/a.git --work-tree=c/b status\n"
@@ -52202,20 +52482,6 @@ msgstr ""
"# Eine Raute '#' oder ein Semikolon ';' markiert # einen Kommentar.\n"
"#\n"
-#. type: delimited block -
-#: en/git.txt:310
-#, no-wrap, priority:100
-msgid ""
-"; core variables\n"
-"[core]\n"
-"\t; Don't trust file modes\n"
-"\tfilemode = false\n"
-msgstr ""
-"; Kernvariablen\n"
-"[core]\n"
-"\t; Vertraue den Dateimodi nicht\n"
-"\tfilemode = false\n"
-
#. type: delimited block -
#: en/git.txt:315
#, no-wrap, priority:100
@@ -52519,9 +52785,9 @@ msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
#. type: Plain text
+# noqa
#: en/git.txt:481
#, ignore-ellipsis, priority:100
-#noqa
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr "Wenn diese Variable einen Pfad enth채lt, werden nicht-Arbeitsverzeichnis-Dateien, die sich normalerweise in $GIT_DIR befinden stattdessen aus diesem Verzeichnis geladen. Arbeitsverzeichnis-spezifische Dateien wie HEAD oder index werden aus $GIT_DIR geladen. Siehe linkgit:gitrepository-layout[5] und linkgit:git-worktree[1] f체r Details. Andere Pfadvariablen wie GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY, etc. haben Vorrang gegen체ber dieser Variable."
@@ -54237,7 +54503,7 @@ msgstr ""
#. type: delimited block -
#: en/git-update-index.txt:473
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "$ git -c core.untrackedCache=false status\n"
msgstr "$ git -c core.untrackedCache=false status\n"
@@ -54597,7 +54863,7 @@ msgstr ""
#. type: Plain text
#: en/git-update-server-info.txt:13
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "'git update-server-info'\n"
msgstr "'git-update-server-info'\n"
@@ -55075,7 +55341,7 @@ msgstr "SHA-1 eines Git-Markierungsobjektes."
#. type: Title =
#: en/git-web--browse.txt:2
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "git-web{litdd}browse(1)"
msgstr "git-web{litdd}browse(1)"
@@ -55343,7 +55609,7 @@ msgstr ""
#. type: delimited block -
#: en/git-web--browse.txt:117
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "$ git config --global web.browser firefox\n"
msgstr "$ git config --global web.browser firefox\n"
@@ -55386,7 +55652,7 @@ msgstr ""
#. type: Labeled list
#: en/git-whatchanged.txt:30
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "`git whatchanged -p v2.6.12.. include/scsi drivers/scsi`"
msgstr "`git whatchanged -p v2.6.12.. include/scsi drivers/scsi`"
@@ -55398,7 +55664,7 @@ msgstr "Zeigt alle Commits seit der Version 'v2.6.12', die Dateien in den Verzei
#. type: Labeled list
#: en/git-whatchanged.txt:35
-#, ignore-same, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "`git whatchanged --since=\"2 weeks ago\" -- gitk`"
msgstr "git whatchanged --since=\"2 weeks ago\" -- gitk`"
@@ -55750,7 +56016,7 @@ msgstr ""
#. type: delimited block -
#: en/git-worktree.txt:248
-#, ignore-same, no-wrap, priority:240
+#, no-wrap, priority:240
msgid "$ git config extensions.worktreeConfig true\n"
msgstr "$ git config extensions.worktreeConfig true\n"
@@ -56009,7 +56275,7 @@ msgstr ""
#. type: delimited block -
#: en/i18n.txt:46
-#, ignore-same, no-wrap, priority:280
+#, no-wrap, priority:280
msgid ""
"[i18n]\n"
"\tcommitEncoding = ISO-8859-1\n"
@@ -56031,7 +56297,7 @@ msgstr ""
#. type: delimited block -
#: en/i18n.txt:62
-#, ignore-same, no-wrap, priority:280
+#, no-wrap, priority:280
msgid ""
"[i18n]\n"
"\tlogOutputEncoding = ISO-8859-1\n"
@@ -56279,170 +56545,183 @@ msgstr ""
msgid "This option determines how the merge message will be cleaned up before commiting. See linkgit:git-commit[1] for more details. In addition, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on to the commit machinery in the case of a merge conflict."
msgstr ""
+#. type: Labeled list
+#: en/merge-options.txt:44
+#, ignore-same, no-wrap, priority:240
+msgid "--ff-only"
+msgstr "--ff-only"
+
#. type: Plain text
-#: en/merge-options.txt:46
+#: en/merge-options.txt:50
#, priority:240
-msgid "When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. This is the default behavior."
+msgid "Specifies how a merge is handled when the merged-in history is already a descendant of the current history. `--ff` is the default unless merging an annotated (and possibly signed) tag that is not stored in its natural place in the `refs/tags/` hierarchy, in which case `--no-ff` is assumed."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:52
+#: en/merge-options.txt:55
#, priority:240
-msgid "Create a merge commit even when the merge resolves as a fast-forward. This is the default behaviour when merging an annotated (and possibly signed) tag that is not stored in its natural place in 'refs/tags/' hierarchy."
+msgid "With `--ff`, when possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit."
msgstr ""
-#. type: Labeled list
-#: en/merge-options.txt:53
-#, ignore-same, no-wrap, priority:240
-msgid "--ff-only"
-msgstr "--ff-only"
+#. type: Plain text
+#: en/merge-options.txt:58
+#, priority:240
+msgid "With `--no-ff`, create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward."
+msgstr ""
#. type: Plain text
-#: en/merge-options.txt:57
+#: en/merge-options.txt:61
#, priority:240
-msgid "Refuse to merge and exit with a non-zero status unless the current `HEAD` is already up to date or the merge can be resolved as a fast-forward."
+msgid "With `--ff-only`, resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:63
+#: en/merge-options.txt:67
#, priority:240
msgid "GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:69
+#: en/merge-options.txt:73
#, priority:240
msgid "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also linkgit:git-fmt-merge-msg[1]."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:72
+#: en/merge-options.txt:76
#, priority:240
msgid "With --no-log do not list one-line descriptions from the actual commits being merged."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:74
+#: en/merge-options.txt:78
#, ignore-same, no-wrap, priority:240
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
-#: en/merge-options.txt:83
+#: en/merge-options.txt:87
#, priority:240
msgid "With --no-signoff do not add a Signed-off-by line."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:89
+#: en/merge-options.txt:93
#, priority:240
msgid "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:92
+#: en/merge-options.txt:96
#, priority:240
msgid "With -n or --no-stat do not show a diffstat at the end of the merge."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:93
+#: en/merge-options.txt:97
#, ignore-same, no-wrap, priority:240
msgid "--squash"
msgstr "--squash"
#. type: Labeled list
-#: en/merge-options.txt:94
+#: en/merge-options.txt:98
#, ignore-same, no-wrap, priority:240
msgid "--no-squash"
msgstr "--no-squash"
#. type: Plain text
-#: en/merge-options.txt:102
+#: en/merge-options.txt:106
#, priority:240
msgid "Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:105
+#: en/merge-options.txt:109
#, priority:240
msgid "With --no-squash perform the merge and commit the result. This option can be used to override --squash."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:107
+#: en/merge-options.txt:111
#, priority:240
msgid "With --squash, --commit is not allowed, and will fail."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:115
+#, fuzzy, priority:240
+#| msgid "This option bypasses the pre-commit and commit-msg hooks. See also linkgit:githooks[5]."
+msgid "This option bypasses the pre-merge and commit-msg hooks. See also linkgit:githooks[5]."
+msgstr "Diese Option schaltet die pre-commit und commit-msg Einsprungspunkte (hooks) aus. Siehe auch linkgit:githooks[5]."
+
+#. type: Plain text
+#: en/merge-options.txt:123
#, priority:240
msgid "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise)."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:116
+#: en/merge-options.txt:124
#, no-wrap, priority:240
msgid "-X <option>"
msgstr "-X <Option>"
#. type: Plain text
-#: en/merge-options.txt:120
+#: en/merge-options.txt:128
#, priority:240
msgid "Pass merge strategy specific option through to the merge strategy."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:121
+#: en/merge-options.txt:129
#, ignore-same, no-wrap, priority:240
msgid "--verify-signatures"
msgstr "--verify-signatures"
#. type: Labeled list
-#: en/merge-options.txt:122
+#: en/merge-options.txt:130
#, ignore-same, no-wrap, priority:240
msgid "--no-verify-signatures"
msgstr "--no-verify-signatures"
#. type: Plain text
-#: en/merge-options.txt:128
+#: en/merge-options.txt:136
#, priority:240
msgid "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:130
+#: en/merge-options.txt:138
#, ignore-same, no-wrap, priority:240
msgid "--no-summary"
msgstr "--no-summary"
#. type: Plain text
-#: en/merge-options.txt:133
+#: en/merge-options.txt:141
#, priority:240
msgid "Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:138
+#: en/merge-options.txt:146
#, priority:240
msgid "Operate quietly. Implies --no-progress."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:149
+#: en/merge-options.txt:157
#, priority:240
msgid "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:152
+#: en/merge-options.txt:160
#, ignore-same, no-wrap, priority:240
msgid "--allow-unrelated-histories"
msgstr "--allow-unrelated-histories"
#. type: Plain text
-#: en/merge-options.txt:158
+#: en/merge-options.txt:166
#, priority:240
msgid "By default, `git merge` command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added."
msgstr ""
@@ -57782,7 +58061,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:215
#, priority:260
-msgid "minutes ago`}; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -60165,263 +60444,281 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:762
#, priority:260
+msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:771
+#, ignore-ellipsis, priority:260
+msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:775
+#, priority:260
+msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:778
+#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:779
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:766
+#: en/rev-list-options.txt:782
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:773
+#: en/rev-list-options.txt:789
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:781
+#: en/rev-list-options.txt:797
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:800
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:791
+#: en/rev-list-options.txt:807
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:793
+#: en/rev-list-options.txt:809
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:801
+#: en/rev-list-options.txt:817
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:802
+#: en/rev-list-options.txt:818
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:804
+#: en/rev-list-options.txt:820
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:822
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:812
+#: en/rev-list-options.txt:828
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:832
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:818
+#: en/rev-list-options.txt:834
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:819
+#: en/rev-list-options.txt:835
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr "--date=<Format>"
#. type: Plain text
-#: en/rev-list-options.txt:826
+#: en/rev-list-options.txt:842
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:847
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:833
+#: en/rev-list-options.txt:849
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:852
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:838
+#: en/rev-list-options.txt:854
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:839
+#: en/rev-list-options.txt:855
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:840
+#: en/rev-list-options.txt:856
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:859
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:846
+#: en/rev-list-options.txt:862
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:864
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:873
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:864
+#: en/rev-list-options.txt:880
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:868
+#: en/rev-list-options.txt:884
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:875
+#: en/rev-list-options.txt:891
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:894
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:880
+#: en/rev-list-options.txt:896
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:882
+#: en/rev-list-options.txt:898
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:884
+#: en/rev-list-options.txt:900
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:887
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:892
+#: en/rev-list-options.txt:908
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:909
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:896
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:898
+#: en/rev-list-options.txt:914
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:902
+#: en/rev-list-options.txt:918
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:907
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:925
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:932
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -60432,19 +60729,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:919
+#: en/rev-list-options.txt:935
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:922
+#: en/rev-list-options.txt:938
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:929
+#: en/rev-list-options.txt:945
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -60456,85 +60753,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:931
+#: en/rev-list-options.txt:947
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:937
+#: en/rev-list-options.txt:953
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:939
+#: en/rev-list-options.txt:955
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:942
+#: en/rev-list-options.txt:958
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:943
+#: en/rev-list-options.txt:959
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:949
+#: en/rev-list-options.txt:965
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:959
+#: en/rev-list-options.txt:975
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:963
+#: en/rev-list-options.txt:979
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:984
#, priority:260
msgid "Listed below are options that control the formatting of diff output. Some of them are specific to linkgit:git-rev-list[1], however other diff options may be given. See linkgit:git-diff-files[1] for more options."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:991
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:981
+#: en/rev-list-options.txt:997
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:1012
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1015
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1018
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
@@ -60941,6 +61238,17 @@ msgstr ""
msgid "a URL like \"git://example.org/path/to/repo.git\" will be rewritten to \"ssh://example.org/path/to/repo.git\" for pushes, but pulls will still use the original URL."
msgstr ""
+#~ msgid ""
+#~ "\t; core variables\n"
+#~ "\t[core]\n"
+#~ "\t\t; Don't trust file modes\n"
+#~ "\t\tfilemode = false\n"
+#~ msgstr ""
+#~ "\t; Kernvariablen\n"
+#~ "\t[core]\n"
+#~ "\t\t; Vertraue den Dateimodi nicht\n"
+#~ "\t\tfilemode = false\n"
+
#, fuzzy
#~ msgid "The optional configuration variable `core.excludesFile` indicates a path to a file containing patterns of file names to exclude from git-add, similar to $GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to those in info/exclude. See linkgit:gitignore[5]."
#~ msgstr "Mit der optionalen Konfigurationsvariable 'core.excludesfile' kann eine Datei angegeben werden, welche Dateisuchkriterien (z.B. '*.log') f체r von git-add zu ignorierende Dateien enth채lt. Dieser Mechanismus ist 채hnlich zu $GIT_DIR/info/exclude. Dateisuchkriterien im excludesfile werden zus채tzlich zu jenen in info/exclude angewandt. Siehe auch linkgit:gitrepository-layout[5]."
diff --git a/po/documentation.es_MX.po b/po/documentation.es_MX.po
index fa531c7e5e031fb5bcdfdf1efd26ab9483a6ea06..435809dba07ae2a453bb88ed8a268b31a623dcdb 100644
--- a/po/documentation.es_MX.po
+++ b/po/documentation.es_MX.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Git Documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2019-08-26 23:13+0200\n"
+"POT-Creation-Date: 2019-12-08 16:35+0100\n"
"PO-Revision-Date: 2019-10-05 21:56+0000\n"
"Last-Translator: Far찼ndula <farandula@versoblanco.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:319 en/git-fsck.txt:38 en/git-rebase.txt:471
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:321 en/git-fsck.txt:38 en/git-rebase.txt:493
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -89,7 +89,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1000
+#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1016
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -125,7 +125,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:433 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -469,7 +469,7 @@ msgid "Get and set repository or global options."
msgstr "Configurar repositorio u opciones globales"
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1505
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1528
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-export[1]"
msgstr "linkgit:git-fast-export[1]"
@@ -481,7 +481,7 @@ msgid "Git data exporter."
msgstr "Exportador de data Git"
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:243
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-import[1]"
msgstr "linkgit:git-fast-import[1]"
@@ -2262,95 +2262,95 @@ msgstr ""
msgid "Example"
msgstr ""
-#. type: Plain text
-#: en/config.txt:185
+#. type: delimited block -
+#: en/config.txt:186
#, no-wrap, priority:100
msgid ""
-"\t# Core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"# Core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:190
+#. type: delimited block -
+#: en/config.txt:191
#, no-wrap, priority:100
msgid ""
-"\t# Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"# Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:194
+#. type: delimited block -
+#: en/config.txt:195
#, no-wrap, priority:100
msgid ""
-"\t[branch \"devel\"]\n"
-"\t\tremote = origin\n"
-"\t\tmerge = refs/heads/devel\n"
+"[branch \"devel\"]\n"
+"\tremote = origin\n"
+"\tmerge = refs/heads/devel\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:199
+#. type: delimited block -
+#: en/config.txt:200
#, no-wrap, priority:100
msgid ""
-"\t# Proxy settings\n"
-"\t[core]\n"
-"\t\tgitProxy=\"ssh\" for \"kernel.org\"\n"
-"\t\tgitProxy=default-proxy ; for the rest\n"
+"# Proxy settings\n"
+"[core]\n"
+"\tgitProxy=\"ssh\" for \"kernel.org\"\n"
+"\tgitProxy=default-proxy ; for the rest\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:204
+#. type: delimited block -
+#: en/config.txt:205
#, no-wrap, priority:100
msgid ""
-"\t[include]\n"
-"\t\tpath = /path/to/foo.inc ; include by absolute path\n"
-"\t\tpath = foo.inc ; find \"foo.inc\" relative to the current file\n"
-"\t\tpath = ~/foo.inc ; find \"foo.inc\" in your `$HOME` directory\n"
+"[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: Plain text
-#: en/config.txt:208
+#. type: delimited block -
+#: en/config.txt:209
#, no-wrap, priority:100
msgid ""
-"\t; include if $GIT_DIR is /path/to/foo/.git\n"
-"\t[includeIf \"gitdir:/path/to/foo/.git\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; 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: Plain text
-#: en/config.txt:212
+#. type: delimited block -
+#: en/config.txt:213
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside /path/to/group\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside /path/to/group\n"
+"[includeIf \"gitdir:/path/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:216
+#. type: delimited block -
+#: en/config.txt:217
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside $HOME/to/group\n"
-"\t[includeIf \"gitdir:~/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside $HOME/to/group\n"
+"[includeIf \"gitdir:~/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:222
+#. type: delimited block -
+#: en/config.txt:223
#, no-wrap, priority:100
msgid ""
-"\t; relative paths are always relative to the including\n"
-"\t; file (if the condition is true); their location is not\n"
-"\t; affected by the condition\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = foo.inc\n"
+"; 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:227
+#: en/config.txt:229
#, no-wrap, priority:100
msgid ""
"\t; include only if we are in a worktree where foo-branch is\n"
@@ -2360,43 +2360,43 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/config.txt:229
+#: en/config.txt:231
#, no-wrap, priority:100
msgid "Values"
msgstr ""
#. type: Plain text
-#: en/config.txt:234
+#: 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:235
+#: en/config.txt:237
#, no-wrap, priority:100
msgid "boolean"
msgstr ""
#. type: Plain text
-#: en/config.txt:240
+#: 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:241
+#: en/config.txt:243
#, no-wrap, priority:100
msgid "true"
msgstr ""
#. type: Plain text
-#: en/config.txt:242
+#: en/config.txt:244
#, priority:100
msgid "Boolean true literals are `yes`, `on`, `true`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:244
+#: en/config.txt:246
#, no-wrap, priority:100
msgid ""
"and `1`. Also, a variable defined without `= <value>`\n"
@@ -2404,109 +2404,109 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/config.txt:245
+#: en/config.txt:247
#, no-wrap, priority:100
msgid "false"
msgstr ""
#. type: Plain text
-#: en/config.txt:246
+#: en/config.txt:248
#, priority:100
msgid "Boolean false literals are `no`, `off`, `false`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:247
+#: en/config.txt:249
#, no-wrap, priority:100
msgid "`0` and the empty string.\n"
msgstr ""
#. type: Plain text
-#: en/config.txt:251
+#: 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:252
+#: en/config.txt:254
#, no-wrap, priority:100
msgid "integer"
msgstr ""
#. type: Plain text
-#: en/config.txt:256
+#: 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:257 en/diff-options.txt:356 en/git-for-each-ref.txt:177
+#: 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:261
+#: 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:265
+#: en/config.txt:267
#, 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."
msgstr ""
#. type: Plain text
-#: en/config.txt:270
+#: en/config.txt:272
#, 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:277
+#: en/config.txt:279
#, 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:280
+#: en/config.txt:282
#, 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:289
+#: en/config.txt:291
#, 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:290
+#: en/config.txt:292
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:296
+#: en/config.txt:298
#, 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:299 en/git-imap-send.txt:58
+#: en/config.txt:301 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:304
+#: en/config.txt:306
#, 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:309
+#: en/config.txt:311
#, 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 ""
@@ -3244,53 +3244,53 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
#, no-wrap, priority:260
-msgid "Generating patches with -p"
+msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:10
+#: en/diff-generate-patch.txt:14
#, priority:260
-msgid "When \"git-diff-index\", \"git-diff-tree\", or \"git-diff-files\" are run with a `-p` option, \"git diff\" without the `--raw` option, or \"git log\" with the \"-p\" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
+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:13
+#: 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:15
+#: 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:17
+#: 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:21
+#: 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:25
+#: 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:27
+#: 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:39
+#: en/diff-generate-patch.txt:43
#, no-wrap, priority:260
msgid ""
"old mode <mode>\n"
@@ -3307,43 +3307,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:42
+#: 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:44
+#: 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:51
+#: 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:55
+#: en/diff-generate-patch.txt:59
#, priority:260
-msgid "The index line includes the SHA-1 checksum 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."
+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:59
+#: 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:64
+#: 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:71
+#: en/diff-generate-patch.txt:75
#, no-wrap, priority:260
msgid ""
"diff --git a/a b/b\n"
@@ -3355,25 +3355,25 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/diff-generate-patch.txt:74
+#: en/diff-generate-patch.txt:78
#, no-wrap, priority:260
-msgid "combined diff format"
+msgid "Combined diff format"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:82
+#: 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:84
+#: en/diff-generate-patch.txt:88
#, priority:260
-msgid "A 'combined diff' format looks like this:"
+msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:93
+#: en/diff-generate-patch.txt:97
#, no-wrap, priority:260
msgid ""
"diff --combined describe.c\n"
@@ -3386,7 +3386,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:103
+#: en/diff-generate-patch.txt:107
#, no-wrap, priority:260
msgid ""
"- static void describe(char *arg)\n"
@@ -3401,7 +3401,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:113
+#: en/diff-generate-patch.txt:117
#, no-wrap, priority:260
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
@@ -3416,37 +3416,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:117
+#: en/diff-generate-patch.txt:121
#, priority:260
-msgid "It is preceded with a \"git diff\" header, that looks like this (when `-c` option is used):"
+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:119
+#: en/diff-generate-patch.txt:123
#, no-wrap, priority:260
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:121
+#: en/diff-generate-patch.txt:125
#, priority:260
-msgid "or like this (when `--cc` option is used):"
+msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:123
+#: en/diff-generate-patch.txt:127
#, no-wrap, priority:260
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:126
+#: 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:131
+#: en/diff-generate-patch.txt:135
#, no-wrap, priority:260
msgid ""
"index <hash>,<hash>..<hash>\n"
@@ -3456,91 +3456,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:137
+#: 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:139
+#: 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:141 en/diff-generate-patch.txt:152 en/diff-generate-patch.txt:153 en/diff-generate-patch.txt:154
+#: 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:142 en/diff-generate-patch.txt:155
+#: 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:146
+#: 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:150
+#: 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:159
+#: 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:165
+#: 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 for apply. The change is similar to the change in the extended 'index' header:"
+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:167
+#: 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:170
+#: 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:179
+#: 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:185
+#: 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:191
+#: 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:197
+#: 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:327 en/merge-options.txt:86
+#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3552,7 +3552,7 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:186 en/git-add.txt:111 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/diff-options.txt:23 en/fetch-options.txt:198 en/git-add.txt:111 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
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
@@ -3576,7 +3576,7 @@ msgid "\tThis is the default.\n"
msgstr ""
#. 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:117 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
+#: 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:118 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"
@@ -3995,7 +3995,7 @@ msgid "Synonym for --dirstat=files,param1,param2..."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:129
+#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--summary"
msgstr "--summary"
@@ -4019,7 +4019,7 @@ msgid "Synonym for `-p --stat`."
msgstr "sin처nimo para '-p --stat'"
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:122 en/git-update-index.txt:168
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:168
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4428,7 +4428,7 @@ msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:402 en/git-status.txt:139
+#: en/diff-options.txt:402 en/git-status.txt:143
#, ignore-same, no-wrap, priority:280
msgid "--no-renames"
msgstr "--no-renames"
@@ -4532,7 +4532,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:463
#, priority:280
-msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
+msgid "It affects the way a change that amounts to a total rewrite of a file does not appear as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
msgstr ""
#. type: Plain text
@@ -4548,7 +4548,7 @@ msgid "-M[<n>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:473 en/git-status.txt:143
+#: en/diff-options.txt:473 en/git-status.txt:147
#, no-wrap, priority:280
msgid "--find-renames[=<n>]"
msgstr ""
@@ -4971,7 +4971,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:203 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:52 en/git-clone.txt:120 en/git-commit.txt:314 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:301 en/git-gc.txt:68 en/git-grep.txt:296 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:315 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:255 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:136 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:215 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:316 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:302 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:256 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5025,7 +5025,7 @@ msgid "Allow (or disallow) external text conversion filters to be run when compa
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:85
+#: en/diff-options.txt:722 en/git-status.txt:87
#, no-wrap, priority:280
msgid "--ignore-submodules[=<when>]"
msgstr ""
@@ -5103,7 +5103,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:265 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:266 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5235,7 +5235,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:48 en/git-commit.txt:317 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:50 en/git-commit.txt:319 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5247,13 +5247,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:34 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:195 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:347 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:278 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:279 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:35 en/git-fast-import.txt:37 en/git-filter-branch.txt:196 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:279 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:280 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5285,7 +5285,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:112 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:113 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5363,7 +5363,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:47 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:97 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:326 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:301 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:85
+#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:98 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:302 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5429,187 +5429,211 @@ msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:167
+#: en/fetch-options.txt:164
+#, priority:220
+msgid "Number of parallel children to be used for all forms of fetching."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:169
+#, priority:220
+msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:172
#, priority:220
-msgid "Number of parallel children to be used for fetching submodules. Each will fetch from different submodules, such that fetching many submodules will be faster. By default submodules will be fetched one at a time."
+msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:168 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:173 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:171
+#: en/fetch-options.txt:176
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:172
+#: en/fetch-options.txt:177 en/git-branch.txt:225 en/git-push.txt:349
+#, ignore-same, no-wrap, priority:240
+msgid "--set-upstream"
+msgstr "--set-upstream"
+
+#. type: Plain text
+#: en/fetch-options.txt:183
+#, priority:220
+msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:184
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:188
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177
+#: en/fetch-options.txt:189
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:184
+#: en/fetch-options.txt:196
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:199
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:194
+#: en/fetch-options.txt:206
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:195 en/git-clone.txt:182
+#: en/fetch-options.txt:207 en/git-clone.txt:182
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:212
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:202 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:51 en/git-clone.txt:119 en/git-commit.txt:313 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:300 en/git-grep.txt:295 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:314 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:254 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:135
+#: en/fetch-options.txt:214 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:315 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:301 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:255 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:207
+#: en/fetch-options.txt:219
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:208 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:298 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:318 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:139
+#: en/fetch-options.txt:220 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:300 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:209 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:299 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:319 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:140
+#: en/fetch-options.txt:221 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:301 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:211 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:142
+#: en/fetch-options.txt:223 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:150
#, fuzzy, priority:300
msgid "Be verbose."
msgstr "ser verboso"
#. type: Labeled list
-#: en/fetch-options.txt:213 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:326 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:258 en/git-switch.txt:144 en/merge-options.txt:143
+#: en/fetch-options.txt:225 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:328 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:259 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:218 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:230 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:219 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:231 en/git-ls-remote.txt:73 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:220 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:232 en/git-clone.txt:135 en/git-ls-remote.txt:74
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-clone.txt:142
+#: en/fetch-options.txt:239 en/git-clone.txt:142
#, priority:300
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:240
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:233
+#: en/fetch-options.txt:245
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:234
+#: en/fetch-options.txt:246
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:240
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:241 en/git-push.txt:398
+#: en/fetch-options.txt:253 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:242 en/git-push.txt:399
+#: en/fetch-options.txt:254 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:244 en/git-push.txt:401
+#: en/fetch-options.txt:256 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:245 en/git-push.txt:402
+#: en/fetch-options.txt:257 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:246 en/git-push.txt:403
+#: en/fetch-options.txt:258 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:247 en/git-push.txt:405
+#: en/fetch-options.txt:259 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5653,7 +5677,7 @@ msgstr ""
"\t [--chmod=(+|-)x] [--] [<ruta>...]\n"
#. type: Title -
-#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:20 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:67 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
+#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr "DESCRIPCI횙N"
@@ -5695,13 +5719,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr "V챕ase linkgit:git-commit[1] para otras formas de a챰adir contenido a un commit."
#. type: Title -
-#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:83 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:85 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:115 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:253 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:86 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:254 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr "OPCIONES"
#. type: Labeled list
-#: en/git-add.txt:52 en/git-grep.txt:308 en/git-status.txt:148
+#: en/git-add.txt:52 en/git-grep.txt:325 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
@@ -5713,7 +5737,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr "Ruta de los archivos desde los que a챰adir el contenido. Pueden usarse comodines (p.e. '*.c') para incluir todos los archivos coincidentes con el patr처n. Tambi챕n puede indicarse el nombre del directorio padre (p.e. 'dir' para agregar 'dir/archivo1' y 'dir/archivo2') para actualizar el 챠ndice con el estado actual de todo el directorio (p.e. especificar 'dir' no s처lo grabar찼 la modificaci처n de 'dir/archivo1' y la creaci처n de 'dir/archivo2', sino tambi챕n el borrado de 'dir/archivo3'). N처tese que en versiones anteriores Git ignoraba los archivos eliminados; utilice la opci처n '--no-all' si desea a챰adir los archivos nuevos o modificados pero ignorar los eliminados."
#. type: Plain text
-#: en/git-add.txt:67 en/git-grep.txt:314
+#: en/git-add.txt:67 en/git-grep.txt:331
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr "V챕ase 'pathspec' en linkgit:gitglossary[7] para m찼s informaci처n sobre la sintaxis de <pathspec>."
@@ -5731,13 +5755,13 @@ msgid "Allow adding otherwise ignored files."
msgstr "Agregar archivos que normalmente ser챠an ignorados."
#. type: Labeled list
-#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:42 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:394 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:43 en/git-rebase.txt:395 en/git-rebase.txt:536 en/git-svn.txt:297
+#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5761,7 +5785,7 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:275 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
@@ -5851,7 +5875,7 @@ msgid "This option is primarily to help users who are used to older versions of
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:146 en/git-format-patch.txt:101 en/git-submodule.txt:340
+#: en/git-add.txt:146 en/git-format-patch.txt:102 en/git-submodule.txt:341
#, no-wrap, priority:300
msgid "-N"
msgstr ""
@@ -5941,7 +5965,7 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:343 en/git-grep.txt:304 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
+#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:345 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr ""
@@ -5953,7 +5977,7 @@ msgid "This option can be used to separate command-line options from the list of
msgstr ""
#. type: Title -
-#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:357 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:153 en/git-fetch.txt:242 en/git-filter-branch.txt:234 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:634 en/git-grep.txt:316 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:206 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:359 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:638 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr ""
@@ -5995,7 +6019,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:221 en/git-rebase.txt:591
+#: en/git-add.txt:221 en/git-rebase.txt:613
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr ""
@@ -6007,7 +6031,7 @@ msgid "When the command enters the interactive mode, it shows the output of the
msgstr ""
#. type: Plain text
-#: en/git-add.txt:230 en/git-clean.txt:83
+#: en/git-add.txt:230 en/git-clean.txt:85
#, priority:300
msgid "The command loop shows the list of subcommands available, and gives a prompt \"What now> \". In general, when the prompt ends with a single '>', you can pick only one of the choices given and type return, like this:"
msgstr ""
@@ -6307,7 +6331,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:135 en/git-commit-tree.txt:118 en/git-commit.txt:487 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:241 en/git-fast-import.txt:1503 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:679 en/git-gc.txt:154 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:112 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:247 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:519 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:292 en/git-status.txt:434 en/git-submodule.txt:436 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
+#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:489 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1526 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:683 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:437 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
@@ -6319,13 +6343,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:139 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:495 en/git-config.txt:492 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:245 en/git-fast-import.txt:1507 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:480 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:683 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:334 en/git-gui.txt:126 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:116 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:230 en/git-merge-file.txt:94 en/git-merge-index.txt:78 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1052 en/git-receive-pack.txt:251 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:123 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:523 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:300 en/git-status.txt:438 en/git-stripspace.txt:93 en/git-submodule.txt:440 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
+#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:497 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1530 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:693 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:687 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:441 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
#, no-wrap, priority:300
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:140 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:496 en/git-config.txt:493 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:246 en/git-fast-import.txt:1508 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:481 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:684 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:335 en/git-gui.txt:127 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:117 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:231 en/git-merge-file.txt:95 en/git-merge-index.txt:79 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1053 en/git-receive-pack.txt:252 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:124 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:524 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:301 en/git-status.txt:439 en/git-stripspace.txt:94 en/git-submodule.txt:441 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
+#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:498 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1531 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:694 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:688 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:442 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6375,7 +6399,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:118 en/git-rebase.txt:387 en/git-revert.txt:98 en/merge-options.txt:73
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:119 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6417,7 +6441,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:969
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:985
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6447,7 +6471,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:267 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:989
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1005
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6539,37 +6563,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:303 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:304 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:307 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:373 en/git-rebase.txt:524
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:374
+#: en/git-am.txt:109 en/git-rebase.txt:396
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:337
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6629,7 +6653,7 @@ msgid "Run interactively."
msgstr "ejecutar de manera interactiva"
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:380 en/git-rebase.txt:521
+#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6641,7 +6665,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:381 en/git-rebase.txt:522
+#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6653,7 +6677,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:256 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6665,31 +6689,31 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:333 en/git-rebase.txt:308 en/git-revert.txt:91 en/merge-options.txt:58
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:335 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:334 en/git-rebase.txt:309 en/git-revert.txt:92 en/merge-options.txt:59
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:336 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:338 en/git-rebase.txt:313 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:340 en/git-rebase.txt:331 en/git-revert.txt:96
#, priority:280
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:228 en/sequencer.txt:1
+#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:246 en/sequencer.txt:1
#, ignore-same, no-wrap, priority:240
msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:406 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:997
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1013
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6719,7 +6743,7 @@ msgid "When a patch failure occurs, <msg> will be printed to the screen before e
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:231 en/sequencer.txt:15
+#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:249 en/sequencer.txt:15
#, ignore-same, no-wrap, priority:240
msgid "--abort"
msgstr "--abort"
@@ -6731,7 +6755,7 @@ msgid "Restore the original branch and abort the patching operation."
msgstr "restaurar la rama original y abortar la operaci처n de parchado."
#. type: Labeled list
-#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:238 en/sequencer.txt:10
+#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:256 en/sequencer.txt:10
#, ignore-same, no-wrap, priority:240
msgid "--quit"
msgstr "--quit"
@@ -6743,7 +6767,7 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:262
+#: en/git-am.txt:179 en/git-rebase.txt:280
#, ignore-same, no-wrap, priority:100
msgid "--show-current-patch"
msgstr "--show-current-patch"
@@ -6755,7 +6779,7 @@ msgid "Show the patch being applied when \"git am\" is stopped because of confli
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:451 en/git-format-patch.txt:351 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:188 en/git-tag.txt:231
+#: en/git-am.txt:184 en/git-commit.txt:453 en/git-format-patch.txt:355 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
@@ -6839,7 +6863,7 @@ msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the curren
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:471 en/git-gc.txt:147
+#: en/git-am.txt:234 en/git-commit.txt:473 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
@@ -6937,7 +6961,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:322 en/merge-options.txt:84
+#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -6979,7 +7003,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:291
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:292
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7051,7 +7075,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:342
+#: en/git-apply.txt:134 en/git-rebase.txt:360
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7267,7 +7291,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:330 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:398 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:332 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -9189,7 +9213,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:525
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9225,13 +9249,13 @@ msgid "Sorting and filtering branches are case insensitive."
msgstr "ordenamiento y filtrado son case-insensitive"
#. type: Labeled list
-#: en/git-branch.txt:153 en/git-status.txt:126 en/git-tag.txt:134
+#: en/git-branch.txt:153 en/git-status.txt:130 en/git-tag.txt:134
#, no-wrap, priority:280
msgid "--column[=<options>]"
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:154 en/git-status.txt:127 en/git-tag.txt:135
+#: en/git-branch.txt:154 en/git-status.txt:131 en/git-tag.txt:135
#, ignore-same, no-wrap, priority:280
msgid "--no-column"
msgstr "--no-column"
@@ -9356,12 +9380,6 @@ msgstr "--no-track"
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
-#. type: Labeled list
-#: en/git-branch.txt:225 en/git-push.txt:349
-#, ignore-same, no-wrap, priority:240
-msgid "--set-upstream"
-msgstr "--set-upstream"
-
#. type: Plain text
#: en/git-branch.txt:228
#, priority:240
@@ -9631,7 +9649,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-filter-branch.txt:449 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10251,7 +10269,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:152 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10900,7 +10918,7 @@ msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will al
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:226
+#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
@@ -11097,7 +11115,7 @@ msgid "Only meaningful with `--stdin`; paths are separated with NUL character in
msgstr ""
#. type: Plain text
-#: en/git-checkout-index.txt:73 en/git-commit.txt:345 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
+#: en/git-checkout-index.txt:73 en/git-commit.txt:347 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
#, priority:280
msgid "Do not interpret any more arguments as options."
msgstr ""
@@ -11418,7 +11436,7 @@ msgid "Quiet, suppress feedback messages."
msgstr "suprimir mensajes de feedback"
#. type: Labeled list
-#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:144
+#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:152
#, ignore-same, no-wrap, priority:240
msgid "--no-progress"
msgstr "--no-progress"
@@ -11604,7 +11622,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:241 en/git-rebase.txt:268 en/git-rebase.txt:529 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:354 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
+#: en/git-checkout.txt:241 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:355 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11724,7 +11742,7 @@ msgid "In the default overlay mode, `git checkout` never removes files from the
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:312 en/git-rebase.txt:225 en/git-switch.txt:36
+#: en/git-checkout.txt:312 en/git-rebase.txt:243 en/git-switch.txt:36
#, no-wrap, priority:240
msgid "<branch>"
msgstr "<rama>"
@@ -12430,7 +12448,7 @@ msgid "This option determines how the commit message will be cleaned up before b
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:65 en/git-clean.txt:61
+#: en/git-cherry-pick.txt:65 en/git-clean.txt:63
#, ignore-same, no-wrap, priority:100
msgid "-x"
msgstr "-x"
@@ -12514,7 +12532,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:249 en/git-rebase.txt:532
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:267 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12538,7 +12556,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:282 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:109
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12556,7 +12574,7 @@ msgid "-X<option>"
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:125
#, no-wrap, priority:240
msgid "--strategy-option=<option>"
msgstr ""
@@ -12752,7 +12770,7 @@ msgid "Show the commit subjects next to the SHA1s."
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:32 en/git-rebase.txt:220
+#: en/git-cherry.txt:32 en/git-rebase.txt:238
#, fuzzy, no-wrap, priority:100
msgid "<upstream>"
msgstr "upstream"
@@ -12770,7 +12788,7 @@ msgid "<head>"
msgstr ""
#. type: Plain text
-#: en/git-cherry.txt:38 en/git-rebase.txt:227
+#: en/git-cherry.txt:38 en/git-rebase.txt:245
#, priority:100
msgid "Working branch; defaults to HEAD."
msgstr ""
@@ -12983,85 +13001,85 @@ msgid "If any optional `<path>...` arguments are given, only those paths are aff
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:33
+#: en/git-clean.txt:35
#, priority:100
-msgid "Remove untracked directories in addition to untracked files. If an untracked directory is managed by a different Git repository, it is not removed by default. Use -f option twice if you really want to remove such a directory."
+msgid "Normally, when no <path> is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. If any paths are specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under `--force`) will be removed."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:41
+#: en/git-clean.txt:43
#, priority:100
-msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f, -n or -i. Git will refuse to delete directories with .git sub directory or file unless a second -f is given."
+msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f or -i. Git will refuse to modify untracked nested git repositories (directories with a .git subdirectory) unless a second -f is given."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:46
+#: en/git-clean.txt:48
#, priority:100
msgid "Show what would be done and clean files interactively. See ``Interactive mode'' for details."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:50
+#: en/git-clean.txt:52
#, priority:100
msgid "Don't actually remove anything, just show what would be done."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:55
+#: en/git-clean.txt:57
#, priority:100
msgid "Be quiet, only report errors, but not the files that are successfully removed."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:56
+#: en/git-clean.txt:58
#, no-wrap, priority:100
msgid "-e <pattern>"
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:57 en/git-ls-files.txt:85 en/git-name-rev.txt:33
+#: en/git-clean.txt:59 en/git-ls-files.txt:85 en/git-name-rev.txt:33
#, no-wrap, priority:100
msgid "--exclude=<pattern>"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:60
+#: en/git-clean.txt:62
#, priority:100
msgid "Use the given exclude pattern in addition to the standard ignore rules (see linkgit:gitignore[5])."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:68
+#: en/git-clean.txt:70
#, priority:100
msgid "Don't use the standard ignore rules (see linkgit:gitignore[5]), but still use the ignore rules given with `-e` options from the command line. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git restore' or 'git reset') to create a pristine working directory to test a clean build."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:69
+#: en/git-clean.txt:71
#, no-wrap, priority:100
msgid "-X"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:72
+#: en/git-clean.txt:74
#, priority:100
msgid "Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files."
msgstr ""
#. type: Title -
-#: en/git-clean.txt:74
+#: en/git-clean.txt:76
#, no-wrap, priority:100
msgid "Interactive mode"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:78
+#: en/git-clean.txt:80
#, priority:100
msgid "When the command enters the interactive mode, it shows the files and directories to be cleaned, and goes into its interactive command loop."
msgstr ""
#. type: delimited block -
-#: en/git-clean.txt:89
+#: en/git-clean.txt:91
#, no-wrap, priority:100
msgid ""
" *** Commands ***\n"
@@ -13071,91 +13089,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:92
+#: en/git-clean.txt:94
#, priority:100
msgid "You also could say `c` or `clean` above as long as the choice is unique."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:94
+#: en/git-clean.txt:96
#, priority:100
msgid "The main command loop has 6 subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:95
+#: en/git-clean.txt:97
#, no-wrap, priority:100
msgid "clean"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:98
+#: en/git-clean.txt:100
#, priority:100
msgid "Start cleaning files and directories, and then quit."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:99
+#: en/git-clean.txt:101
#, no-wrap, priority:100
msgid "filter by pattern"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:107
+#: en/git-clean.txt:109
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Input ignore patterns>>\" prompt. You can input space-separated patterns to exclude files and directories from deletion. E.g. \"*.c *.h\" will excludes files end with \".c\" and \".h\" from deletion. When you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:108
+#: en/git-clean.txt:110
#, no-wrap, priority:100
msgid "select by numbers"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:119
+#: en/git-clean.txt:121
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Select items to delete>>\" prompt. When the prompt ends with double '>>' like this, you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything. Also when you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:120
+#: en/git-clean.txt:122
#, no-wrap, priority:100
msgid "ask each"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:125
+#: en/git-clean.txt:127
#, priority:100
msgid "This will start to clean, and you must confirm one by one in order to delete items. Please note that this action is not as efficient as the above two actions."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:126
+#: en/git-clean.txt:128
#, fuzzy, no-wrap, priority:100
msgid "quit"
msgstr "tranquilo"
#. type: Plain text
-#: en/git-clean.txt:129
+#: en/git-clean.txt:131
#, priority:100
msgid "This lets you quit without do cleaning."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:130
+#: en/git-clean.txt:132
#, no-wrap, priority:100
msgid "help"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:133
+#: en/git-clean.txt:135
#, priority:100
msgid "Show brief usage of interactive git-clean."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:137 en/git-status.txt:436
+#: en/git-clean.txt:139 en/git-status.txt:440
#, ignore-same, priority:280
msgid "linkgit:gitignore[5]"
msgstr "linkgit:gitignore[5]"
@@ -13294,7 +13312,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:108 en/git-submodule.txt:392
+#: en/git-clone.txt:108 en/git-submodule.txt:393
#, ignore-same, no-wrap, priority:300
msgid "--dissociate"
msgstr "--dissociate"
@@ -13540,13 +13558,13 @@ msgid "Instead of placing the cloned repository where it is supposed to be, plac
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:277 en/git-submodule.txt:416
+#: en/git-clone.txt:277 en/git-submodule.txt:417
#, no-wrap, priority:300
msgid "-j <n>"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:278 en/git-submodule.txt:417
+#: en/git-clone.txt:278 en/git-submodule.txt:418
#, no-wrap, priority:300
msgid "--jobs <n>"
msgstr ""
@@ -13904,7 +13922,7 @@ msgid "Read the commit log message from the given file. Use `-` to read from the
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:68 en/git-commit.txt:339
+#: en/git-commit-tree.txt:68 en/git-commit.txt:341
#, ignore-same, no-wrap, priority:280
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
@@ -13988,7 +14006,7 @@ msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:477 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:428 en/git-svn.txt:1156
+#: en/git-commit-tree.txt:114 en/git-commit.txt:479 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:429 en/git-svn.txt:1156
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
@@ -14294,13 +14312,13 @@ msgid "When editing the commit message, start the editor with the contents in th
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:173 en/merge-options.txt:81
+#: en/git-commit.txt:173 en/merge-options.txt:85
#, priority:280
msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:175 en/git-rebase.txt:330
+#: en/git-commit.txt:175 en/git-rebase.txt:348 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14507,115 +14525,115 @@ msgid "Show untracked files."
msgstr "No hay archivos sin rastrear.\n"
#. type: Plain text
-#: en/git-commit.txt:288
+#: en/git-commit.txt:289
#, priority:280
msgid "The mode parameter is optional (defaults to 'all'), and is used to specify the handling of untracked files; when -u is not used, the default is 'normal', i.e. show untracked files and directories."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:290 en/git-status.txt:67 en/git-status.txt:107
+#: en/git-commit.txt:291 en/git-status.txt:68 en/git-status.txt:110
#, priority:280
msgid "The possible options are:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:292
+#: en/git-commit.txt:293
#, no-wrap, priority:280
msgid "'no' - Show no untracked files\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:293
+#: en/git-commit.txt:294
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:294 en/git-status.txt:71
+#: en/git-commit.txt:295 en/git-status.txt:72
#, no-wrap, priority:280
msgid "'all' - Also shows individual files in untracked directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:297 en/git-status.txt:84
+#: en/git-commit.txt:298 en/git-status.txt:85
#, priority:280
msgid "The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:308
+#: en/git-commit.txt:310
#, priority:280
msgid "Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template to help the user describe the commit by reminding what changes the commit has. Note that this diff output doesn't have its lines prefixed with '#'. This diff will not be a part of the commit message. See the `commit.verbose` configuration variable in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:312
+#: en/git-commit.txt:314
#, priority:280
msgid "If specified twice, show in addition the unified diff between what would be committed and the worktree files, i.e. the unstaged changes to tracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:316
+#: en/git-commit.txt:318
#, priority:280
msgid "Suppress commit summary message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:321
+#: en/git-commit.txt:323
#, priority:280
msgid "Do not create a commit, but show a list of paths that are to be committed, paths with local changes that will be left uncommitted and paths that are untracked."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:322
+#: en/git-commit.txt:324
#, ignore-same, no-wrap, priority:280
msgid "--status"
msgstr "--status"
#. type: Plain text
-#: en/git-commit.txt:327
+#: en/git-commit.txt:329
#, priority:280
msgid "Include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the commit message. Defaults to on, but can be used to override configuration variable commit.status."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:328
+#: en/git-commit.txt:330
#, ignore-same, no-wrap, priority:280
msgid "--no-status"
msgstr "--no-status"
#. type: Plain text
-#: en/git-commit.txt:332
+#: en/git-commit.txt:334
#, priority:280
msgid "Do not include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the default commit message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:342
+#: en/git-commit.txt:344
#, priority:280
msgid "Countermand `commit.gpgSign` configuration variable that is set to force each and every commit to be signed."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:346 en/git-rm.txt:29
+#: en/git-commit.txt:348 en/git-rm.txt:29
#, ignore-ellipsis, no-wrap, priority:280
msgid "<file>..."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:352
+#: en/git-commit.txt:354
#, priority:280
msgid "When files are given on the command line, the command commits the contents of the named files, without recording the changes already staged. The contents of these files are also staged for the next commit on top of what have been staged before."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:369
+#: en/git-commit.txt:371
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:375
+#: en/git-commit.txt:377
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14625,13 +14643,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:383
+#: en/git-commit.txt:385
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:388
+#: en/git-commit.txt:390
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14640,19 +14658,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:393
+#: en/git-commit.txt:395
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:398
+#: en/git-commit.txt:400
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:404
+#: en/git-commit.txt:406
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14662,31 +14680,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:411
+#: en/git-commit.txt:413
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:414 en/git-commit.txt:440
+#: en/git-commit.txt:416 en/git-commit.txt:442
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:418
+#: en/git-commit.txt:420
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:426
+#: en/git-commit.txt:428
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:432
+#: en/git-commit.txt:434
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14696,55 +14714,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:437
+#: en/git-commit.txt:439
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:448
+#: en/git-commit.txt:450
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:460
+#: en/git-commit.txt:462
#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:464
+#: en/git-commit.txt:466
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:469
+#: en/git-commit.txt:471
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:475
+#: en/git-commit.txt:477
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:479
+#: en/git-commit.txt:481
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:485
+#: en/git-commit.txt:487
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:493
+#: en/git-commit.txt:495
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -15412,211 +15430,211 @@ msgstr ""
msgid "Given a .git/config like this:"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:347
+#. type: delimited block -
+#: en/git-config.txt:348
#, no-wrap, priority:100
msgid ""
-"\t#\n"
-"\t# This is the config file, and\n"
-"\t# a '#' or ';' character indicates\n"
-"\t# a comment\n"
-"\t#\n"
+"#\n"
+"# This is the config file, and\n"
+"# a '#' or ';' character indicates\n"
+"# a comment\n"
+"#\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:352
+#. type: delimited block -
+#: en/git-config.txt:353 en/git.txt:310
#, no-wrap, priority:100
msgid ""
-"\t; core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"; core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:357
+#. type: delimited block -
+#: en/git-config.txt:358
#, no-wrap, priority:100
msgid ""
-"\t; Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"; Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:362
+#. type: delimited block -
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
-"\t; Proxy settings\n"
-"\t[core]\n"
-"\t\tgitproxy=proxy-command for kernel.org\n"
-"\t\tgitproxy=default-proxy ; for all the rest\n"
+"; Proxy settings\n"
+"[core]\n"
+"\tgitproxy=proxy-command for kernel.org\n"
+"\tgitproxy=default-proxy ; for all the rest\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:369
+#. type: delimited block -
+#: en/git-config.txt:370
#, no-wrap, priority:100
msgid ""
-"\t; HTTP\n"
-"\t[http]\n"
-"\t\tsslVerify\n"
-"\t[http \"https://weak.example.com\"]\n"
-"\t\tsslVerify = false\n"
-"\t\tcookieFile = /tmp/cookie.txt\n"
+"; HTTP\n"
+"[http]\n"
+"\tsslVerify\n"
+"[http \"https://weak.example.com\"]\n"
+"\tsslVerify = false\n"
+"\tcookieFile = /tmp/cookie.txt\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:371
+#: en/git-config.txt:373
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:374
+#: en/git-config.txt:376
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:379
+#: en/git-config.txt:381
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:382
+#: en/git-config.txt:384
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:385
+#: en/git-config.txt:387
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:389
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:390
+#: en/git-config.txt:392
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:394
+#: en/git-config.txt:396
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:398
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:399
+#: en/git-config.txt:401
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:402 en/git-gui.txt:120 en/git-merge-index.txt:64
+#: en/git-config.txt:404 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:407
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:410
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:413
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:414
+#: en/git-config.txt:416
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:417
+#: en/git-config.txt:419
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:421
+#: en/git-config.txt:423
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:424
+#: en/git-config.txt:426
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:428
+#: en/git-config.txt:430
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:431
+#: en/git-config.txt:433
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:434
+#: en/git-config.txt:436
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:437
+#: en/git-config.txt:439
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:440
+#: en/git-config.txt:442
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:443
+#: en/git-config.txt:445
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:447
+#: en/git-config.txt:449
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:453
+#: en/git-config.txt:455
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15626,13 +15644,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:457
+#: en/git-config.txt:459
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:466
+#: en/git-config.txt:468
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15645,19 +15663,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:471 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1029 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
+#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:476
+#: en/git-config.txt:478
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:482
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15665,13 +15683,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:483
+#: en/git-config.txt:485
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:488
+#: en/git-config.txt:490
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -17034,7 +17052,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
msgstr ""
#. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:234
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
#, no-wrap, priority:100
msgid "LIMITATIONS"
msgstr ""
@@ -18539,7 +18557,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:976
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:992
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19091,7 +19109,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:422
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:423
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -19187,13 +19205,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:982
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:998
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:988
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1004
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -19548,9 +19566,9 @@ msgid "This program dumps the given revisions in a form suitable to be piped int
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:22
+#: en/git-fast-export.txt:23
#, priority:100
-msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a kind of an interactive 'git filter-branch'."
+msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
@@ -19637,146 +19655,158 @@ msgstr ""
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
+#. type: Labeled list
+#: en/git-fast-export.txt:79
+#, ignore-same, no-wrap, priority:100
+msgid "--mark-tags"
+msgstr "--mark-tags"
+
+#. type: Plain text
+#: en/git-fast-export.txt:87
+#, priority:100
+msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
+msgstr ""
+
#. type: Plain text
-#: en/git-fast-export.txt:83
+#: en/git-fast-export.txt:92
#, priority:100
-msgid "Any commits that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
+msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:84
+#: en/git-fast-export.txt:93
#, ignore-same, no-wrap, priority:100
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
-#: en/git-fast-export.txt:89
+#: en/git-fast-export.txt:98
#, priority:100
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:90
+#: en/git-fast-export.txt:99
#, ignore-same, no-wrap, priority:100
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
-#: en/git-fast-export.txt:93
+#: en/git-fast-export.txt:102
#, priority:100
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:94
+#: en/git-fast-export.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
-#: en/git-fast-export.txt:101
+#: en/git-fast-export.txt:110
#, priority:100
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
+#: en/git-fast-export.txt:111 en/git-ls-tree.txt:72
#, ignore-same, no-wrap, priority:100
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
-#: en/git-fast-export.txt:107
+#: en/git-fast-export.txt:116
#, priority:100
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:108
+#: en/git-fast-export.txt:117
#, ignore-same, no-wrap, priority:100
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
-#: en/git-fast-export.txt:112
+#: en/git-fast-export.txt:121
#, priority:100
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:113
+#: en/git-fast-export.txt:122
#, ignore-same, no-wrap, priority:100
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
-#: en/git-fast-export.txt:124
+#: en/git-fast-export.txt:133
#, priority:100
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:125
+#: en/git-fast-export.txt:134
#, ignore-same, no-wrap, priority:100
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
-#: en/git-fast-export.txt:131
+#: en/git-fast-export.txt:140
#, priority:100
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:132
+#: en/git-fast-export.txt:141
#, no-wrap, priority:100
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:138
+#: en/git-fast-export.txt:147
#, priority:100
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be reencoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:139
+#: en/git-fast-export.txt:148
#, ignore-same, no-wrap, priority:100
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
-#: en/git-fast-export.txt:142
+#: en/git-fast-export.txt:151
#, priority:100
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:143
+#: en/git-fast-export.txt:152
#, ignore-ellipsis, no-wrap, priority:100
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:160
#, priority:100
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:157
+#: en/git-fast-export.txt:166
#, no-wrap, priority:100
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:162
+#: en/git-fast-export.txt:171
#, priority:100
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:167
+#: en/git-fast-export.txt:176
#, no-wrap, priority:100
msgid ""
"$ git fast-export master~5..master |\n"
@@ -19785,55 +19815,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:180
#, priority:100
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:175
+#: en/git-fast-export.txt:184
#, priority:100
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
-#: en/git-fast-export.txt:178
+#: en/git-fast-export.txt:187
#, no-wrap, priority:100
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:186
+#: en/git-fast-export.txt:195
#, priority:100
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:198
+#: en/git-fast-export.txt:207
#, priority:100
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:201
+#: en/git-fast-export.txt:210
#, priority:100
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:204
+#: en/git-fast-export.txt:213
#, no-wrap, priority:100
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:209
+#: en/git-fast-export.txt:218
#, priority:100
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:215
+#: en/git-fast-export.txt:224
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git init anon-repo\n"
@@ -19843,25 +19873,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:222
+#: en/git-fast-export.txt:231
#, priority:100
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:225
+#: en/git-fast-export.txt:234
#, no-wrap, priority:100
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:240
#, priority:100
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:239
+#: en/git-fast-export.txt:248
#, priority:100
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
@@ -20095,7 +20125,7 @@ msgid "See linkgit:git-config[1]"
msgstr "linkgit:git-config[1]"
#. type: Title -
-#: en/git-fast-import.txt:144 en/git-p4.txt:507
+#: en/git-fast-import.txt:144 en/git-filter-branch.txt:463 en/git-p4.txt:507
#, no-wrap, priority:100
msgid "PERFORMANCE"
msgstr ""
@@ -20329,7 +20359,7 @@ msgid "fast-import accepts several commands to update the current repository and
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:319 en/git-fast-import.txt:381
+#: en/git-fast-import.txt:319 en/git-fast-import.txt:388
#, ignore-same, no-wrap, priority:100
msgid "`commit`"
msgstr "`commit`"
@@ -20341,7 +20371,7 @@ msgid "Creates a new branch or updates an existing branch by creating a new comm
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:324 en/git-fast-import.txt:771
+#: en/git-fast-import.txt:324 en/git-fast-import.txt:778
#, ignore-same, no-wrap, priority:100
msgid "`tag`"
msgstr "`tag`"
@@ -20353,7 +20383,7 @@ msgid "Creates an annotated tag object from an existing commit or branch. Light
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:330 en/git-fast-import.txt:815
+#: en/git-fast-import.txt:330 en/git-fast-import.txt:823
#, ignore-same, no-wrap, priority:100
msgid "`reset`"
msgstr "`reset`"
@@ -20365,7 +20395,7 @@ msgid "Reset an existing branch (or a new branch) to a specific revision. This
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:335 en/git-fast-import.txt:844
+#: en/git-fast-import.txt:335 en/git-fast-import.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`blob`"
msgstr "`blob`"
@@ -20377,109 +20407,121 @@ msgid "Convert raw file data into a blob, for future use in a `commit` command.
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:340 en/git-fast-import.txt:917
+#: en/git-fast-import.txt:340 en/git-fast-import.txt:925
+#, ignore-same, no-wrap, priority:100
+msgid "`alias`"
+msgstr "`alias`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:346
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
+msgstr ""
+
+#. type: Title ~
+#: en/git-fast-import.txt:347 en/git-fast-import.txt:940
#, ignore-same, no-wrap, priority:100
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
-#: en/git-fast-import.txt:345
+#: en/git-fast-import.txt:352
#, priority:100
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:346 en/git-fast-import.txt:945
+#: en/git-fast-import.txt:353 en/git-fast-import.txt:968
#, ignore-same, no-wrap, priority:100
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
-#: en/git-fast-import.txt:350
+#: en/git-fast-import.txt:357
#, priority:100
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:351 en/git-fast-import.txt:1152
+#: en/git-fast-import.txt:358 en/git-fast-import.txt:1175
#, ignore-same, no-wrap, priority:100
msgid "`done`"
msgstr "`done`"
#. type: Plain text
-#: en/git-fast-import.txt:355
+#: en/git-fast-import.txt:362
#, priority:100
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:356 en/git-fast-import.txt:970
+#: en/git-fast-import.txt:363 en/git-fast-import.txt:993
#, ignore-same, no-wrap, priority:100
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
-#: en/git-fast-import.txt:360
+#: en/git-fast-import.txt:367
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:361 en/git-fast-import.txt:985
+#: en/git-fast-import.txt:368 en/git-fast-import.txt:1008
#, ignore-same, no-wrap, priority:100
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
-#: en/git-fast-import.txt:365
+#: en/git-fast-import.txt:372
#, priority:100
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:366 en/git-fast-import.txt:1016
+#: en/git-fast-import.txt:373 en/git-fast-import.txt:1039
#, ignore-same, no-wrap, priority:100
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
-#: en/git-fast-import.txt:370
+#: en/git-fast-import.txt:377
#, priority:100
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:371 en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:378 en/git-fast-import.txt:1092
#, ignore-same, no-wrap, priority:100
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
#, priority:100
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:1124
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:1147
#, ignore-same, no-wrap, priority:100
msgid "`option`"
msgstr "`option`"
#. type: Plain text
-#: en/git-fast-import.txt:379
+#: en/git-fast-import.txt:386
#, priority:100
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:384
+#: en/git-fast-import.txt:391
#, priority:100
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
#, no-wrap, priority:100
msgid ""
"\t'commit' SP <ref> LF\n"
@@ -20490,247 +20532,247 @@ msgid ""
"\t('encoding' SP <encoding>)?\n"
"\tdata\n"
"\t('from' SP <commit-ish> LF)?\n"
-"\t('merge' SP <commit-ish> LF)?\n"
+"\t('merge' SP <commit-ish> LF)*\n"
"\t(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*\n"
"\tLF?\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:405
+#: en/git-fast-import.txt:412
#, priority:100
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:411
+#: en/git-fast-import.txt:418
#, priority:100
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:417
+#: en/git-fast-import.txt:424
#, priority:100
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:425
+#: en/git-fast-import.txt:432
#, priority:100
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:432
+#: en/git-fast-import.txt:439
#, priority:100
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:434
+#: en/git-fast-import.txt:441
#, ignore-same, no-wrap, priority:100
msgid "`author`"
msgstr "`author`"
#. type: Plain text
-#: en/git-fast-import.txt:440
+#: en/git-fast-import.txt:447
#, priority:100
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:442
+#: en/git-fast-import.txt:449
#, ignore-same, no-wrap, priority:100
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
-#: en/git-fast-import.txt:445
+#: en/git-fast-import.txt:452
#, priority:100
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
#, priority:100
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:458
+#: en/git-fast-import.txt:465
#, priority:100
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:460
+#: en/git-fast-import.txt:467
#, ignore-same, no-wrap, priority:100
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
-#: en/git-fast-import.txt:464
+#: en/git-fast-import.txt:471
#, priority:100
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:466
+#: en/git-fast-import.txt:473
#, ignore-same, no-wrap, priority:100
msgid "`from`"
msgstr "`from`"
#. type: Plain text
-#: en/git-fast-import.txt:472
+#: en/git-fast-import.txt:479
#, priority:100
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
#, priority:100
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:485
+#: en/git-fast-import.txt:492
#, priority:100
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
#, priority:100
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:491
+#: en/git-fast-import.txt:498
#, priority:100
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:493
+#: en/git-fast-import.txt:500
#, priority:100
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:499
+#: en/git-fast-import.txt:506
#, priority:100
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:501
+#: en/git-fast-import.txt:508
#, priority:100
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:503
+#: en/git-fast-import.txt:510
#, priority:100
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
#, priority:100
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:509
+#: en/git-fast-import.txt:516
#, priority:100
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:512
+#: en/git-fast-import.txt:519
#, priority:100
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
#, no-wrap, priority:100
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:521
+#: en/git-fast-import.txt:528
#, priority:100
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:523
+#: en/git-fast-import.txt:530
#, ignore-same, no-wrap, priority:100
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
-#: en/git-fast-import.txt:531
+#: en/git-fast-import.txt:538
#, priority:100
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:534
+#: en/git-fast-import.txt:541
#, priority:100
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:536
+#: en/git-fast-import.txt:543
#, ignore-same, no-wrap, priority:100
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:540
+#: en/git-fast-import.txt:547
#, priority:100
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:541 en/git-fast-import.txt:708
+#: en/git-fast-import.txt:548 en/git-fast-import.txt:715
#, no-wrap, priority:100
msgid "External data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:544
+#: en/git-fast-import.txt:551
#, priority:100
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:547
+#: en/git-fast-import.txt:554
#, no-wrap, priority:100
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
#, priority:100
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:555 en/git-fast-import.txt:721
+#: en/git-fast-import.txt:562 en/git-fast-import.txt:728
#, no-wrap, priority:100
msgid "Inline data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:559
+#: en/git-fast-import.txt:566
#, priority:100
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
#, no-wrap, priority:100
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -20738,259 +20780,259 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:566 en/git-fast-import.txt:732
+#: en/git-fast-import.txt:573 en/git-fast-import.txt:739
#, priority:100
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:569
+#: en/git-fast-import.txt:576
#, priority:100
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
#, priority:100
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:574
+#: en/git-fast-import.txt:581
#, priority:100
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:575
+#: en/git-fast-import.txt:582
#, priority:100
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
#, priority:100
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:580
+#: en/git-fast-import.txt:587
#, priority:100
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:583
+#: en/git-fast-import.txt:590
#, priority:100
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:587
+#: en/git-fast-import.txt:594
#, priority:100
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:594
+#: en/git-fast-import.txt:601
#, priority:100
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
#, priority:100
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:598
+#: en/git-fast-import.txt:605
#, priority:100
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:599
+#: en/git-fast-import.txt:606
#, priority:100
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:600
+#: en/git-fast-import.txt:607
#, priority:100
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:602
+#: en/git-fast-import.txt:609
#, priority:100
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:604
+#: en/git-fast-import.txt:611
#, priority:100
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:606
+#: en/git-fast-import.txt:613
#, priority:100
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:608
+#: en/git-fast-import.txt:615
#, ignore-same, no-wrap, priority:100
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
-#: en/git-fast-import.txt:614
+#: en/git-fast-import.txt:621
#, priority:100
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
#, no-wrap, priority:100
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
#, priority:100
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:624
+#: en/git-fast-import.txt:631
#, ignore-same, no-wrap, priority:100
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
#, priority:100
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:632
+#: en/git-fast-import.txt:639
#, no-wrap, priority:100
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:638 en/git-fast-import.txt:658
+#: en/git-fast-import.txt:645 en/git-fast-import.txt:665
#, priority:100
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:643
+#: en/git-fast-import.txt:650
#, priority:100
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:645
+#: en/git-fast-import.txt:652
#, ignore-same, no-wrap, priority:100
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
-#: en/git-fast-import.txt:649
+#: en/git-fast-import.txt:656
#, priority:100
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:652
+#: en/git-fast-import.txt:659
#, no-wrap, priority:100
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:663
+#: en/git-fast-import.txt:670
#, priority:100
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:672
+#: en/git-fast-import.txt:679
#, priority:100
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
-#: en/git-fast-import.txt:679
+#: en/git-fast-import.txt:686
#, priority:100
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:682
+#: en/git-fast-import.txt:689
#, no-wrap, priority:100
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:688
+#: en/git-fast-import.txt:695
#, priority:100
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:696
+#: en/git-fast-import.txt:703
#, priority:100
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:698
+#: en/git-fast-import.txt:705
#, ignore-same, no-wrap, priority:100
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:707
+#: en/git-fast-import.txt:714
#, priority:100
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:712
+#: en/git-fast-import.txt:719
#, priority:100
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:715
+#: en/git-fast-import.txt:722
#, no-wrap, priority:100
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:720
+#: en/git-fast-import.txt:727
#, priority:100
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:725
+#: en/git-fast-import.txt:732
#, priority:100
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:729
+#: en/git-fast-import.txt:736
#, no-wrap, priority:100
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -20998,76 +21040,77 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:735
+#: en/git-fast-import.txt:742
#, priority:100
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:737
+#: en/git-fast-import.txt:744
#, ignore-same, no-wrap, priority:100
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
-#: en/git-fast-import.txt:743
+#: en/git-fast-import.txt:750
#, priority:100
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:746
+#: en/git-fast-import.txt:753
#, no-wrap, priority:100
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:752
+#: en/git-fast-import.txt:759
#, priority:100
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:756
+#: en/git-fast-import.txt:763
#, priority:100
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:758
+#: en/git-fast-import.txt:765
#, ignore-same, no-wrap, priority:100
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
-#: en/git-fast-import.txt:763
+#: en/git-fast-import.txt:770
#, priority:100
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:766
+#: en/git-fast-import.txt:773
#, no-wrap, priority:100
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:769
+#: en/git-fast-import.txt:776
#, priority:100
msgid "where `<object-identifer>` is any string not containing LF."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:774
+#: en/git-fast-import.txt:781
#, priority:100
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:781
+#: en/git-fast-import.txt:789
#, no-wrap, priority:100
msgid ""
"\t'tag' SP <name> LF\n"
+"\tmark?\n"
"\t'from' SP <commit-ish> LF\n"
"\toriginal-oid?\n"
"\t'tagger' (SP <name>)? SP LT <email> GT SP <when> LF\n"
@@ -21075,55 +21118,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:784
+#: en/git-fast-import.txt:792
#, priority:100
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:789
+#: en/git-fast-import.txt:797
#, priority:100
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:793
+#: en/git-fast-import.txt:801
#, priority:100
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:796
+#: en/git-fast-import.txt:804
#, priority:100
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:799
+#: en/git-fast-import.txt:807
#, priority:100
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:813
#, priority:100
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:813
+#: en/git-fast-import.txt:821
#, priority:100
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:820
+#: en/git-fast-import.txt:828
#, priority:100
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:825
+#: en/git-fast-import.txt:833
#, no-wrap, priority:100
msgid ""
"\t'reset' SP <ref> LF\n"
@@ -21132,25 +21175,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:829
+#: en/git-fast-import.txt:837
#, priority:100
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:831 en/git-fast-import.txt:943
+#: en/git-fast-import.txt:839 en/git-fast-import.txt:966
#, priority:100
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:834
+#: en/git-fast-import.txt:842
#, priority:100
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:838
+#: en/git-fast-import.txt:846
#, no-wrap, priority:100
msgid ""
"\treset refs/tags/938\n"
@@ -21158,19 +21201,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:850
#, priority:100
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:849
+#: en/git-fast-import.txt:857
#, priority:100
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:855
+#: en/git-fast-import.txt:863
#, no-wrap, priority:100
msgid ""
"\t'blob' LF\n"
@@ -21180,43 +21223,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:861
+#: en/git-fast-import.txt:869
#, priority:100
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:871
#, ignore-same, no-wrap, priority:100
msgid "`data`"
msgstr "`data`"
#. type: Plain text
-#: en/git-fast-import.txt:870
+#: en/git-fast-import.txt:878
#, priority:100
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:875
+#: en/git-fast-import.txt:883
#, priority:100
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:876
+#: en/git-fast-import.txt:884
#, no-wrap, priority:100
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:878
+#: en/git-fast-import.txt:886
#, priority:100
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:882
+#: en/git-fast-import.txt:890
#, no-wrap, priority:100
msgid ""
"\t'data' SP <count> LF\n"
@@ -21224,31 +21267,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:888
+#: en/git-fast-import.txt:896
#, priority:100
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:893
+#: en/git-fast-import.txt:901
#, priority:100
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:894
+#: en/git-fast-import.txt:902
#, no-wrap, priority:100
msgid "Delimited format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:899
+#: en/git-fast-import.txt:907
#, priority:100
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:905
+#: en/git-fast-import.txt:913
#, no-wrap, priority:100
msgid ""
"\t'data' SP '<<' <delim> LF\n"
@@ -21258,25 +21301,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:921
#, priority:100
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:915
+#: en/git-fast-import.txt:923
#, priority:100
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:920
+#: en/git-fast-import.txt:928
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object."
+msgstr ""
+
+#. type: delimited block .
+#: en/git-fast-import.txt:934
+#, no-wrap, priority:100
+msgid ""
+"\t'alias' LF\n"
+"\tmark\n"
+"\t'to' SP <commit-ish> LF\n"
+"\tLF?\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:937
+#, priority:100
+msgid "For a detailed description of `<commit-ish>` see above under `from`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:943
#, priority:100
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:924
+#: en/git-fast-import.txt:947
#, no-wrap, priority:100
msgid ""
"\t'checkpoint' LF\n"
@@ -21284,31 +21349,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:930
+#: en/git-fast-import.txt:953
#, priority:100
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:935
+#: en/git-fast-import.txt:958
#, priority:100
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:941
+#: en/git-fast-import.txt:964
#, priority:100
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:950
+#: en/git-fast-import.txt:973
#, priority:100
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:954
+#: en/git-fast-import.txt:977
#, no-wrap, priority:100
msgid ""
"\t'progress' SP <any> LF\n"
@@ -21316,67 +21381,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:960
+#: en/git-fast-import.txt:983
#, priority:100
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:986
#, no-wrap, priority:100
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:968
+#: en/git-fast-import.txt:991
#, priority:100
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:976
+#: en/git-fast-import.txt:999
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:979
+#: en/git-fast-import.txt:1002
#, no-wrap, priority:100
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:983 en/git-fast-import.txt:1014 en/git-fast-import.txt:1067
+#: en/git-fast-import.txt:1006 en/git-fast-import.txt:1037 en/git-fast-import.txt:1090
#, priority:100
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:991
+#: en/git-fast-import.txt:1014
#, priority:100
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:994
+#: en/git-fast-import.txt:1017
#, no-wrap, priority:100
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1022
#, priority:100
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:1024
#, priority:100
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1005
+#: en/git-fast-import.txt:1028
#, no-wrap, priority:100
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21384,283 +21449,283 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1011
+#: en/git-fast-import.txt:1034
#, priority:100
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1022
+#: en/git-fast-import.txt:1045
#, priority:100
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1025
+#: en/git-fast-import.txt:1048
#, priority:100
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1049
#, no-wrap, priority:100
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1030
+#: en/git-fast-import.txt:1053
#, priority:100
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1033
+#: en/git-fast-import.txt:1056
#, no-wrap, priority:100
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1035
+#: en/git-fast-import.txt:1058
#, no-wrap, priority:100
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1041
+#: en/git-fast-import.txt:1064
#, priority:100
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1044
+#: en/git-fast-import.txt:1067
#, no-wrap, priority:100
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1047
+#: en/git-fast-import.txt:1070
#, priority:100
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1072
#, priority:100
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1075
#, no-wrap, priority:100
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1080
#, priority:100
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1060
+#: en/git-fast-import.txt:1083
#, priority:100
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1086
#, no-wrap, priority:100
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1072
+#: en/git-fast-import.txt:1095
#, priority:100
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1075
+#: en/git-fast-import.txt:1098
#, no-wrap, priority:100
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1078
+#: en/git-fast-import.txt:1101
#, priority:100
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1079 en/git-fast-import.txt:1146
+#: en/git-fast-import.txt:1102 en/git-fast-import.txt:1169
#, no-wrap, priority:100
msgid "date-format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1080 en/git-fast-import.txt:1148
+#: en/git-fast-import.txt:1103 en/git-fast-import.txt:1171
#, no-wrap, priority:100
msgid "export-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1081
+#: en/git-fast-import.txt:1104
#, no-wrap, priority:100
msgid "relative-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1082
+#: en/git-fast-import.txt:1105
#, fuzzy, no-wrap, priority:100
msgid "no-relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
-#: en/git-fast-import.txt:1083 en/git-fast-import.txt:1150
+#: en/git-fast-import.txt:1106 en/git-fast-import.txt:1173
#, no-wrap, priority:100
msgid "force"
msgstr "forzar"
#. type: Plain text
-#: en/git-fast-import.txt:1087
+#: en/git-fast-import.txt:1110
#, priority:100
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1088 en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1111 en/git-fast-import.txt:1170
#, no-wrap, priority:100
msgid "import-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1089
+#: en/git-fast-import.txt:1112
#, no-wrap, priority:100
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1097
+#: en/git-fast-import.txt:1120
#, priority:100
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1098
+#: en/git-fast-import.txt:1121
#, fuzzy, no-wrap, priority:100
msgid "get-mark"
msgstr "`get-mark`"
#. type: Labeled list
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1122
#, fuzzy, no-wrap, priority:100
msgid "cat-blob"
msgstr "`cat-blob`"
#. type: Labeled list
-#: en/git-fast-import.txt:1100
+#: en/git-fast-import.txt:1123
#, no-wrap, priority:100
msgid "ls"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1108
+#: en/git-fast-import.txt:1131
#, priority:100
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1109
+#: en/git-fast-import.txt:1132
#, no-wrap, priority:100
msgid "notes"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1114
+#: en/git-fast-import.txt:1137
#, priority:100
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1138
#, no-wrap, priority:100
msgid "done"
msgstr "listo"
#. type: Plain text
-#: en/git-fast-import.txt:1122
+#: en/git-fast-import.txt:1145
#, priority:100
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1129
+#: en/git-fast-import.txt:1152
#, priority:100
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1132
+#: en/git-fast-import.txt:1155
#, no-wrap, priority:100
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1137
+#: en/git-fast-import.txt:1160
#, priority:100
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1141
+#: en/git-fast-import.txt:1164
#, priority:100
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1144
+#: en/git-fast-import.txt:1167
#, priority:100
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1149
+#: en/git-fast-import.txt:1172
#, priority:100
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1178
#, priority:100
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1159
+#: en/git-fast-import.txt:1182
#, priority:100
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1161
+#: en/git-fast-import.txt:1184
#, no-wrap, priority:100
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1168
+#: en/git-fast-import.txt:1191
#, priority:100
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1175
+#: en/git-fast-import.txt:1198
#, priority:100
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1203
#, no-wrap, priority:100
msgid ""
"\tmkfifo fast-import-output\n"
@@ -21669,49 +21734,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1184
+#: en/git-fast-import.txt:1207
#, priority:100
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1188
+#: en/git-fast-import.txt:1211
#, priority:100
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1213
#, no-wrap, priority:100
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1196
+#: en/git-fast-import.txt:1219
#, priority:100
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1203
+#: en/git-fast-import.txt:1226
#, priority:100
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1211
+#: en/git-fast-import.txt:1234
#, priority:100
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1236
#, priority:100
msgid "An example crash:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1229
+#: en/git-fast-import.txt:1252
#, no-wrap, priority:100
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
@@ -21731,7 +21796,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1256
#, no-wrap, priority:100
msgid ""
"\t$ git fast-import <in\n"
@@ -21740,7 +21805,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1239
+#: en/git-fast-import.txt:1262
#, no-wrap, priority:100
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
@@ -21751,13 +21816,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1241
+#: en/git-fast-import.txt:1264
#, no-wrap, priority:100
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1251
+#: en/git-fast-import.txt:1274
#, no-wrap, priority:100
msgid ""
"\tMost Recent Commands Before Crash\n"
@@ -21772,13 +21837,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1252
+#: en/git-fast-import.txt:1275
#, no-wrap, priority:100
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1255
+#: en/git-fast-import.txt:1278
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
@@ -21786,25 +21851,25 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1256
+#: en/git-fast-import.txt:1279
#, no-wrap, priority:100
msgid "active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1259
+#: en/git-fast-import.txt:1282
#, priority:100
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1260
+#: en/git-fast-import.txt:1283
#, priority:100
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1264
+#: en/git-fast-import.txt:1287
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
@@ -21813,7 +21878,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1270
+#: en/git-fast-import.txt:1293
#, no-wrap, priority:100
msgid ""
"status : active loaded dirty\n"
@@ -21825,307 +21890,307 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1274
+#: en/git-fast-import.txt:1297
#, priority:100
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1277
+#: en/git-fast-import.txt:1300
#, no-wrap, priority:100
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1280
+#: en/git-fast-import.txt:1303
#, priority:100
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1282
+#: en/git-fast-import.txt:1305
#, no-wrap, priority:100
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1290
+#: en/git-fast-import.txt:1313
#, priority:100
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1294
+#: en/git-fast-import.txt:1317
#, priority:100
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1296
+#: en/git-fast-import.txt:1319
#, no-wrap, priority:100
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1301
+#: en/git-fast-import.txt:1324
#, priority:100
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1305
+#: en/git-fast-import.txt:1328
#, priority:100
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1307
+#: en/git-fast-import.txt:1330
#, no-wrap, priority:100
msgid "Handling Renames"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1312
+#: en/git-fast-import.txt:1335
#, priority:100
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1337
#, no-wrap, priority:100
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1341
#, priority:100
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1325
+#: en/git-fast-import.txt:1348
#, priority:100
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1331
+#: en/git-fast-import.txt:1354
#, priority:100
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1337
+#: en/git-fast-import.txt:1360
#, priority:100
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1363
#, priority:100
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1342
+#: en/git-fast-import.txt:1365
#, no-wrap, priority:100
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1346
+#: en/git-fast-import.txt:1369
#, priority:100
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1353
+#: en/git-fast-import.txt:1376
#, priority:100
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1358
+#: en/git-fast-import.txt:1381
#, priority:100
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1360
+#: en/git-fast-import.txt:1383
#, no-wrap, priority:100
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1367
+#: en/git-fast-import.txt:1390
#, priority:100
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1369
+#: en/git-fast-import.txt:1392
#, no-wrap, priority:100
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1399
#, priority:100
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1379
+#: en/git-fast-import.txt:1402
#, no-wrap, priority:100
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1385
+#: en/git-fast-import.txt:1408
#, priority:100
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1393
+#: en/git-fast-import.txt:1416
#, priority:100
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1423
#, priority:100
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1407
+#: en/git-fast-import.txt:1430
#, priority:100
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1415
+#: en/git-fast-import.txt:1438
#, priority:100
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1417
+#: en/git-fast-import.txt:1440
#, no-wrap, priority:100
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1423
+#: en/git-fast-import.txt:1446
#, priority:100
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1448
#, no-wrap, priority:100
msgid "per object"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1432
+#: en/git-fast-import.txt:1455
#, priority:100
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1438
+#: en/git-fast-import.txt:1461
#, priority:100
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1440
+#: en/git-fast-import.txt:1463
#, no-wrap, priority:100
msgid "per mark"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1446
+#: en/git-fast-import.txt:1469
#, priority:100
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1448
+#: en/git-fast-import.txt:1471
#, no-wrap, priority:100
msgid "per branch"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1474
#, priority:100
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1457
+#: en/git-fast-import.txt:1480
#, priority:100
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1464
+#: en/git-fast-import.txt:1487
#, priority:100
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1468
+#: en/git-fast-import.txt:1491
#, priority:100
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1496
#, priority:100
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1498
#, no-wrap, priority:100
msgid "per active tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1480
+#: en/git-fast-import.txt:1503
#, priority:100
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1482
+#: en/git-fast-import.txt:1505
#, no-wrap, priority:100
msgid "per active file entry"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1488
+#: en/git-fast-import.txt:1511
#, priority:100
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1493
+#: en/git-fast-import.txt:1516
#, priority:100
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1495
+#: en/git-fast-import.txt:1518
#, no-wrap, priority:100
msgid "SIGNALS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1501
+#: en/git-fast-import.txt:1524
#, priority:100
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -22686,7 +22751,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1041
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -22802,20 +22867,32 @@ msgid ""
"\t[--state-branch <branch>] [--] [<rev-list options>...]\n"
msgstr ""
+#. type: Title -
+#: en/git-filter-branch.txt:20
+#, no-wrap, priority:100
+msgid "WARNING"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:31
+#, priority:100
+msgid "'git filter-branch' has a plethora of pitfalls that can produce non-obvious manglings of the intended history rewrite (and can leave you with little time to investigate such problems since it has such abysmal performance). These safety and performance issues cannot be backward compatibly fixed and as such, its use is not recommended. Please use an alternative history filtering tool such as https://github.com/newren/git-filter-repo/[git filter-repo]. If you still need to use 'git filter-branch', please carefully read <<SAFETY>> (and <<PERFORMANCE>>) to learn about the land mines of filter-branch, and then vigilantly avoid as many of the hazards listed there as reasonably possible."
+msgstr ""
+
#. type: Plain text
-#: en/git-filter-branch.txt:27
+#: en/git-filter-branch.txt:40
#, priority:100
msgid "Lets you rewrite Git revision history by rewriting the branches mentioned in the <rev-list options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge information) will be preserved."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:34
+#: en/git-filter-branch.txt:47
#, priority:100
msgid "The command will only rewrite the _positive_ refs mentioned in the command line (e.g. if you pass 'a..b', only 'b' will be rewritten). If you specify no filters, the commits will be recommitted without any changes, which would normally have no effect. Nevertheless, this may be useful in the future for compensating for some Git bugs or such, therefore such a usage is permitted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:39
+#: en/git-filter-branch.txt:52
#, no-wrap, priority:100
msgid ""
"*NOTE*: This command honors `.git/info/grafts` file and refs in\n"
@@ -22825,7 +22902,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:48
+#: en/git-filter-branch.txt:61
#, no-wrap, priority:100
msgid ""
"*WARNING*! The rewritten history will have different object names for all\n"
@@ -22839,337 +22916,337 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:52
+#: en/git-filter-branch.txt:65
#, priority:100
msgid "Always verify that the rewritten version is correct: The original refs, if different from the rewritten ones, will be stored in the namespace 'refs/original/'."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:56
+#: en/git-filter-branch.txt:69
#, priority:100
msgid "Note that since this operation is very I/O expensive, it might be a good idea to redirect the temporary directory off-disk with the `-d` option, e.g. on tmpfs. Reportedly the speedup is very noticeable."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:59
+#: en/git-filter-branch.txt:72
#, no-wrap, priority:100
msgid "Filters"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:71
+#: en/git-filter-branch.txt:84
#, priority:100
msgid "The filters are applied in the order as listed below. The <command> argument is always evaluated in the shell context using the 'eval' command (with the notable exception of the commit filter, for technical reasons). Prior to that, the `$GIT_COMMIT` environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, and GIT_COMMITTER_DATE are taken from the current commit and exported to the environment, in order to affect the author and committer identities of the replacement commit created by linkgit:git-commit-tree[1] after the filters have run."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:74
+#: en/git-filter-branch.txt:87
#, priority:100
msgid "If any evaluation of <command> returns a non-zero exit status, the whole operation will be aborted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:80
+#: en/git-filter-branch.txt:93
#, priority:100
msgid "A 'map' function is available that takes an \"original sha1 id\" argument and outputs a \"rewritten sha1 id\" if the commit has been already rewritten, and \"original sha1 id\" otherwise; the 'map' function can return several ids on separate lines if your commit filter emitted multiple commits."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:85
+#: en/git-filter-branch.txt:98
#, no-wrap, priority:100
msgid "--setup <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:91
+#: en/git-filter-branch.txt:104
#, priority:100
msgid "This is not a real filter executed for each commit but a one time setup just before the loop. Therefore no commit-specific variables are defined yet. Functions or variables defined here can be used or modified in the following filter steps except the commit filter, for technical reasons."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:92
+#: en/git-filter-branch.txt:105
#, no-wrap, priority:100
msgid "--subdirectory-filter <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:96
+#: en/git-filter-branch.txt:109
#, priority:100
msgid "Only look at the history which touches the given subdirectory. The result will contain that directory (and only that) as its project root. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:97
+#: en/git-filter-branch.txt:110
#, no-wrap, priority:100
msgid "--env-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:102
+#: en/git-filter-branch.txt:115
#, priority:100
msgid "This filter may be used if you only need to modify the environment in which the commit will be performed. Specifically, you might want to rewrite the author/committer name/email/time environment variables (see linkgit:git-commit-tree[1] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:103
+#: en/git-filter-branch.txt:116
#, no-wrap, priority:100
msgid "--tree-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:110
+#: en/git-filter-branch.txt:123
#, priority:100
msgid "This is the filter for rewriting the tree and its contents. The argument is evaluated in shell with the working directory set to the root of the checked out tree. The new tree is then used as-is (new files are auto-added, disappeared files are auto-removed - neither .gitignore files nor any other ignore rules *HAVE ANY EFFECT*!)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:111
+#: en/git-filter-branch.txt:124
#, no-wrap, priority:100
msgid "--index-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:117
+#: en/git-filter-branch.txt:130
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the index. It is similar to the tree filter but does not check out the tree, which makes it much faster. Frequently used with `git rm --cached --ignore-unmatch ...`, see EXAMPLES below. For hairy cases, see linkgit:git-update-index[1]."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:118
+#: en/git-filter-branch.txt:131
#, no-wrap, priority:100
msgid "--parent-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:125
+#: en/git-filter-branch.txt:138
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the commit's parent list. It will receive the parent string on stdin and shall output the new parent string on stdout. The parent string is in the format described in linkgit:git-commit-tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and \"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:126
+#: en/git-filter-branch.txt:139
#, no-wrap, priority:100
msgid "--msg-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:131
+#: en/git-filter-branch.txt:144
#, priority:100
msgid "This is the filter for rewriting the commit messages. The argument is evaluated in the shell with the original commit message on standard input; its standard output is used as the new commit message."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:132
+#: en/git-filter-branch.txt:145
#, no-wrap, priority:100
msgid "--commit-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:138
+#: en/git-filter-branch.txt:151
#, ignore-ellipsis, priority:100
msgid "This is the filter for performing the commit. If this filter is specified, it will be called instead of the 'git commit-tree' command, with arguments of the form \"<TREE_ID> [(-p <PARENT_COMMIT_ID>)...]\" and the log message on stdin. The commit id is expected on stdout."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:142
+#: en/git-filter-branch.txt:155
#, priority:100
msgid "As a special extension, the commit filter may emit multiple commit ids; in that case, the rewritten children of the original commit will have all of them as parents."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:147
+#: en/git-filter-branch.txt:160
#, priority:100
msgid "You can use the 'map' convenience function in this filter, and other convenience functions, too. For example, calling 'skip_commit \"$@\"' will leave out the current commit (but not its changes! If you want that, use 'git rebase' instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:151
+#: en/git-filter-branch.txt:164
#, priority:100
msgid "You can also use the `git_commit_non_empty_tree \"$@\"` instead of `git commit-tree \"$@\"` if you don't wish to keep commits with a single parent and that makes no change to the tree."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:152
+#: en/git-filter-branch.txt:165
#, no-wrap, priority:100
msgid "--tag-name-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:158
+#: en/git-filter-branch.txt:171
#, priority:100
msgid "This is the filter for rewriting tag names. When passed, it will be called for every tag ref that points to a rewritten object (or to a tag object which points to a rewritten object). The original tag name is passed via standard input, and the new tag name is expected on standard output."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:163
+#: en/git-filter-branch.txt:176
#, priority:100
msgid "The original tags are not deleted, but can be overwritten; use \"--tag-name-filter cat\" to simply update the tags. In this case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:174
+#: en/git-filter-branch.txt:187
#, priority:100
msgid "Nearly proper rewriting of tag objects is supported. If the tag has a message attached, a new tag object will be created with the same message, author, and timestamp. If the tag has a signature attached, the signature will be stripped. It is by definition impossible to preserve signatures. The reason this is \"nearly\" proper, is because ideally if the tag did not change (points to the same object, has the same name, etc.) it should retain any signature. That is not the case, signatures will always be removed, buyer beware. There is also no support for changing the author or timestamp (or the tag message for that matter). Tags which point to other tags will be rewritten to point to the underlying commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:175
+#: en/git-filter-branch.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--prune-empty"
msgstr "--prune-empty"
#. type: Plain text
-#: en/git-filter-branch.txt:182
+#: en/git-filter-branch.txt:195
#, priority:100
msgid "Some filters will generate empty commits that leave the tree untouched. This option instructs git-filter-branch to remove such commits if they have exactly one or zero non-pruned parents; merge commits will therefore remain intact. This option cannot be used together with `--commit-filter`, though the same effect can be achieved by using the provided `git_commit_non_empty_tree` function in a commit filter."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:183
+#: en/git-filter-branch.txt:196
#, no-wrap, priority:100
msgid "--original <namespace>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:186
+#: en/git-filter-branch.txt:199
#, priority:100
msgid "Use this option to set the namespace where the original commits will be stored. The default value is 'refs/original'."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:187
+#: en/git-filter-branch.txt:200
#, no-wrap, priority:100
msgid "-d <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:194
+#: en/git-filter-branch.txt:207
#, priority:100
msgid "Use this option to set the path to the temporary directory used for rewriting. When applying a tree filter, the command needs to temporarily check out the tree to some directory, which may consume considerable space in case of large projects. By default it does this in the `.git-rewrite/` directory but you can override that choice by this parameter."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:200
+#: en/git-filter-branch.txt:213
#, priority:100
msgid "'git filter-branch' refuses to start with an existing temporary directory or when there are already refs starting with 'refs/original/', unless forced."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:201
+#: en/git-filter-branch.txt:214
#, no-wrap, priority:100
msgid "--state-branch <branch>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:206
+#: en/git-filter-branch.txt:219
#, priority:100
msgid "This option will cause the mapping from old to new objects to be loaded from named branch upon startup and saved as a new commit to that branch upon exit, enabling incremental of large trees. If '<branch>' does not exist it will be created."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:207
+#: en/git-filter-branch.txt:220
#, ignore-ellipsis, no-wrap, priority:100
msgid "<rev-list options>..."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:212
+#: en/git-filter-branch.txt:225
#, priority:100
msgid "Arguments for 'git rev-list'. All positive refs included by these options are rewritten. You may also specify options such as `--all`, but you must use `--` to separate them from the 'git filter-branch' options. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:216
+#: en/git-filter-branch.txt:229
#, no-wrap, priority:100
msgid "Remap to ancestor"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:223
+#: en/git-filter-branch.txt:236
#, priority:100
msgid "By using linkgit:git-rev-list[1] arguments, e.g., path limiters, you can limit the set of revisions which get rewritten. However, positive refs on the command line are distinguished: we don't let them be excluded by such limiters. For this purpose, they are instead rewritten to point at the nearest ancestor that was not excluded."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:231
+#: en/git-filter-branch.txt:244
#, priority:100
msgid "On success, the exit status is `0`. If the filter can't find any commits to rewrite, the exit status is `2`. On any other error, the exit status may be any other non-zero value."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:238
+#: en/git-filter-branch.txt:251
#, priority:100
msgid "Suppose you want to remove a file (containing confidential information or copyright violation) from all commits:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:241
+#: en/git-filter-branch.txt:254
#, no-wrap, priority:100
msgid "git filter-branch --tree-filter 'rm filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:246
+#: en/git-filter-branch.txt:259
#, priority:100
msgid "However, if the file is absent from the tree of some commit, a simple `rm filename` will fail for that tree and commit. Thus you may instead want to use `rm -f filename` as the script."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:252
+#: en/git-filter-branch.txt:265
#, priority:100
msgid "Using `--index-filter` with 'git rm' yields a significantly faster version. Like with using `rm filename`, `git rm --cached filename` will fail if the file is absent from the tree of a commit. If you want to \"completely forget\" a file, it does not matter when it entered history, so we also add `--ignore-unmatch`:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:255
+#: en/git-filter-branch.txt:268
#, no-wrap, priority:100
msgid "git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:258
+#: en/git-filter-branch.txt:271
#, priority:100
msgid "Now, you will get the rewritten history saved in HEAD."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:261
+#: en/git-filter-branch.txt:274
#, priority:100
msgid "To rewrite the repository to look as if `foodir/` had been its project root, and discard all other history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:264
+#: en/git-filter-branch.txt:277
#, no-wrap, priority:100
msgid "git filter-branch --subdirectory-filter foodir -- --all\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:269
+#: en/git-filter-branch.txt:282
#, priority:100
msgid "Thus you can, e.g., turn a library subdirectory into a repository of its own. Note the `--` that separates 'filter-branch' options from revision options, and the `--all` to rewrite all branches and tags."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:273
+#: en/git-filter-branch.txt:286
#, priority:100
msgid "To set a commit (which typically is at the tip of another history) to be the parent of the current initial commit, in order to paste the other history behind the current history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:276
+#: en/git-filter-branch.txt:289
#, no-wrap, priority:100
msgid "git filter-branch --parent-filter 'sed \"s/^\\$/-p <graft-id>/\"' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:282
+#: en/git-filter-branch.txt:295
#, priority:100
msgid "(if the parent string is empty - which happens when we are dealing with the initial commit - add graftcommit as a parent). Note that this assumes history with a single root (that is, no merge without common ancestors happened). If this is not the case, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:286
+#: en/git-filter-branch.txt:299
#, no-wrap, priority:100
msgid ""
"git filter-branch --parent-filter \\\n"
@@ -23177,13 +23254,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:289
+#: en/git-filter-branch.txt:302
#, priority:100
msgid "or even simpler:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:293
+#: en/git-filter-branch.txt:306
#, no-wrap, priority:100
msgid ""
"git replace --graft $commit-id $graft-id\n"
@@ -23191,13 +23268,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:296
+#: en/git-filter-branch.txt:309
#, priority:100
msgid "To remove commits authored by \"Darl McBribe\" from the history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:305
+#: en/git-filter-branch.txt:318
#, no-wrap, priority:100
msgid ""
"git filter-branch --commit-filter '\n"
@@ -23210,13 +23287,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:308
+#: en/git-filter-branch.txt:321
#, priority:100
msgid "The function 'skip_commit' is defined as follows:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:320
+#: en/git-filter-branch.txt:333
#, no-wrap, priority:100
msgid ""
"skip_commit()\n"
@@ -23232,13 +23309,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:327
+#: en/git-filter-branch.txt:340
#, priority:100
msgid "The shift magic first throws away the tree id and then the -p parameters. Note that this handles merges properly! In case Darl committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 as their parents instead of the merge commit."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:332
+#: en/git-filter-branch.txt:345
#, no-wrap, priority:100
msgid ""
"*NOTE* the changes introduced by the commits, and which are not reverted\n"
@@ -23248,13 +23325,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:336
+#: en/git-filter-branch.txt:349
#, priority:100
msgid "You can rewrite the commit log messages using `--msg-filter`. For example, 'git svn-id' strings in a repository created by 'git svn' can be removed this way:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:341
+#: en/git-filter-branch.txt:354
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23263,13 +23340,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:345
+#: en/git-filter-branch.txt:358
#, priority:100
msgid "If you need to add 'Acked-by' lines to, say, the last 10 commits (none of which is a merge), use this command:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:351
+#: en/git-filter-branch.txt:364
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23279,13 +23356,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:357
+#: en/git-filter-branch.txt:370
#, priority:100
msgid "The `--env-filter` option can be used to modify committer and/or author identity. For example, if you found out that your commits have the wrong identity due to a misconfigured user.email, you can make a correction, before publishing the project, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:369
+#: en/git-filter-branch.txt:382
#, no-wrap, priority:100
msgid ""
"git filter-branch --env-filter '\n"
@@ -23301,19 +23378,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:375
+#: en/git-filter-branch.txt:388
#, priority:100
msgid "To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will point to the top-most revision that a 'git rev-list' of this range will print."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:377
+#: en/git-filter-branch.txt:390
#, priority:100
msgid "Consider this history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:382
+#: en/git-filter-branch.txt:395
#, no-wrap, priority:100
msgid ""
" D--E--F--G--H\n"
@@ -23322,25 +23399,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:385
+#: en/git-filter-branch.txt:398
#, priority:100
msgid "To rewrite only commits D,E,F,G,H, but leave A, B and C alone, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:388
+#: en/git-filter-branch.txt:401
#, ignore-ellipsis, no-wrap, priority:100
msgid "git filter-branch ... C..H\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:391
+#: en/git-filter-branch.txt:404
#, priority:100
msgid "To rewrite commits E,F,G,H, use one of these:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:395
+#: en/git-filter-branch.txt:408
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"git filter-branch ... C..H --not D\n"
@@ -23348,13 +23425,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:398
+#: en/git-filter-branch.txt:411
#, priority:100
msgid "To move the whole tree into a subdirectory, or remove it from there:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:405
+#: en/git-filter-branch.txt:418
#, no-wrap, priority:100
msgid ""
"git filter-branch --index-filter \\\n"
@@ -23365,87 +23442,279 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-filter-branch.txt:410
+#: en/git-filter-branch.txt:423
#, no-wrap, priority:100
msgid "CHECKLIST FOR SHRINKING A REPOSITORY"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:418
+#: en/git-filter-branch.txt:431
#, priority:100
msgid "git-filter-branch can be used to get rid of a subset of files, usually with some combination of `--index-filter` and `--subdirectory-filter`. People expect the resulting repository to be smaller than the original, but you need a few more steps to actually make it smaller, because Git tries hard not to lose your objects until you tell it to. First make sure that:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:422
+#: en/git-filter-branch.txt:435
#, priority:100
msgid "You really removed all variants of a filename, if a blob was moved over its lifetime. `git log --name-only --follow --all -- filename` can help you find renames."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:425
+#: en/git-filter-branch.txt:438
#, priority:100
msgid "You really filtered all refs: use `--tag-name-filter cat -- --all` when calling git-filter-branch."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:428
+#: en/git-filter-branch.txt:441
#, priority:100
msgid "Then there are two ways to get a smaller repository. A safer way is to clone, that keeps your original intact."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:432
+#: en/git-filter-branch.txt:445
#, priority:100
msgid "Clone it with `git clone file:///path/to/repo`. The clone will not have the removed objects. See linkgit:git-clone[1]. (Note that cloning with a plain path just hardlinks everything!)"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:437
+#: en/git-filter-branch.txt:450
#, priority:100
msgid "If you really don't want to clone it, for whatever reasons, check the following points instead (in this order). This is a very destructive approach, so *make a backup* or go back to cloning it. You have been warned."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:441
+#: en/git-filter-branch.txt:454
#, priority:100
msgid "Remove the original refs backed up by git-filter-branch: say `git for-each-ref --format=\"%(refname)\" refs/original/ | xargs -n 1 git update-ref -d`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:443
+#: en/git-filter-branch.txt:456
#, priority:100
msgid "Expire all reflogs with `git reflog expire --expire=now --all`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:447
+#: en/git-filter-branch.txt:460
#, priority:100
msgid "Garbage collect all unreferenced objects with `git gc --prune=now` (or if your git-gc is not new enough to support arguments to `--prune`, use `git repack -ad; git prune` instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:459
+#: en/git-filter-branch.txt:467
#, priority:100
-msgid "git-filter-branch allows you to make complex shell-scripted rewrites of your Git history, but you probably don't need this flexibility if you're simply _removing unwanted data_ like large files or passwords. For those operations you may want to consider http://rtyley.github.io/bfg-repo-cleaner/[The BFG Repo-Cleaner], a JVM-based alternative to git-filter-branch, typically at least 10-50x faster for those use-cases, and with quite different characteristics:"
+msgid "The performance of git-filter-branch is glacially slow; its design makes it impossible for a backward-compatible implementation to ever be fast:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:467
+#: en/git-filter-branch.txt:473
#, priority:100
-msgid "Any particular version of a file is cleaned exactly _once_. The BFG, unlike git-filter-branch, does not give you the opportunity to handle a file differently based on where or when it was committed within your history. This constraint gives the core performance benefit of The BFG, and is well-suited to the task of cleansing bad data - you don't care _where_ the bad data is, you just want it _gone_."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:473
+#: en/git-filter-branch.txt:476
+#, priority:100
+msgid "If you try and cheat and try to make git-filter-branch only work on files modified in a commit, then two things happen"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:482
+#, priority:100
+msgid "you run into problems with deletions whenever the user is simply trying to rename files (because attempting to delete files that don't exist looks like a no-op; it takes some chicanery to remap deletes across file renames when the renames happen via arbitrary user-provided shell)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:488
+#, priority:100
+msgid "even if you succeed at the map-deletes-for-renames chicanery, you still technically violate backward compatibility because users are allowed to filter files in ways that depend upon topology of commits instead of filtering solely based on file contents or names (though this has not been observed in the wild)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:494
+#, priority:100
+msgid "Even if you don't need to edit files but only want to e.g. rename or remove some and thus can avoid checking out each file (i.e. you can use --index-filter), you still are passing shell snippets for your filters. This means that for every commit, you have to have a prepared git repo where those filters can be run. That's a significant setup."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:505
+#, priority:100
+msgid "Further, several additional files are created or updated per commit by git-filter-branch. Some of these are for supporting the convenience functions provided by git-filter-branch (such as map()), while others are for keeping track of internal state (but could have also been accessed by user filters; one of git-filter-branch's regression tests does so). This essentially amounts to using the filesystem as an IPC mechanism between git-filter-branch and the user-provided filters. Disks tend to be a slow IPC mechanism, and writing these files also effectively represents a forced synchronization point between separate processes that we hit with every commit."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:511
+#, priority:100
+msgid "The user-provided shell commands will likely involve a pipeline of commands, resulting in the creation of many processes per commit. Creating and running another process takes a widely varying amount of time between operating systems, but on any platform it is very slow relative to invoking a function."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:517
#, priority:100
-msgid "By default The BFG takes full advantage of multi-core machines, cleansing commit file-trees in parallel. git-filter-branch cleans commits sequentially (i.e. in a single-threaded manner), though it _is_ possible to write filters that include their own parallelism, in the scripts executed against each commit."
+msgid "git-filter-branch itself is written in shell, which is kind of slow. This is the one performance issue that could be backward-compatibly fixed, but compared to the above problems that are intrinsic to the design of git-filter-branch, the language of the tool itself is a relatively minor issue."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:478
+#: en/git-filter-branch.txt:528
#, priority:100
-msgid "The http://rtyley.github.io/bfg-repo-cleaner/#examples[command options] are much more restrictive than git-filter branch, and dedicated just to the tasks of removing unwanted data- e.g: `--strip-blobs-bigger-than 1M`."
+msgid "Side note: Unfortunately, people tend to fixate on the written-in-shell aspect and periodically ask if git-filter-branch could be rewritten in another language to fix the performance issues. Not only does that ignore the bigger intrinsic problems with the design, it'd help less than you'd expect: if git-filter-branch itself were not shell, then the convenience functions (map(), skip_commit(), etc) and the `--setup` argument could no longer be executed once at the beginning of the program but would instead need to be prepended to every user filter (and thus re-executed with every commit)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:539
+#, priority:100
+msgid "The https://github.com/newren/git-filter-repo/[git filter-repo] tool is an alternative to git-filter-branch which does not suffer from these performance problems or the safety problems (mentioned below). For those with existing tooling which relies upon git-filter-branch, 'git repo-filter' also provides https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], a drop-in git-filter-branch replacement (with a few caveats). While filter-lamely suffers from all the same safety issues as git-filter-branch, it at least ameloriates the performance issues a little."
+msgstr ""
+
+#. type: Title -
+#: en/git-filter-branch.txt:542
+#, no-wrap, priority:100
+msgid "SAFETY"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:547
+#, priority:100
+msgid "git-filter-branch is riddled with gotchas resulting in various ways to easily corrupt repos or end up with a mess worse than what you started with:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:560
+#, priority:100
+msgid "Someone can have a set of \"working and tested filters\" which they document or provide to a coworker, who then runs them on a different OS where the same commands are not working/tested (some examples in the git-filter-branch manpage are also affected by this). BSD vs. GNU userland differences can really bite. If lucky, error messages are spewed. But just as likely, the commands either don't do the filtering requested, or silently corrupt by making some unwanted change. The unwanted change may only affect a few commits, so it's not necessarily obvious either. (The fact that problems won't necessarily be obvious means they are likely to go unnoticed until the rewritten history is in use for quite a while, at which point it's really hard to justify another flag-day for another rewrite.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:570
+#, priority:100
+msgid "Filenames with spaces are often mishandled by shell snippets since they cause problems for shell pipelines. Not everyone is familiar with find -print0, xargs -0, git-ls-files -z, etc. Even people who are familiar with these may assume such flags are not relevant because someone else renamed any such files in their repo back before the person doing the filtering joined the project. And often, even those familiar with handling arguments with spaces may not do so just because they aren't in the mindset of thinking about everything that could possibly go wrong."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:580
+#, priority:100
+msgid "Non-ascii filenames can be silently removed despite being in a desired directory. Keeping only wanted paths is often done using pipelines like `git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`. ls-files will only quote filenames if needed, so folks may not notice that one of the files didn't match the regex (at least not until it's much too late). Yes, someone who knows about core.quotePath can avoid this (unless they have other special characters like \\t, \\n, or \"), and people who use ls-files -z with something other than grep can avoid this, but that doesn't mean they will."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:586
+#, priority:100
+msgid "Similarly, when moving files around, one can find that filenames with non-ascii or special characters end up in a different directory, one that includes a double quote character. (This is technically the same issue as above with quoting, but perhaps an interesting different way that it can and has manifested as a problem.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:594
+#, priority:100
+msgid "It's far too easy to accidentally mix up old and new history. It's still possible with any tool, but git-filter-branch almost invites it. If lucky, the only downside is users getting frustrated that they don't know how to shrink their repo and remove the old stuff. If unlucky, they merge old and new history and end up with multiple \"copies\" of each commit, some of which have unwanted or sensitive files and others which don't. This comes about in multiple different ways:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:597
+#, priority:100
+msgid "the default to only doing a partial history rewrite ('--all' is not the default and few examples show it)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:599
+#, priority:100
+msgid "the fact that there's no automatic post-run cleanup"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:602
+#, priority:100
+msgid "the fact that --tag-name-filter (when used to rename tags) doesn't remove the old tags but just adds new ones with the new name"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:611
+#, priority:100
+msgid "the fact that little educational information is provided to inform users of the ramifications of a rewrite and how to avoid mixing old and new history. For example, this man page discusses how users need to understand that they need to rebase their changes for all their branches on top of new history (or delete and reclone), but that's only one of multiple concerns to consider. See the \"DISCUSSION\" section of the git filter-repo manual page for more details."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:614
+#, priority:100
+msgid "Annotated tags can be accidentally converted to lightweight tags, due to either of two issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:619
+#, priority:100
+msgid "Someone can do a history rewrite, realize they messed up, restore from the backups in refs/original/, and then redo their git-filter-branch command. (The backup in refs/original/ is not a real backup; it dereferences tags first.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:624
+#, priority:100
+msgid "Running git-filter-branch with either --tags or --all in your <rev-list options>. In order to retain annotated tags as annotated, you must use --tag-name-filter (and must not have restored from refs/original/ in a previously botched rewrite)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:629
+#, priority:100
+msgid "Any commit messages that specify an encoding will become corrupted by the rewrite; git-filter-branch ignores the encoding, takes the original bytes, and feeds it to commit-tree without telling it the proper encoding. (This happens whether or not --msg-filter is used.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:633
+#, priority:100
+msgid "Commit messages (even if they are all UTF-8) by default become corrupted due to not being updated -- any references to other commit hashes in commit messages will now refer to no-longer-extant commits."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:644
+#, priority:100
+msgid "There are no facilities for helping users find what unwanted crud they should delete, which means they are much more likely to have incomplete or partial cleanups that sometimes result in confusion and people wasting time trying to understand. (For example, folks tend to just look for big files to delete instead of big directories or extensions, and once they do so, then sometime later folks using the new repository who are going through history will notice a build artifact directory that has some files but not others, or a cache of dependencies (node_modules or similar) which couldn't have ever been functional since it's missing some files.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:647
+#, priority:100
+msgid "If --prune-empty isn't specified, then the filtering process can create hoards of confusing empty commits"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:651
+#, priority:100
+msgid "If --prune-empty is specified, then intentionally placed empty commits from before the filtering operation are also pruned instead of just pruning commits that became empty due to filtering rules."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:654
+#, ignore-ellipsis, priority:100
+msgid "If --prune empty is specified, sometimes empty commits are missed and left around anyway (a somewhat rare bug, but it happens...)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:658
+#, priority:100
+msgid "A minor issue, but users who have a goal to update all names and emails in a repository may be led to --env-filter which will only update authors and committers, missing taggers."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:664
+#, priority:100
+msgid "If the user provides a --tag-name-filter that maps multiple tags to the same name, no warning or error is provided; git-filter-branch simply overwrites each tag in some undocumented pre-defined order resulting in only one tag at the end. (A git-filter-branch regression test requires this surprising behavior.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:667
+#, priority:100
+msgid "Also, the poor performance of git-filter-branch often leads to safety issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:683
+#, priority:100
+msgid "Coming up with the correct shell snippet to do the filtering you want is sometimes difficult unless you're just doing a trivial modification such as deleting a couple files. Unfortunately, people often learn if the snippet is right or wrong by trying it out, but the rightness or wrongness can vary depending on special circumstances (spaces in filenames, non-ascii filenames, funny author names or emails, invalid timezones, presence of grafts or replace objects, etc.), meaning they may have to wait a long time, hit an error, then restart. The performance of git-filter-branch is so bad that this cycle is painful, reducing the time available to carefully re-check (to say nothing about what it does to the patience of the person doing the rewrite even if they do technically have more time available). This problem is extra compounded because errors from broken filters may not be shown for a long time and/or get lost in a sea of output. Even worse, broken filters often just result in silent incorrect rewrites."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:691
+#, priority:100
+msgid "To top it all off, even when users finally find working commands, they naturally want to share them. But they may be unaware that their repo didn't have some special cases that someone else's does. So, when someone else with a different repository runs the same commands, they get hit by the problems above. Or, the user just runs commands that really were vetted for special cases, but they run it on a different OS where it doesn't work, as noted above."
msgstr ""
#. type: Title =
@@ -23481,7 +23750,7 @@ msgid "This command is intended mostly for internal use by scripts automatically
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:64
+#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:68
#, no-wrap, priority:240
msgid "--log[=<n>]"
msgstr ""
@@ -23493,7 +23762,7 @@ msgid "In addition to branch names, populate the log message with one-line descr
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:65
+#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:69
#, ignore-same, no-wrap, priority:240
msgid "--no-log"
msgstr "--no-log"
@@ -24164,9 +24433,9 @@ msgid ""
"\t\t [--signature-file=<file>]\n"
"\t\t [-n | --numbered | -N | --no-numbered]\n"
"\t\t [--start-number <n>] [--numbered-files]\n"
-"\t\t [--in-reply-to=Message-Id] [--suffix=.<sfx>]\n"
+"\t\t [--in-reply-to=<message id>] [--suffix=.<sfx>]\n"
"\t\t [--ignore-if-in-upstream]\n"
-"\t\t [--rfc] [--subject-prefix=Subject-Prefix]\n"
+"\t\t [--rfc] [--subject-prefix=<subject prefix>]\n"
"\t\t [(--reroll-count|-v) <n>]\n"
"\t\t [--to=<email>] [--cc=<email>]\n"
"\t\t [--[no-]cover-letter] [--quiet]\n"
@@ -24215,523 +24484,524 @@ msgid "By default, each output file is numbered sequentially from 1, and uses th
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:70
+#: en/git-format-patch.txt:71
#, priority:100
-msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`."
+msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`. All directory components will be created."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:74
+#: en/git-format-patch.txt:75
#, priority:100
msgid "By default, the subject of a single patch is \"[PATCH] \" followed by the concatenation of lines from the commit message up to the first blank line (see the DISCUSSION section of linkgit:git-commit[1])."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:78
+#: en/git-format-patch.txt:79
#, priority:100
msgid "When multiple patches are output, the subject prefix will instead be \"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. To omit patch numbers from the subject, use `-N`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:83
+#: en/git-format-patch.txt:84
#, priority:100
msgid "If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a `Message-Id` header to reference."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:89
+#: en/git-format-patch.txt:90
#, fuzzy, no-wrap, priority:100
msgid "-<n>"
msgstr "<n>"
#. type: Plain text
-#: en/git-format-patch.txt:91
+#: en/git-format-patch.txt:92
#, priority:100
msgid "Prepare patches from the topmost <n> commits."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:92
+#: en/git-format-patch.txt:93
#, no-wrap, priority:100
msgid "-o <dir>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:93
+#: en/git-format-patch.txt:94
#, no-wrap, priority:100
msgid "--output-directory <dir>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:96
+#: en/git-format-patch.txt:97
#, priority:100
msgid "Use <dir> to store the resulting files, instead of the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:98 en/git-shortlog.txt:30
+#: en/git-format-patch.txt:99 en/git-shortlog.txt:30
#, ignore-same, no-wrap, priority:260
msgid "--numbered"
msgstr "--numbered"
#. type: Plain text
-#: en/git-format-patch.txt:100
+#: en/git-format-patch.txt:101
#, priority:100
msgid "Name output in '[PATCH n/m]' format, even with a single patch."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:102
+#: en/git-format-patch.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-numbered"
msgstr "--no-numbered"
#. type: Plain text
-#: en/git-format-patch.txt:104
+#: en/git-format-patch.txt:105
#, priority:100
msgid "Name output in '[PATCH]' format."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:105
+#: en/git-format-patch.txt:106
#, no-wrap, priority:100
msgid "--start-number <n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:107
+#: en/git-format-patch.txt:108
#, fuzzy, priority:100
msgid "Start numbering the patches at <n> instead of 1."
msgstr "comenzar a numerar los parches desde <n> en lugar de 1"
#. type: Labeled list
-#: en/git-format-patch.txt:108
+#: en/git-format-patch.txt:109
#, ignore-same, no-wrap, priority:100
msgid "--numbered-files"
msgstr "--numbered-files"
#. type: Plain text
-#: en/git-format-patch.txt:111
+#: en/git-format-patch.txt:112
#, priority:100
msgid "Output file names will be a simple number sequence without the default first line of the commit appended."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:113
+#: en/git-format-patch.txt:114
#, ignore-same, no-wrap, priority:100
msgid "--keep-subject"
msgstr "--keep-subject"
#. type: Plain text
-#: en/git-format-patch.txt:116
+#: en/git-format-patch.txt:117
#, priority:100
msgid "Do not strip/add '[PATCH]' from the first line of the commit log message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:122
+#: en/git-format-patch.txt:123
#, priority:100
msgid "Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:123 en/git-pack-objects.txt:59
+#: en/git-format-patch.txt:124 en/git-pack-objects.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--stdout"
msgstr "--stdout"
#. type: Plain text
-#: en/git-format-patch.txt:126
+#: en/git-format-patch.txt:127
#, priority:100
msgid "Print all commits to the standard output in mbox format, instead of creating a file for each one."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:127
+#: en/git-format-patch.txt:128
#, no-wrap, priority:100
msgid "--attach[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:131
+#: en/git-format-patch.txt:132
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: attachment`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:132
+#: en/git-format-patch.txt:133
#, ignore-same, no-wrap, priority:100
msgid "--no-attach"
msgstr "--no-attach"
#. type: Plain text
-#: en/git-format-patch.txt:135
+#: en/git-format-patch.txt:136
#, priority:100
msgid "Disable the creation of an attachment, overriding the configuration setting."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:136
+#: en/git-format-patch.txt:137
#, no-wrap, priority:100
msgid "--inline[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:140
+#: en/git-format-patch.txt:141
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: inline`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:141
+#: en/git-format-patch.txt:142
#, no-wrap, priority:100
msgid "--thread[=<style>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:142
+#: en/git-format-patch.txt:143
#, ignore-same, no-wrap, priority:100
msgid "--no-thread"
msgstr "--no-thread"
#. type: Plain text
-#: en/git-format-patch.txt:147
+#: en/git-format-patch.txt:148
#, priority:100
msgid "Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the first. Also controls generation of the `Message-Id` header to reference."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:153
+#: en/git-format-patch.txt:154
#, priority:100
msgid "The optional <style> argument can be either `shallow` or `deep`. 'shallow' threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order. 'deep' threading makes every mail a reply to the previous one."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:157
+#: en/git-format-patch.txt:158
#, priority:100
msgid "The default is `--no-thread`, unless the `format.thread` configuration is set. If `--thread` is specified without a style, it defaults to the style specified by `format.thread` if any, or else `shallow`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:161
+#: en/git-format-patch.txt:162
#, priority:100
msgid "Beware that the default for 'git send-email' is to thread emails itself. If you want `git format-patch` to take care of threading, you will want to ensure that threading is disabled for `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:162
-#, no-wrap, priority:100
-msgid "--in-reply-to=Message-Id"
-msgstr ""
+#: en/git-format-patch.txt:163
+#, fuzzy, no-wrap, priority:100
+#| msgid "--no-message-id"
+msgid "--in-reply-to=<message id>"
+msgstr "--no-message-id"
#. type: Plain text
-#: en/git-format-patch.txt:166
+#: en/git-format-patch.txt:167
#, priority:100
-msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given Message-Id, which avoids breaking threads to provide a new patch series."
+msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given <message id>, which avoids breaking threads to provide a new patch series."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:167
+#: en/git-format-patch.txt:168
#, ignore-same, no-wrap, priority:100
msgid "--ignore-if-in-upstream"
msgstr "--ignore-if-in-upstream"
#. type: Plain text
-#: en/git-format-patch.txt:173
+#: en/git-format-patch.txt:174
#, priority:100
msgid "Do not include a patch that matches a commit in <until>..<since>. This will examine all patches reachable from <since> but not from <until> and compare them with the patches being generated, and any patch that matches is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:174
+#: en/git-format-patch.txt:175
#, no-wrap, priority:100
-msgid "--subject-prefix=<Subject-Prefix>"
+msgid "--subject-prefix=<subject prefix>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:179
+#: en/git-format-patch.txt:180
#, priority:100
-msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<Subject-Prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
+msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<subject prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:180
+#: en/git-format-patch.txt:181
#, ignore-same, no-wrap, priority:100
msgid "--rfc"
msgstr "--rfc"
#. type: Plain text
-#: en/git-format-patch.txt:184
+#: en/git-format-patch.txt:185
#, priority:100
msgid "Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For Comments\"; use this when sending an experimental patch for discussion rather than application."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:185
+#: en/git-format-patch.txt:186
#, no-wrap, priority:100
msgid "-v <n>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:186
+#: en/git-format-patch.txt:187
#, no-wrap, priority:100
msgid "--reroll-count=<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:193
+#: en/git-format-patch.txt:194
#, priority:100
msgid "Mark the series as the <n>-th iteration of the topic. The output filenames have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default, but configurable via the `--subject-prefix` option) has ` v<n>` appended to it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:194
+#: en/git-format-patch.txt:195
#, no-wrap, priority:100
msgid "--to=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:199
+#: en/git-format-patch.txt:200
#, priority:100
msgid "Add a `To:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-to` discards all `To:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:200
+#: en/git-format-patch.txt:201
#, no-wrap, priority:100
msgid "--cc=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:205
+#: en/git-format-patch.txt:206
#, priority:100
msgid "Add a `Cc:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-cc` discards all `Cc:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:206
+#: en/git-format-patch.txt:207
#, ignore-same, no-wrap, priority:100
msgid "--from"
msgstr "--from"
#. type: Labeled list
-#: en/git-format-patch.txt:207
+#: en/git-format-patch.txt:208
#, no-wrap, priority:100
msgid "--from=<ident>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:213
+#: en/git-format-patch.txt:214
#, priority:100
msgid "Use `ident` in the `From:` header of each commit email. If the author ident of the commit is not textually identical to the provided `ident`, place a `From:` header in the body of the message with the original author. If no `ident` is given, use the committer ident."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:220
+#: en/git-format-patch.txt:221
#, priority:100
msgid "Note that this option is only useful if you are actually sending the emails and want to identify yourself as the sender, but retain the original author (and `git am` will correctly pick up the in-body header). Note also that `git send-email` already handles this transformation for you, and this option should not be used if you are feeding the result to `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:221
+#: en/git-format-patch.txt:222
#, no-wrap, priority:100
msgid "--add-header=<header>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:228
+#: en/git-format-patch.txt:229
#, priority:100
msgid "Add an arbitrary header to the email headers. This is in addition to any configured headers, and may be used multiple times. For example, `--add-header=\"Organization: git-foo\"`. The negated form `--no-add-header` discards *all* (`To:`, `Cc:`, and custom) headers added so far from config or command line."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:229
+#: en/git-format-patch.txt:230
#, ignore-same, no-wrap, priority:100
msgid "--[no-]cover-letter"
msgstr "--[no-]cover-letter"
#. type: Plain text
-#: en/git-format-patch.txt:233
+#: en/git-format-patch.txt:234
#, priority:100
msgid "In addition to the patches, generate a cover letter file containing the branch description, shortlog and the overall diffstat. You can fill in a description in the file before sending it out."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:234
+#: en/git-format-patch.txt:235
#, no-wrap, priority:100
msgid "--interdiff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:242
+#: en/git-format-patch.txt:243
#, priority:100
msgid "As a reviewer aid, insert an interdiff into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` is a single revision naming the tip of the previous series which shares a common base with the series being formatted (for example `git format-patch --cover-letter --interdiff=feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:243
+#: en/git-format-patch.txt:244
#, no-wrap, priority:100
msgid "--range-diff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:254
+#: en/git-format-patch.txt:255
#, priority:100
msgid "As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1]) into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` can be a single revision naming the tip of the previous series if it shares a common base with the series being formatted (for example `git format-patch --cover-letter --range-diff=feature/v1 -3 feature/v2`), or a revision range if the two versions of the series are disjoint (for example `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:259
+#: en/git-format-patch.txt:260
#, priority:100
msgid "Note that diff options passed to the command affect how the primary product of `format-patch` is generated, and they are not passed to the underlying `range-diff` machinery used to generate the cover-letter material (this may change in the future)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:260
+#: en/git-format-patch.txt:261
#, no-wrap, priority:100
msgid "--creation-factor=<percent>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:265
+#: en/git-format-patch.txt:266
#, priority:100
msgid "Used with `--range-diff`, tweak the heuristic which matches up commits between the previous and current series of patches by adjusting the creation/deletion cost fudge factor. See linkgit:git-range-diff[1]) for details."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:266
+#: en/git-format-patch.txt:267
#, no-wrap, priority:100
msgid "--notes[=<ref>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:267 en/pretty-options.txt:81
+#: en/git-format-patch.txt:268 en/pretty-options.txt:81
#, ignore-same, no-wrap, priority:260
msgid "--no-notes"
msgstr "--no-notes"
#. type: Plain text
-#: en/git-format-patch.txt:270
+#: en/git-format-patch.txt:271
#, priority:100
msgid "Append the notes (see linkgit:git-notes[1]) for the commit after the three-dash line."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:278
+#: en/git-format-patch.txt:279
#, priority:100
msgid "The expected use case of this is to write supporting explanation for the commit that does not belong to the commit log message proper, and include it with the patch submission. While one can simply write these explanations after `format-patch` has run but before sending, keeping them as Git notes allows them to be maintained between versions of the patch series (but see the discussion of the `notes.rewrite` configuration options in linkgit:git-notes[1] to use this workflow)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:281
+#: en/git-format-patch.txt:282
#, priority:100
msgid "The default is `--no-notes`, unless the `format.notes` configuration is set."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:282
+#: en/git-format-patch.txt:283
#, no-wrap, priority:100
msgid "--[no-]signature=<signature>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:287
+#: en/git-format-patch.txt:288
#, priority:100
msgid "Add a signature to each message produced. Per RFC 3676 the signature is separated from the body by a line with '-- ' on it. If the signature option is omitted the signature defaults to the Git version number."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:288
+#: en/git-format-patch.txt:289
#, no-wrap, priority:100
msgid "--signature-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:290
+#: en/git-format-patch.txt:291
#, priority:100
msgid "Works just like --signature except the signature is read from a file."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:291
+#: en/git-format-patch.txt:292
#, no-wrap, priority:100
msgid "--suffix=.<sfx>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:296
+#: en/git-format-patch.txt:297
#, priority:100
msgid "Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is `--suffix=.txt`. Leaving this empty will remove the `.patch` suffix."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:299
+#: en/git-format-patch.txt:300
#, priority:100
msgid "Note that the leading character does not have to be a dot; for example, you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:303
+#: en/git-format-patch.txt:304
#, priority:100
msgid "Do not print the names of the generated files to standard output."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:304
+#: en/git-format-patch.txt:305
#, ignore-same, no-wrap, priority:100
msgid "--no-binary"
msgstr "--no-binary"
#. type: Plain text
-#: en/git-format-patch.txt:309
+#: en/git-format-patch.txt:310
#, priority:100
msgid "Do not output contents of changes in binary files, instead display a notice that those files changed. Patches generated using this option cannot be applied properly, but they are still useful for code review."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:310
+#: en/git-format-patch.txt:311
#, ignore-same, no-wrap, priority:100
msgid "--zero-commit"
msgstr "--zero-commit"
#. type: Plain text
-#: en/git-format-patch.txt:313
+#: en/git-format-patch.txt:314
#, priority:100
msgid "Output an all-zero hash in each patch's From header instead of the hash of the commit."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:314
+#: en/git-format-patch.txt:315
#, no-wrap, priority:100
msgid "--base=<commit>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:318
+#: en/git-format-patch.txt:320
#, priority:100
-msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details."
+msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details. If <commit> is \"auto\", a base commit is automatically chosen."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:325
+#: en/git-format-patch.txt:327
#, priority:100
msgid "Treat the revision argument as a <revision range>, even if it is just a single commit (that would normally be treated as a <since>). Note that root commits included in the specified range are always formatted as creation patches, independently of this flag."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:328
+#: en/git-format-patch.txt:330
#, priority:100
msgid "Show progress reports on stderr as patches are generated."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:335
+#: en/git-format-patch.txt:338
#, priority:100
-msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To\" or \"Cc:\" headers, configure attachments, and sign off patches with configuration variables."
+msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To:\" or \"Cc:\" headers, configure attachments, change the patch output directory, and sign off patches with configuration variables."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:347
+#: en/git-format-patch.txt:351
#, no-wrap, priority:100
msgid ""
"[format]\n"
@@ -24743,17 +25013,18 @@ msgid ""
"\tcc = <email>\n"
"\tattach [ = mime-boundary-string ]\n"
"\tsignOff = true\n"
-"\tcoverletter = auto\n"
+"\toutputDirectory = <directory>\n"
+"\tcoverLetter = auto\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:356
+#: en/git-format-patch.txt:360
#, priority:100
msgid "The patch produced by 'git format-patch' is in UNIX mailbox format, with a fixed \"magic\" time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:366
+#: en/git-format-patch.txt:370
#, no-wrap, priority:100
msgid ""
"From 8f72bad1baf19a53459661343e21d6491c3908d3 Mon Sep 17 00:00:00 2001\n"
@@ -24767,7 +25038,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:369
+#: en/git-format-patch.txt:373
#, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -24775,7 +25046,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:372
+#: en/git-format-patch.txt:376
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"Do the same for ia64 so we can have sleek & trim looking\n"
@@ -24783,19 +25054,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:380
+#: en/git-format-patch.txt:384
#, ignore-ellipsis, priority:100
msgid "Typically it will be placed in a MUA's drafts folder, edited to add timely commentary that should not go in the changelog after the three dashes, and then sent as a message whose body, in our example, starts with \"arch/arm config files were...\". On the receiving end, readers can save interesting patches in a UNIX mailbox and apply them with linkgit:git-am[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:386
+#: en/git-format-patch.txt:390
#, priority:100
msgid "When a patch is part of an ongoing discussion, the patch generated by 'git format-patch' can be tweaked to take advantage of the 'git am --scissors' feature. After your response to the discussion comes a line that consists solely of \"`-- >8 --`\" (scissors and perforation), followed by the patch with unnecessary header fields removed:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:390
+#: en/git-format-patch.txt:394
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"...\n"
@@ -24803,13 +25074,13 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:392
+#: en/git-format-patch.txt:396
#, no-wrap, priority:100
msgid "Makes sense to me. How about this patch?\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:395
+#: en/git-format-patch.txt:399
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
@@ -24817,7 +25088,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:398
+#: en/git-format-patch.txt:402
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -24825,61 +25096,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:406
+#: en/git-format-patch.txt:410
#, priority:100
msgid "When sending a patch this way, most often you are sending your own patch, so in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit `From:` and `Date:` lines from the patch file. The patch title is likely to be different from the subject of the discussion the patch is in response to, so it is likely that you would want to keep the Subject: line, like the example above."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:408
+#: en/git-format-patch.txt:412
#, no-wrap, priority:100
msgid "Checking for patch corruption"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:411
+#: en/git-format-patch.txt:415
#, priority:100
msgid "Many mailers if not set up properly will corrupt whitespace. Here are two common types of corruption:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:413
+#: en/git-format-patch.txt:417
#, priority:100
msgid "Empty context lines that do not have _any_ whitespace."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:416
+#: en/git-format-patch.txt:420
#, priority:100
msgid "Non-empty context lines that have one extra whitespace at the beginning."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:418
+#: en/git-format-patch.txt:422
#, priority:100
msgid "One way to test if your MUA is set up correctly is:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:422
+#: en/git-format-patch.txt:426
#, priority:100
msgid "Send the patch to yourself, exactly the way you would, except with To: and Cc: lines that do not contain the list and maintainer address."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:425
+#: en/git-format-patch.txt:429
#, priority:100
msgid "Save that patch to a file in UNIX mailbox format. Call it a.patch, say."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:427
+#: en/git-format-patch.txt:431
#, priority:100
msgid "Apply it:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:432
+#: en/git-format-patch.txt:436
#, no-wrap, priority:100
msgid ""
"$ git fetch <project> master:test-apply\n"
@@ -24889,175 +25160,175 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:434
+#: en/git-format-patch.txt:438
#, priority:100
msgid "If it does not apply correctly, there can be various reasons."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:439
+#: en/git-format-patch.txt:443
#, priority:100
msgid "The patch itself does not apply cleanly. That is _bad_ but does not have much to do with your MUA. You might want to rebase the patch with linkgit:git-rebase[1] before regenerating it in this case."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:444
+#: en/git-format-patch.txt:448
#, priority:100
msgid "The MUA corrupted your patch; \"am\" would complain that the patch does not apply. Look in the .git/rebase-apply/ subdirectory and see what 'patch' file contains and check for the common corruption patterns mentioned above."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:452
+#: en/git-format-patch.txt:456
#, priority:100
msgid "While at it, check the 'info' and 'final-commit' files as well. If what is in 'final-commit' is not exactly what you would want to see in the commit log message, it is very likely that the receiver would end up hand editing the log message when applying your patch. Things like \"Hi, this is my first patch.\\n\" in the patch e-mail should come after the three-dash line that signals the end of the commit message."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:454
+#: en/git-format-patch.txt:458
#, no-wrap, priority:100
msgid "MUA-SPECIFIC HINTS"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:457
+#: en/git-format-patch.txt:461
#, priority:100
msgid "Here are some hints on how to successfully submit patches inline using various mailers."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:459
+#: en/git-format-patch.txt:463
#, no-wrap, priority:100
msgid "GMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:465
+#: en/git-format-patch.txt:469
#, priority:100
msgid "GMail does not have any way to turn off line wrapping in the web interface, so it will mangle any emails that you send. You can however use \"git send-email\" and send your patches through the GMail SMTP server, or use any IMAP email client to connect to the google IMAP server and forward the emails through that."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:468
+#: en/git-format-patch.txt:472
#, priority:100
msgid "For hints on using 'git send-email' to send your patches through the GMail SMTP server, see the EXAMPLE section of linkgit:git-send-email[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:471
+#: en/git-format-patch.txt:475
#, priority:100
msgid "For hints on submission using the IMAP interface, see the EXAMPLE section of linkgit:git-imap-send[1]."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:473
+#: en/git-format-patch.txt:477
#, no-wrap, priority:100
msgid "Thunderbird"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:477
+#: en/git-format-patch.txt:481
#, priority:100
msgid "By default, Thunderbird will both wrap emails as well as flag them as being 'format=flowed', both of which will make the resulting email unusable by Git."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:481
+#: en/git-format-patch.txt:485
#, priority:100
msgid "There are three different approaches: use an add-on to turn off line wraps, configure Thunderbird to not mangle patches, or use an external editor to keep Thunderbird from mangling the patches."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:483
+#: en/git-format-patch.txt:487
#, no-wrap, priority:100
msgid "Approach #1 (add-on)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:491
+#: en/git-format-patch.txt:495
#, priority:100
msgid "Install the Toggle Word Wrap add-on that is available from https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you can tick off. Now you can compose the message as you otherwise do (cut + paste, 'git format-patch' | 'git imap-send', etc), but you have to insert line breaks manually in any text that you type."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:493
+#: en/git-format-patch.txt:497
#, no-wrap, priority:100
msgid "Approach #2 (configuration)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:495
+#: en/git-format-patch.txt:499
#, priority:100
msgid "Three steps:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:499
+#: en/git-format-patch.txt:503
#, ignore-ellipsis, priority:100
msgid "Configure your mail server composition as plain text: Edit...Account Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:501
+#: en/git-format-patch.txt:505
#, priority:100
msgid "Configure your general composition window to not wrap."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:504
+#: en/git-format-patch.txt:508
#, priority:100
msgid "In Thunderbird 2: Edit..Preferences..Composition, wrap plain text messages at 0"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:510
+#: en/git-format-patch.txt:514
#, priority:100
msgid "In Thunderbird 3: Edit..Preferences..Advanced..Config Editor. Search for \"mail.wrap_long_lines\". Toggle it to make sure it is set to `false`. Also, search for \"mailnews.wraplength\" and set the value to 0."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:515
+#: en/git-format-patch.txt:519
#, priority:100
msgid "Disable the use of format=flowed: Edit..Preferences..Advanced..Config Editor. Search for \"mailnews.send_plaintext_flowed\". Toggle it to make sure it is set to `false`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:519
+#: en/git-format-patch.txt:523
#, priority:100
msgid "After that is done, you should be able to compose email as you otherwise would (cut + paste, 'git format-patch' | 'git imap-send', etc), and the patches will not be mangled."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:521
+#: en/git-format-patch.txt:525
#, no-wrap, priority:100
msgid "Approach #3 (external editor)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:526
+#: en/git-format-patch.txt:530
#, priority:100
msgid "The following Thunderbird extensions are needed: AboutConfig from http://aboutconfig.mozdev.org/ and External Editor from http://globs.org/articles.php?lng=en&pg=8"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:528
+#: en/git-format-patch.txt:532
#, priority:100
msgid "Prepare the patch as a text file using your method of choice."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:533
+#: en/git-format-patch.txt:537
#, priority:100
msgid "Before opening a compose window, use Edit->Account Settings to uncheck the \"Compose messages in HTML format\" setting in the \"Composition & Addressing\" panel of the account to be used to send the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:537
+#: en/git-format-patch.txt:541
#, priority:100
msgid "In the main Thunderbird window, 'before' you open the compose window for the patch, use Tools->about:config to set the following to the indicated values:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:541
+#: en/git-format-patch.txt:545
#, no-wrap, priority:100
msgid ""
"\tmailnews.send_plaintext_flowed => false\n"
@@ -25065,25 +25336,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:544
+#: en/git-format-patch.txt:548
#, priority:100
msgid "Open a compose window and click the external editor icon."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:547
+#: en/git-format-patch.txt:551
#, priority:100
msgid "In the external editor window, read in the patch file and exit the editor normally."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:550
+#: en/git-format-patch.txt:554
#, priority:100
msgid "Side note: it may be possible to do step 2 with about:config and the following settings but no one's tried yet."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:555
+#: en/git-format-patch.txt:559
#, no-wrap, priority:100
msgid ""
"\tmail.html_compose => false\n"
@@ -25092,91 +25363,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:560
+#: en/git-format-patch.txt:564
#, priority:100
msgid "There is a script in contrib/thunderbird-patch-inline which can help you include patches with Thunderbird in an easy way. To use it, do the steps above and then use the script as the external editor."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:562
+#: en/git-format-patch.txt:566
#, no-wrap, priority:100
msgid "KMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:564
+#: en/git-format-patch.txt:568
#, priority:100
msgid "This should help you to submit patches inline using KMail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:566
+#: en/git-format-patch.txt:570
#, priority:100
msgid "Prepare the patch as a text file."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:568
+#: en/git-format-patch.txt:572
#, priority:100
msgid "Click on New Mail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:571
+#: en/git-format-patch.txt:575
#, priority:100
msgid "Go under \"Options\" in the Composer window and be sure that \"Word wrap\" is not set."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:573
+#: en/git-format-patch.txt:577
#, ignore-ellipsis, priority:100
msgid "Use Message -> Insert file... and insert the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:576
+#: en/git-format-patch.txt:580
#, priority:100
msgid "Back in the compose window: add whatever other text you wish to the message, complete the addressing and subject fields, and press send."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:578
+#: en/git-format-patch.txt:582
#, no-wrap, priority:100
msgid "BASE TREE INFORMATION"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:587
+#: en/git-format-patch.txt:591
#, priority:100
msgid "The base tree information block is used for maintainers or third party testers to know the exact state the patch series applies to. It consists of the 'base commit', which is a well-known commit that is part of the stable part of the project history everybody else works off of, and zero or more 'prerequisite patches', which are well-known patches in flight that is not yet part of the 'base commit' that need to be applied on top of 'base commit' in topological order before the patches can be applied."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:593
+#: en/git-format-patch.txt:597
#, priority:100
msgid "The 'base commit' is shown as \"base-commit: \" followed by the 40-hex of the commit object name. A 'prerequisite patch' is shown as \"prerequisite-patch-id: \" followed by the 40-hex 'patch id', which can be obtained by passing the patch through the `git patch-id --stable` command."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:597
+#: en/git-format-patch.txt:601
#, priority:100
msgid "Imagine that on top of the public commit P, you applied well-known patches X, Y and Z from somebody else, and then built your three-patch series A, B, C, the history would be like:"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:600
+#: en/git-format-patch.txt:604
#, no-wrap, priority:100
msgid "---P---X---Y---Z---A---B---C\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:607
+#: en/git-format-patch.txt:611
#, priority:100
msgid "With `git format-patch --base=P -3 C` (or variants thereof, e.g. with `--cover-letter` or using `Z..C` instead of `-3 C` to specify the range), the base tree information block is shown at the end of the first message the command outputs (either the first patch, or the cover letter), like this:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:613
+#: en/git-format-patch.txt:617
#, no-wrap, priority:100
msgid ""
"base-commit: P\n"
@@ -25186,13 +25457,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:616
+#: en/git-format-patch.txt:620
#, priority:100
msgid "For non-linear topology, such as"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:621
+#: en/git-format-patch.txt:625
#, no-wrap, priority:100
msgid ""
"---P---X---A---M---C\n"
@@ -25201,91 +25472,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:626
+#: en/git-format-patch.txt:630
#, priority:100
msgid "You can also use `git format-patch --base=P -3 C` to generate patches for A, B and C, and the identifiers for P, X, Y, Z are appended at the end of the first message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:632
+#: en/git-format-patch.txt:636
#, priority:100
msgid "If set `--base=auto` in cmdline, it will track base commit automatically, the base commit will be the merge base of tip commit of the remote-tracking branch and revision-range specified in cmdline. For a local branch, you need to track a remote branch by `git branch --set-upstream-to` before using this option."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:638
+#: en/git-format-patch.txt:642
#, priority:100
msgid "Extract commits between revisions R1 and R2, and apply them on top of the current branch using 'git am' to cherry-pick them:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:641
+#: en/git-format-patch.txt:645
#, no-wrap, priority:100
msgid "$ git format-patch -k --stdout R1..R2 | git am -3 -k\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:645
+#: en/git-format-patch.txt:649
#, priority:100
msgid "Extract all commits which are in the current branch but not in the origin branch:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:648
+#: en/git-format-patch.txt:652
#, no-wrap, priority:100
msgid "$ git format-patch origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:651
+#: en/git-format-patch.txt:655
#, priority:100
msgid "For each commit a separate file is created in the current directory."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:654
+#: en/git-format-patch.txt:658
#, priority:100
msgid "Extract all commits that lead to 'origin' since the inception of the project:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:657
+#: en/git-format-patch.txt:661
#, no-wrap, priority:100
msgid "$ git format-patch --root origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:660
+#: en/git-format-patch.txt:664
#, priority:100
msgid "The same as the previous one:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:663
+#: en/git-format-patch.txt:667
#, no-wrap, priority:100
msgid "$ git format-patch -M -B origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:670
+#: en/git-format-patch.txt:674
#, priority:100
msgid "Additionally, it detects and handles renames and complete rewrites intelligently to produce a renaming patch. A renaming patch reduces the amount of text output, and generally makes it easier to review. Note that non-Git \"patch\" programs won't understand renaming patches, so use it only when you know the recipient uses Git to apply your patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:673
+#: en/git-format-patch.txt:677
#, priority:100
msgid "Extract three topmost commits from the current branch and format them as e-mailable patches:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:676
+#: en/git-format-patch.txt:680
#, no-wrap, priority:100
msgid "$ git format-patch -3\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:681
+#: en/git-format-patch.txt:685
#, ignore-same, priority:100
msgid "linkgit:git-am[1], linkgit:git-send-email[1]"
msgstr "linkgit:git-am[1], linkgit:git-send-email[1]"
@@ -25781,43 +26052,43 @@ msgid "The below documentation is the same as what's found in linkgit:git-config
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:127
+#: en/git-gc.txt:126
#, priority:100
-msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, refs saved by 'git filter-branch' in refs/original/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
+msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, notes saved by 'git notes' under refs/notes/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:134
+#: en/git-gc.txt:133
#, priority:100
msgid "On the other hand, when 'git gc' runs concurrently with another process, there is a risk of it deleting an object that the other process is using but hasn't created a reference to. This may just cause the other process to fail or may corrupt the repository if the other process later adds a reference to the deleted object. Git has two features that significantly mitigate this problem:"
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:137
+#: en/git-gc.txt:136
#, priority:100
msgid "Any object with modification time newer than the `--prune` date is kept, along with everything reachable from it."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:141
+#: en/git-gc.txt:140
#, priority:100
msgid "Most operations that add an object to the database update the modification time of the object if it is already present so that #1 applies."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:145
+#: en/git-gc.txt:144
#, priority:100
msgid "However, these features fall short of a complete solution, so users who run commands concurrently have to live with some risk of corruption (which seems to be low in practice)."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:151
+#: en/git-gc.txt:150
#, priority:100
msgid "The 'git gc --auto' command will run the 'pre-auto-gc' hook. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:159
+#: en/git-gc.txt:158
#, ignore-same, priority:100
msgid "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
msgstr "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
@@ -26083,7 +26354,7 @@ msgid "For each <pathspec> given on command line, descend at most <depth> levels
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:399
+#: en/git-grep.txt:128 en/git-submodule.txt:400
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
@@ -26299,7 +26570,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:951
+#: en/git-grep.txt:217 en/rev-list-options.txt:967
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -26449,127 +26720,151 @@ msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:280
+#: en/git-grep.txt:277
+#, priority:100
+msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:282
+#, priority:100
+msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:287
+#, priority:100
+msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:291
+#, priority:100
+msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:297
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:281
+#: en/git-grep.txt:298
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:282
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:283 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:284
+#: en/git-grep.txt:301
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:289
+#: en/git-grep.txt:306
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:290 en/rev-list-options.txt:65
+#: en/git-grep.txt:307 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:294
+#: en/git-grep.txt:311
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:299
+#: en/git-grep.txt:316
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:300
+#: en/git-grep.txt:317
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:303
+#: en/git-grep.txt:320
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:307
+#: en/git-grep.txt:324
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:328
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:318
+#: en/git-grep.txt:335
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:321
+#: en/git-grep.txt:338
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:322
+#: en/git-grep.txt:339
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:325
+#: en/git-grep.txt:342
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:326
+#: en/git-grep.txt:343
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:329
+#: en/git-grep.txt:346
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:330
+#: en/git-grep.txt:347
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:332
+#: en/git-grep.txt:349
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
@@ -26787,25 +27082,13 @@ msgstr ""
#. type: Plain text
#: en/git-gui.txt:116
#, priority:100
-msgid "A 'git gui' development repository can be obtained from:"
+msgid "The official repository of the 'git gui' project can be found at:"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:118
#, no-wrap, priority:100
-msgid " git clone git://repo.or.cz/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:122
-#, no-wrap, priority:100
-msgid " git clone http://repo.or.cz/r/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:124
-#, priority:100
-msgid "or browsed online at http://repo.or.cz/w/git-gui.git/[]."
+msgid " https://github.com/prati0100/git-gui.git/\n"
msgstr ""
#. type: Title =
@@ -30420,29 +30703,29 @@ msgstr ""
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
-#. type: Plain text
-#: en/git-ls-remote.txt:110
+#. type: delimited block -
+#: en/git-ls-remote.txt:111
#, no-wrap, priority:100
msgid ""
-"\t$ git ls-remote --tags ./.\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"\t$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
-"\t5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"\tc781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
-"\t$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
-"\t$ git ls-remote --tags korg v\\*\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"$ git ls-remote --tags ./.\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
+"$ git ls-remote --tags korg v\\*\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:114
+#: en/git-ls-remote.txt:116
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -30950,7 +31233,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:358
+#: en/git-merge-base.txt:60 en/git-rebase.txt:376
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -30979,235 +31262,235 @@ msgstr ""
msgid "For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:86
+#. type: delimited block .
+#: en/git-merge-base.txt:87
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---B\n"
-"\t /\n"
-"\t---o---1---o---o---o---A\n"
+"\t o---o---o---B\n"
+"\t/\n"
+"---o---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:88
+#: en/git-merge-base.txt:90
#, priority:100
msgid "the merge base between 'A' and 'B' is '1'."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:92
+#: en/git-merge-base.txt:94
#, priority:100
msgid "Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the merge base between 'A' and a hypothetical commit 'M', which is a merge between 'B' and 'C'. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:98
+#. type: delimited block .
+#: en/git-merge-base.txt:101
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---C\n"
-"\t /\n"
-"\t / o---o---o---B\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---C\n"
+" /\n"
+" / o---o---o---B\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:101
+#: en/git-merge-base.txt:105
#, priority:100
msgid "the result of `git merge-base A B C` is '1'. This is because the equivalent topology with a merge commit 'M' between 'B' and 'C' is:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:108
+#. type: delimited block .
+#: en/git-merge-base.txt:113
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---o\n"
-"\t / \\\n"
-"\t / o---o---o---o---M\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---o\n"
+" / \\\n"
+" / o---o---o---o---M\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:112
+#: en/git-merge-base.txt:118
#, priority:100
msgid "and the result of `git merge-base A M` is '1'. Commit '2' is also a common ancestor between 'A' and 'M', but '1' is a better common ancestor, because '2' is an ancestor of '1'. Hence, '2' is not a merge base."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:115
+#: en/git-merge-base.txt:121
#, priority:100
msgid "The result of `git merge-base --octopus A B C` is '2', because '2' is the best common ancestor of all commits."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:118
+#: en/git-merge-base.txt:124
#, priority:100
msgid "When the history involves criss-cross merges, there can be more than one 'best' common ancestor for two commits. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:124
+#. type: delimited block .
+#: en/git-merge-base.txt:131
#, no-wrap, priority:100
msgid ""
-"\t---1---o---A\n"
-"\t \\ /\n"
-"\t X\n"
-"\t / \\\n"
-"\t---2---o---o---B\n"
+"---1---o---A\n"
+" \\ /\n"
+" X\n"
+" / \\\n"
+"---2---o---o---B\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:128
+#: en/git-merge-base.txt:136
#, priority:100
msgid "both '1' and '2' are merge-bases of A and B. Neither one is better than the other (both are 'best' merge bases). When the `--all` option is not given, it is unspecified which best one is output."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:133
+#: en/git-merge-base.txt:141
#, priority:100
msgid "A common idiom to check \"fast-forward-ness\" between two commits A and B is (or at least used to be) to compute the merge base between A and B, and check if it is the same as A, in which case, A is an ancestor of B. You will see this idiom used often in older scripts."
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:139
+#. type: delimited block .
+#: en/git-merge-base.txt:148
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tA=$(git rev-parse --verify A)\n"
-"\tif test \"$A\" = \"$(git merge-base A B)\"\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"A=$(git rev-parse --verify A)\n"
+"if test \"$A\" = \"$(git merge-base A B)\"\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:141
+#: en/git-merge-base.txt:151
#, priority:100
msgid "In modern git, you can say this in a more direct way:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:146
+#. type: delimited block .
+#: en/git-merge-base.txt:157
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tif git merge-base --is-ancestor A B\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"if git merge-base --is-ancestor A B\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:148
+#: en/git-merge-base.txt:160
#, priority:100
msgid "instead."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:150
+#: en/git-merge-base.txt:162
#, no-wrap, priority:100
msgid "Discussion on fork-point mode"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:156
+#: en/git-merge-base.txt:168
#, priority:100
msgid "After working on the `topic` branch created with `git switch -c topic origin/master`, the history of remote-tracking branch `origin/master` may have been rewound and rebuilt, leading to a history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:164
+#. type: delimited block .
+#: en/git-merge-base.txt:177
#, no-wrap, priority:100
msgid ""
-"\t o---B2\n"
-"\t /\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t \\\n"
-"\t B0\n"
-"\t \\\n"
-"\t D0---D1---D (topic)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\\n"
+"\t B0\n"
+"\t \\\n"
+"\t D0---D1---D (topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:170
+#: en/git-merge-base.txt:184
#, priority:100
msgid "where `origin/master` used to point at commits B0, B1, B2 and now it points at B, and your `topic` branch was started on top of it back when `origin/master` was at B0, and you built three commits, D0, D1, and D, on top of it. Imagine that you now want to rebase the work you did on the topic on top of the updated origin/master."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:176
+#: en/git-merge-base.txt:190
#, priority:100
msgid "In such a case, `git merge-base origin/master topic` would return the parent of B0 in the above picture, but B0^..D is *not* the range of commits you would want to replay on top of B (it includes B0, which is not what you wrote; it is a commit the other side discarded when it moved its tip from B0 to B1)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:184
+#: en/git-merge-base.txt:198
#, priority:100
msgid "`git merge-base --fork-point origin/master topic` is designed to help in such a case. It takes not only B but also B0, B1, and B2 (i.e. old tips of the remote-tracking branches your repository's reflog knows about) into account to see on which commit your topic branch was built and finds B0, allowing you to replay only the commits on your topic, excluding the commits the other side later discarded."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:186
+#: en/git-merge-base.txt:200
#, priority:100
msgid "Hence"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:188
+#: en/git-merge-base.txt:202
#, no-wrap, priority:100
msgid " $ fork_point=$(git merge-base --fork-point origin/master topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:190
+#: en/git-merge-base.txt:204
#, priority:100
msgid "will find B0, and"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:192
+#: en/git-merge-base.txt:206
#, no-wrap, priority:100
msgid " $ git rebase --onto origin/master $fork_point topic\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:195
+#: en/git-merge-base.txt:209
#, priority:100
msgid "will replay D0, D1 and D on top of B to create a new history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:203
+#. type: delimited block .
+#: en/git-merge-base.txt:218
#, no-wrap, priority:100
msgid ""
-"\t\t\t o---B2\n"
-"\t\t\t/\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t\t\\ \\\n"
-"\t\t B0 D0'--D1'--D' (topic - updated)\n"
-"\t\t \\\n"
-"\t\t D0---D1---D (topic - old)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\ \\\n"
+"\t B0 D0'--D1'--D' (topic - updated)\n"
+"\t \\\n"
+"\t D0---D1---D (topic - old)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:210
+#: en/git-merge-base.txt:226
#, priority:100
msgid "A caveat is that older reflog entries in your repository may be expired by `git gc`. If B0 no longer appears in the reflog of the remote-tracking branch `origin/master`, the `--fork-point` mode obviously cannot find it and fails, avoiding to give a random and useless result (such as the parent of B0, like the same command without the `--fork-point` option gives)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:221
+#: en/git-merge-base.txt:237
#, priority:100
msgid "Also, the remote-tracking branch you use the `--fork-point` mode with must be the one your topic forked from its tip. If you forked from an older commit than the tip, this mode would not find the fork point (imagine in the above sample history B0 did not exist, origin/master started at B1, moved to B2 and then B, and you forked your topic at origin/master^ when origin/master was B1; the shape of the history would be the same as above, without B0, and the parent of B1 is what `git merge-base origin/master topic` correctly finds, but the `--fork-point` mode will not, because it is not one of the commits that used to be at the tip of origin/master)."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:224
+#: en/git-merge-base.txt:240
#, no-wrap, priority:100
msgid "See also"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:228
+#: en/git-merge-base.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
msgstr "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
@@ -31418,31 +31701,31 @@ msgstr ""
msgid "Examples:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:62
+#. type: delimited block -
+#: en/git-merge-index.txt:63
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
-" This is MM from the original tree.\t\t\t# original\n"
-" This is modified MM in the branch A.\t\t\t# merge1\n"
-" This is modified MM in the branch B.\t\t\t# merge2\n"
-" This is modified MM in the branch B.\t\t\t# current contents\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
+"This is MM from the original tree.\t\t# original\n"
+"This is modified MM in the branch A.\t\t# merge1\n"
+"This is modified MM in the branch B.\t\t# merge2\n"
+"This is modified MM in the branch B.\t\t# current contents\n"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:71
+#. type: delimited block -
+#: en/git-merge-index.txt:74
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
-" cat: : No such file or directory\n"
-" This is added AA in the branch A.\n"
-" This is added AA in the branch B.\n"
-" This is added AA in the branch B.\n"
-" fatal: merge program failed\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
+"cat: : No such file or directory\n"
+"This is added AA in the branch A.\n"
+"This is added AA in the branch B.\n"
+"This is added AA in the branch B.\n"
+"fatal: merge program failed\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-index.txt:76
+#: en/git-merge-index.txt:80
#, priority:100
msgid "where the latter example shows how 'git merge-index' will stop trying to merge once anything has returned an error (i.e., `cat` returned an error for the AA file, because it didn't exist in the original, and thus 'git merge-index' didn't even try to merge the MM thing)."
msgstr ""
@@ -31740,7 +32023,7 @@ msgstr "Junta dos o mas historiales de desarrollo juntos"
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n"
-"\t[-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
+"\t[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
"\t[--[no-]allow-unrelated-histories]\n"
"\t[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]\n"
"'git merge' (--continue | --abort | --quit)\n"
@@ -32821,7 +33104,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:281 en/merge-options.txt:108
+#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -33801,7 +34084,7 @@ msgid "Conflicts can occur when applying a commit to p4. When this happens, the
msgstr ""
#. type: Labeled list
-#: en/git-p4.txt:359 en/git-submodule.txt:270
+#: en/git-p4.txt:359 en/git-submodule.txt:271
#, no-wrap, priority:220
msgid "--branch <branch>"
msgstr ""
@@ -34937,7 +35220,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:263 en/rev-list-options.txt:760
+#: en/git-pack-objects.txt:263 en/rev-list-options.txt:776
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -34949,13 +35232,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:266 en/rev-list-options.txt:767
+#: en/git-pack-objects.txt:266 en/rev-list-options.txt:783
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:269 en/rev-list-options.txt:770
+#: en/git-pack-objects.txt:269 en/rev-list-options.txt:786
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -34967,7 +35250,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:276 en/rev-list-options.txt:777
+#: en/git-pack-objects.txt:276 en/rev-list-options.txt:793
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -34979,7 +35262,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:281 en/rev-list-options.txt:785
+#: en/git-pack-objects.txt:281 en/rev-list-options.txt:801
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -35738,13 +36021,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:502
+#: en/git-pull.txt:136 en/git-rebase.txt:524
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:503
+#: en/git-pull.txt:137 en/git-rebase.txt:525
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -37537,8 +37820,8 @@ msgstr "Vuelve a aplicar commits en la punta de otra rama"
#: en/git-rebase.txt:16
#, no-wrap, priority:100
msgid ""
-"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
-"\t[<upstream> [<branch>]]\n"
+"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>]\n"
+"\t[--onto <newbase> | --keep-base] [<upstream> [<branch>]]\n"
"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
"\t--root [<branch>]\n"
"'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch)\n"
@@ -37857,512 +38140,542 @@ msgstr ""
msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:220
+#, ignore-same, no-wrap, priority:100
+msgid "--keep-base"
+msgstr "--keep-base"
+
#. type: Plain text
-#: en/git-rebase.txt:224
+#: en/git-rebase.txt:225
+#, ignore-ellipsis, priority:100
+msgid "Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running 'git rebase --keep-base <upstream> <branch>' is equivalent to running 'git rebase --onto <upstream>... <upstream>'."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:230
+#, priority:100
+msgid "This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:235
+#, priority:100
+msgid "Although both this option and --fork-point find the merge base between <upstream> and <branch>, this option uses the merge base as the _starting point_ on which new commits will be created, whereas --fork-point uses the merge base to determine the _set of commits_ which will be rebased."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#, priority:100
+msgid "See also INCOMPATIBLE OPTIONS below."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:242
#, priority:100
msgid "Upstream branch to compare against. May be any valid commit, not just an existing branch name. Defaults to the configured upstream for the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:230
+#: en/git-rebase.txt:248
#, priority:100
msgid "Restart the rebasing process after having resolved a merge conflict."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237
+#: en/git-rebase.txt:255
#, priority:100
msgid "Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:242
+#: en/git-rebase.txt:260
#, priority:100
msgid "Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:243 en/git-rebase.txt:538
+#: en/git-rebase.txt:261 en/git-rebase.txt:560
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:246
+#: en/git-rebase.txt:264
#, priority:100
msgid "Keep the commits that do not change anything from its parents in the result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:248 en/git-rebase.txt:255 en/git-rebase.txt:280 en/git-rebase.txt:293 en/git-rebase.txt:302 en/git-rebase.txt:344 en/git-rebase.txt:379 en/git-rebase.txt:386 en/git-rebase.txt:393 en/git-rebase.txt:405 en/git-rebase.txt:445 en/git-rebase.txt:470 en/git-rebase.txt:482 en/git-rebase.txt:501
-#, priority:100
-msgid "See also INCOMPATIBLE OPTIONS below."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rebase.txt:253
+#: en/git-rebase.txt:271
#, priority:100
msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:258
+#: en/git-rebase.txt:276
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:259 en/git-rebase.txt:539
+#: en/git-rebase.txt:277 en/git-rebase.txt:561
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:261
+#: en/git-rebase.txt:279
#, fuzzy, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr "editar la lista de pendientes durante el rebase interactivo"
#. type: Plain text
-#: en/git-rebase.txt:266
+#: en/git-rebase.txt:284
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:272
+#: en/git-rebase.txt:290
#, priority:100
msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:278
+#: en/git-rebase.txt:296
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:286
+#: en/git-rebase.txt:304
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:291
+#: en/git-rebase.txt:309
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:294
+#: en/git-rebase.txt:312
#, fuzzy, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr "--strategy-option"
#. type: Labeled list
-#: en/git-rebase.txt:295
+#: en/git-rebase.txt:313
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:300
+#: en/git-rebase.txt:318
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:317
+#: en/git-rebase.txt:335
#, fuzzy, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr "ser silencioso implica --no-stat"
#. type: Plain text
-#: en/git-rebase.txt:321
+#: en/git-rebase.txt:339
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:325
+#: en/git-rebase.txt:343
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:329
+#: en/git-rebase.txt:347
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:332
+#: en/git-rebase.txt:350
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:333 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:336
+#: en/git-rebase.txt:354
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:345 en/merge-options.txt:47
+#: en/git-rebase.txt:363 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:346
+#: en/git-rebase.txt:364
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:351
+#: en/git-rebase.txt:369
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:357
+#: en/git-rebase.txt:375
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:359
+#: en/git-rebase.txt:377
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:363
+#: en/git-rebase.txt:381
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:387
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:372
+#: en/git-rebase.txt:390
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:394
+#, priority:100
+msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:399
#, priority:100
msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:384
+#: en/git-rebase.txt:406
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:391
+#: en/git-rebase.txt:413
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:421
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:403
+#: en/git-rebase.txt:425
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:407
+#: en/git-rebase.txt:429
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:415
+#: en/git-rebase.txt:437
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:422
+#: en/git-rebase.txt:444
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:426
+#: en/git-rebase.txt:448
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges`, but in contrast to that option works well in interactive rebases: commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:430
+#: en/git-rebase.txt:452
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:432
+#: en/git-rebase.txt:454
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:434 en/git-rebase.txt:535 en/git-svn.txt:680
+#: en/git-rebase.txt:456 en/git-rebase.txt:557 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:439
+#: en/git-rebase.txt:461
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:443
+#: en/git-rebase.txt:465
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:446
+#: en/git-rebase.txt:468
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:447
+#: en/git-rebase.txt:469
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:474
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:455
+#: en/git-rebase.txt:477
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:457
+#: en/git-rebase.txt:479
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:459
+#: en/git-rebase.txt:481
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:483
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:487
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:490
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:480
+#: en/git-rebase.txt:502
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:505
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:484
+#: en/git-rebase.txt:506
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:495
+#: en/git-rebase.txt:517
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:499
+#: en/git-rebase.txt:521
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:509
+#: en/git-rebase.txt:531
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:510
+#: en/git-rebase.txt:532
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:511
+#: en/git-rebase.txt:533
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:514
+#: en/git-rebase.txt:536
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:516
+#: en/git-rebase.txt:538
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:519
+#: en/git-rebase.txt:541
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:523
+#: en/git-rebase.txt:545
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:527
+#: en/git-rebase.txt:549
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:530
+#: en/git-rebase.txt:552
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:553
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:555
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Plain text
-#: en/git-rebase.txt:534
+#: en/git-rebase.txt:556
#, ignore-same, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:537
+#: en/git-rebase.txt:559
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:540
+#: en/git-rebase.txt:562
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:542
+#: en/git-rebase.txt:564
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:544
+#: en/git-rebase.txt:566
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:567
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:546
+#: en/git-rebase.txt:568
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:547
+#: en/git-rebase.txt:569
#, priority:100
-msgid "--rebase-merges and --strategy"
+msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:548
+#: en/git-rebase.txt:570
#, priority:100
-msgid "--rebase-merges and --strategy-option"
+msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:550
+#: en/git-rebase.txt:572
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:575
#, no-wrap, priority:100
msgid "There are some subtle differences how the backends behave.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:556
+#: en/git-rebase.txt:578
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38370,7 +38683,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:561
+#: en/git-rebase.txt:583
#, no-wrap, priority:100
msgid ""
"The am backend drops any \"empty\" commits, regardless of whether the\n"
@@ -38380,7 +38693,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:588
#, no-wrap, priority:100
msgid ""
"The interactive backend drops commits by default that\n"
@@ -38390,7 +38703,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:591
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38398,7 +38711,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:573
+#: en/git-rebase.txt:595
#, no-wrap, priority:100
msgid ""
"Directory rename heuristics are enabled in the merge and interactive\n"
@@ -38407,145 +38720,145 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:597
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:577
+#: en/git-rebase.txt:599
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:582
+#: en/git-rebase.txt:604
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:587
+#: en/git-rebase.txt:609
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:589
+#: en/git-rebase.txt:611
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:596
+#: en/git-rebase.txt:618
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:598
+#: en/git-rebase.txt:620
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:600
+#: en/git-rebase.txt:622
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:601
+#: en/git-rebase.txt:623
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:602
+#: en/git-rebase.txt:624
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:603
+#: en/git-rebase.txt:625
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:605
+#: en/git-rebase.txt:627
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:607
+#: en/git-rebase.txt:629
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:631
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:610
+#: en/git-rebase.txt:632
#, fuzzy, priority:100
msgid "commit"
msgstr "`commit`"
#. type: Plain text
-#: en/git-rebase.txt:612
+#: en/git-rebase.txt:634
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:614
+#: en/git-rebase.txt:636
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:615
+#: en/git-rebase.txt:637
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:616
+#: en/git-rebase.txt:638
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:644
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:646
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:626
+#: en/git-rebase.txt:648
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:653
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:658
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -38554,73 +38867,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:641
+#: en/git-rebase.txt:663
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:668
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:649
+#: en/git-rebase.txt:671
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:652
+#: en/git-rebase.txt:674
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:655
+#: en/git-rebase.txt:677
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:685
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:667
+#: en/git-rebase.txt:689
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:693
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:696
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:699
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:680
+#: en/git-rebase.txt:702
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:687
+#: en/git-rebase.txt:709
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -38631,25 +38944,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:691
+#: en/git-rebase.txt:713
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:694
+#: en/git-rebase.txt:716
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:701
+#: en/git-rebase.txt:723
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:710
+#: en/git-rebase.txt:732
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -38662,31 +38975,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:715
+#: en/git-rebase.txt:737
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:720
+#: en/git-rebase.txt:742
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:745
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:727
+#: en/git-rebase.txt:749
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:759
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -38700,85 +39013,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:740
+#: en/git-rebase.txt:762
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:746
+#: en/git-rebase.txt:768
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:750
+#: en/git-rebase.txt:772
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:752
+#: en/git-rebase.txt:774
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:756
+#: en/git-rebase.txt:778
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:760
+#: en/git-rebase.txt:782
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:763
+#: en/git-rebase.txt:785
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:765
+#: en/git-rebase.txt:787
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:767
+#: en/git-rebase.txt:789
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:794
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:775
+#: en/git-rebase.txt:797
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:804
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:809
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:816
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38789,13 +39102,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:819
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:826
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38806,13 +39119,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:808
+#: en/git-rebase.txt:830
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:815
+#: en/git-rebase.txt:837
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38823,73 +39136,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:822
+#: en/git-rebase.txt:844
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:824
+#: en/git-rebase.txt:846
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:825
+#: en/git-rebase.txt:847
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:829
+#: en/git-rebase.txt:851
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:836
+#: en/git-rebase.txt:859
#, priority:100
-msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or `filter-branch`."
+msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:839
+#: en/git-rebase.txt:862
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:867
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:848
+#: en/git-rebase.txt:871
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:850
+#: en/git-rebase.txt:873
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:875
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:858
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38900,19 +39213,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:885
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:866
+#: en/git-rebase.txt:889
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:894
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -38922,67 +39235,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:876
+#: en/git-rebase.txt:899
#, priority:100
-msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge-base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
+msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:880
+#: en/git-rebase.txt:903
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:883
+#: en/git-rebase.txt:906
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:886
+#: en/git-rebase.txt:909
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:888
+#: en/git-rebase.txt:911
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:893
+#: en/git-rebase.txt:916
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:895
+#: en/git-rebase.txt:918
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:926
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:907
+#: en/git-rebase.txt:930
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:912
+#: en/git-rebase.txt:935
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:922
+#: en/git-rebase.txt:945
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -38996,25 +39309,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:929
+#: en/git-rebase.txt:952
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:932
+#: en/git-rebase.txt:955
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:935 en/git-rebase.txt:1012
+#: en/git-rebase.txt:958 en/git-rebase.txt:1035
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:941
+#: en/git-rebase.txt:964
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39025,7 +39338,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:946
+#: en/git-rebase.txt:969
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39035,7 +39348,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:950
+#: en/git-rebase.txt:973
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39044,55 +39357,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:954
+#: en/git-rebase.txt:977
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:962
+#: en/git-rebase.txt:985
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:992
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:975
+#: en/git-rebase.txt:998
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:978
+#: en/git-rebase.txt:1001
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1008
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:989
+#: en/git-rebase.txt:1012
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:996
+#: en/git-rebase.txt:1019
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1003
+#: en/git-rebase.txt:1026
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39103,13 +39416,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1009
+#: en/git-rebase.txt:1032
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1015
+#: en/git-rebase.txt:1038
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39117,7 +39430,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1022
+#: en/git-rebase.txt:1045
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39129,7 +39442,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1049
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39138,37 +39451,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1035
+#: en/git-rebase.txt:1058
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1037
+#: en/git-rebase.txt:1060
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1039
+#: en/git-rebase.txt:1062
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1043
+#: en/git-rebase.txt:1066
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1068
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1072
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -39476,117 +39789,118 @@ msgstr ""
msgid "Using this hook, it is easy to generate mails describing the updates to the repository. This example script sends one mail message per ref listing the commits pushed to the repository, and logs the push certificates of signed pushes with good signatures to a logger service:"
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:191
+#. type: delimited block -
+#: en/git-receive-pack.txt:192
#, no-wrap, priority:100
msgid ""
-"\t#!/bin/sh\n"
-"\t# mail out commit update information.\n"
-"\twhile read oval nval ref\n"
-"\tdo\n"
-"\t\tif expr \"$oval\" : '0*$' >/dev/null\n"
-"\t\tthen\n"
-"\t\t\techo \"Created a new ref, with the following commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\"\n"
-"\t\telse\n"
-"\t\t\techo \"New commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
-"\t\tfi |\n"
-"\t\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
-"\tdone\n"
-"\t# log signed push certificate, if any\n"
-"\tif test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"#!/bin/sh\n"
+"# mail out commit update information.\n"
+"while read oval nval ref\n"
+"do\n"
+"\tif expr \"$oval\" : '0*$' >/dev/null\n"
"\tthen\n"
-"\t\t(\n"
-"\t\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
-"\t\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
-"\t\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
-"\tfi\n"
-"\texit 0\n"
+"\t\techo \"Created a new ref, with the following commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\"\n"
+"\telse\n"
+"\t\techo \"New commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
+"\tfi |\n"
+"\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
+"done\n"
+"# log signed push certificate, if any\n"
+"if test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"then\n"
+"\t(\n"
+"\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
+"\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
+"\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
+"fi\n"
+"exit 0\n"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:194
+#: en/git-receive-pack.txt:196
#, priority:100
msgid "The exit code from this hook invocation is ignored, however a non-zero exit code will generate an error message."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:200
+#: en/git-receive-pack.txt:202
#, priority:100
msgid "Note that it is possible for refname to not have sha1-new when this hook runs. This can easily occur if another user modifies the ref after it was updated by 'git-receive-pack', but before the hook was able to evaluate it. It is recommended that hooks rely on sha1-new rather than the current value of refname."
msgstr ""
#. type: Title -
-#: en/git-receive-pack.txt:202
+#: en/git-receive-pack.txt:204
#, no-wrap, priority:100
msgid "POST-UPDATE HOOK"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:207
+#: en/git-receive-pack.txt:209
#, priority:100
msgid "After all other processing, if at least one ref was updated, and if $GIT_DIR/hooks/post-update file exists and is executable, then post-update will be called with the list of refs that have been updated. This can be used to implement any repository wide cleanup tasks."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:211
+#: en/git-receive-pack.txt:213
#, priority:100
msgid "The exit code from this hook invocation is ignored; the only thing left for 'git-receive-pack' to do at that point is to exit itself anyway."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:214
+#: en/git-receive-pack.txt:216
#, priority:100
msgid "This hook can be used, for example, to run `git update-server-info` if the repository is packed and is served via a dumb transport."
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:217
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/git-receive-pack.txt:220
+#, fuzzy, no-wrap, priority:100
+#| msgid "git-update-server-info(1)"
msgid ""
-"\t#!/bin/sh\n"
-"\texec git update-server-info\n"
-msgstr ""
+"#!/bin/sh\n"
+"exec git update-server-info\n"
+msgstr "git-update-server-info(1)"
#. type: Title -
-#: en/git-receive-pack.txt:220
+#: en/git-receive-pack.txt:224
#, no-wrap, priority:100
msgid "QUARANTINE ENVIRONMENT"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:227
+#: en/git-receive-pack.txt:231
#, priority:100
msgid "When `receive-pack` takes in objects, they are placed into a temporary \"quarantine\" directory within the `$GIT_DIR/objects` directory and migrated into the main object store only after the `pre-receive` hook has completed. If the push fails before then, the temporary directory is removed entirely."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:229
+#: en/git-receive-pack.txt:233
#, priority:100
msgid "This has a few user-visible effects and caveats:"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:235
+#: en/git-receive-pack.txt:239
#, priority:100
msgid "Pushes which fail due to problems with the incoming pack, missing objects, or due to the `pre-receive` hook will not leave any on-disk data. This is usually helpful to prevent repeated failed pushes from filling up your disk, but can make debugging more challenging."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:238
+#: en/git-receive-pack.txt:242
#, priority:100
msgid "Any objects created by the `pre-receive` hook will be created in the quarantine directory (and migrated only if it succeeds)."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:244
+#: en/git-receive-pack.txt:248
#, priority:100
msgid "The `pre-receive` hook MUST NOT update any refs to point to quarantined objects. Other programs accessing the repository will not be able to see the objects (and if the pre-receive hook fails, those refs would become corrupted). For safety, any ref updates from within `pre-receive` are automatically rejected."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:249
+#: en/git-receive-pack.txt:253
#, ignore-same, priority:100
msgid "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
msgstr "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
@@ -40914,7 +41228,7 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:131
#, priority:100
-msgid "linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and linkgit:git-rebase[1], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
+msgid "linkgit:git-hash-object[1], linkgit:git-rebase[1], and https://github.com/newren/git-filter-repo[git-filter-repo], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
msgstr ""
#. type: Plain text
@@ -40937,9 +41251,10 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:158
-#, priority:100
-msgid "linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1]"
-msgstr ""
+#, fuzzy, priority:100
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] https://github.com/newren/git-filter-repo[git-filter-repo]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title =
#: en/git-request-pull.txt:2
@@ -41731,7 +42046,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:228 en/git-stash.txt:229
+#: en/git-reset.txt:228 en/git-stash.txt:230
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -42459,102 +42774,49 @@ msgid "git-rev-list - Lists commit objects in reverse chronological order"
msgstr "Lista objetos commit en orden cronol처gico inverso"
#. type: Plain text
-#: en/git-rev-list.txt:65
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"'git rev-list' [ --max-count=<number> ]\n"
-"\t [ --skip=<number> ]\n"
-"\t [ --max-age=<timestamp> ]\n"
-"\t [ --min-age=<timestamp> ]\n"
-"\t [ --sparse ]\n"
-"\t [ --merges ]\n"
-"\t [ --no-merges ]\n"
-"\t [ --min-parents=<number> ]\n"
-"\t [ --no-min-parents ]\n"
-"\t [ --max-parents=<number> ]\n"
-"\t [ --no-max-parents ]\n"
-"\t [ --first-parent ]\n"
-"\t [ --remove-empty ]\n"
-"\t [ --full-history ]\n"
-"\t [ --not ]\n"
-"\t [ --all ]\n"
-"\t [ --branches[=<pattern>] ]\n"
-"\t [ --tags[=<pattern>] ]\n"
-"\t [ --remotes[=<pattern>] ]\n"
-"\t [ --glob=<glob-pattern> ]\n"
-"\t [ --ignore-missing ]\n"
-"\t [ --stdin ]\n"
-"\t [ --quiet ]\n"
-"\t [ --topo-order ]\n"
-"\t [ --parents ]\n"
-"\t [ --timestamp ]\n"
-"\t [ --left-right ]\n"
-"\t [ --left-only ]\n"
-"\t [ --right-only ]\n"
-"\t [ --cherry-mark ]\n"
-"\t [ --cherry-pick ]\n"
-"\t [ --encoding=<encoding> ]\n"
-"\t [ --(author|committer|grep)=<pattern> ]\n"
-"\t [ --regexp-ignore-case | -i ]\n"
-"\t [ --extended-regexp | -E ]\n"
-"\t [ --fixed-strings | -F ]\n"
-"\t [ --date=<format>]\n"
-"\t [ [ --objects | --objects-edge | --objects-edge-aggressive ]\n"
-"\t [ --unpacked ]\n"
-"\t [ --object-names | --no-object-names ]\n"
-"\t [ --filter=<filter-spec> [ --filter-print-omitted ] ] ]\n"
-"\t [ --missing=<missing-action> ]\n"
-"\t [ --pretty | --header ]\n"
-"\t [ --bisect ]\n"
-"\t [ --bisect-vars ]\n"
-"\t [ --bisect-all ]\n"
-"\t [ --merge ]\n"
-"\t [ --reverse ]\n"
-"\t [ --walk-reflogs ]\n"
-"\t [ --no-walk ] [ --do-walk ]\n"
-"\t [ --count ]\n"
-"\t [ --use-bitmap-index ]\n"
-"\t <commit>... [ \\-- <paths>... ]\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:73
+#: en/git-rev-list.txt:13
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
+msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n"
+msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
+
+#. type: Plain text
+#: en/git-rev-list.txt:21
#, priority:100
msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:80
+#: en/git-rev-list.txt:28
#, priority:100
msgid "You can think of this as a set operation. Commits given on the command line form a set of commits that are reachable from any of them, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:82
+#: en/git-rev-list.txt:30
#, priority:100
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:85
+#: en/git-rev-list.txt:33
#, no-wrap, priority:100
msgid "\t$ git rev-list foo bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:89
+#: en/git-rev-list.txt:37
#, priority:100
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:93
+#: en/git-rev-list.txt:41
#, priority:100
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:97
+#: en/git-rev-list.txt:45
#, no-wrap, priority:100
msgid ""
"\t$ git rev-list origin..HEAD\n"
@@ -42562,13 +42824,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:102
+#: en/git-rev-list.txt:50
#, ignore-ellipsis, priority:100
msgid "Another special notation is \"'<commit1>'...'<commit2>'\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:106
+#: en/git-rev-list.txt:54
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git rev-list A B --not $(git merge-base --all A B)\n"
@@ -42576,7 +42838,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:113
+#: en/git-rev-list.txt:61
#, priority:100
msgid "'rev-list' is a very essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For this reason, it has a lot of different options that enables it to be used by commands as different as 'git bisect' and 'git repack'."
msgstr ""
@@ -44698,31 +44960,31 @@ msgstr ""
msgid "To use 'git send-email' to send your patches through the GMail SMTP server, edit ~/.gitconfig to specify your account settings:"
msgstr ""
-#. type: Plain text
-#: en/git-send-email.txt:494
+#. type: delimited block -
+#: en/git-send-email.txt:495
#, no-wrap, priority:100
msgid ""
-"\t[sendemail]\n"
-"\t\tsmtpEncryption = tls\n"
-"\t\tsmtpServer = smtp.gmail.com\n"
-"\t\tsmtpUser = yourname@gmail.com\n"
-"\t\tsmtpServerPort = 587\n"
+"[sendemail]\n"
+"\tsmtpEncryption = tls\n"
+"\tsmtpServer = smtp.gmail.com\n"
+"\tsmtpUser = yourname@gmail.com\n"
+"\tsmtpServerPort = 587\n"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:498
+#: en/git-send-email.txt:500
#, priority:100
msgid "If you have multifactor authentication setup on your gmail account, you will need to generate an app-specific password for use with 'git send-email'. Visit https://security.google.com/settings/security/apppasswords to create it."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:501
+#: en/git-send-email.txt:503
#, priority:100
msgid "Once your commits are ready to be sent to the mailing list, run the following commands:"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:505
+#: en/git-send-email.txt:507
#, no-wrap, priority:100
msgid ""
"\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -44731,19 +44993,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:510
+#: en/git-send-email.txt:512
#, priority:100
msgid "The first time you run it, you will be prompted for your credentials. Enter the app-specific or your regular password as appropriate. If you have credential helper configured (see linkgit:git-credential[1]), the password will be saved in the credential store so you won't have to type it the next time."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:518
#, priority:100
msgid "Note: the following core Perl modules that may be installed with your distribution of Perl are required: MIME::Base64, MIME::QuotedPrint, Net::Domain and Net::SMTP. These additional Perl modules are also required: Authen::SASL and Mail::Address."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:521
+#: en/git-send-email.txt:523
#, priority:100
msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
msgstr ""
@@ -46336,25 +46598,25 @@ msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--a
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:92
+#: en/git-stash.txt:93
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs, and any non-option arguments form the message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:93
+#: en/git-stash.txt:94
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:100
+#: en/git-stash.txt:101
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:104
+#: en/git-stash.txt:105
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46362,139 +46624,139 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:108
+#: en/git-stash.txt:109
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:109
+#: en/git-stash.txt:110
#, fuzzy, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr "git show [<opciones>] <objeto>..."
#. type: Plain text
-#: en/git-stash.txt:119
+#: en/git-stash.txt:120
#, priority:240
msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:120
+#: en/git-stash.txt:121
#, fuzzy, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
#. type: Plain text
-#: en/git-stash.txt:126
+#: en/git-stash.txt:127
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:130
+#: en/git-stash.txt:131
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:135
+#: en/git-stash.txt:136
#, priority:240
msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:138
+#: en/git-stash.txt:139
#, priority:240
msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:139
+#: en/git-stash.txt:140
#, fuzzy, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
#. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:145
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:145
+#: en/git-stash.txt:146
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:153
+#: en/git-stash.txt:154
#, priority:240
msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:159
+#: en/git-stash.txt:160
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:160
+#: en/git-stash.txt:161
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:164
+#: en/git-stash.txt:165
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:165
+#: en/git-stash.txt:166
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:171
+#: en/git-stash.txt:172
#, priority:240
msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:172 en/git-update-ref.txt:100
+#: en/git-stash.txt:173 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:179
+#: en/git-stash.txt:180
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:180
+#: en/git-stash.txt:181
#, fuzzy, no-wrap, priority:240
msgid "store"
msgstr "puntaje"
#. type: Plain text
-#: en/git-stash.txt:186
+#: en/git-stash.txt:187
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:195
+#: en/git-stash.txt:196
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:199
+#: en/git-stash.txt:200
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46503,31 +46765,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:203
+#: en/git-stash.txt:204
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:208
+#: en/git-stash.txt:209
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:214
+#: en/git-stash.txt:215
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:219
+#: en/git-stash.txt:220
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:227
+#: en/git-stash.txt:228
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -46539,13 +46801,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:235
+#: en/git-stash.txt:236
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:246
+#: en/git-stash.txt:247
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46560,13 +46822,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:249
+#: en/git-stash.txt:250
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:257
+#: en/git-stash.txt:258
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46578,19 +46840,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:259
+#: en/git-stash.txt:260
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:264
+#: en/git-stash.txt:265
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:275
+#: en/git-stash.txt:276
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46605,19 +46867,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:277
+#: en/git-stash.txt:278
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:283
+#: en/git-stash.txt:284
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:288
+#: en/git-stash.txt:289
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -46626,7 +46888,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:298
+#: en/git-stash.txt:299
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -46704,61 +46966,61 @@ msgid "In addition to the names of files that have been changed, also show the t
msgstr ""
#. type: Plain text
-#: en/git-status.txt:65
+#: en/git-status.txt:66
#, priority:280
msgid "The mode parameter is used to specify the handling of untracked files. It is optional: it defaults to 'all', and if specified, it must be stuck to the option (e.g. `-uno`, but not `-u no`)."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:69
+#: en/git-status.txt:70
#, no-wrap, priority:280
msgid "'no' - Show no untracked files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:70
+#: en/git-status.txt:71
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:81
+#: en/git-status.txt:82
#, priority:280
msgid "When `-u` option is not used, untracked files and directories are shown (i.e. the same as specifying `normal`), to help you avoid forgetting to add newly created files. Because it takes extra work to find untracked files in the filesystem, this mode may take some time in a large working tree. Consider enabling untracked cache and split index if supported (see `git update-index --untracked-cache` and `git update-index --split-index`), Otherwise you can use `no` to have `git status` return more quickly without showing untracked files."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:99
+#: en/git-status.txt:101
#, priority:280
msgid "Ignore changes to submodules when looking for changes. <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 before 1.7.0). Using \"all\" hides all changes to submodules (and suppresses the output of submodule summaries when the config option `status.submoduleSummary` is set)."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:100
+#: en/git-status.txt:102
#, no-wrap, priority:280
msgid "--ignored[=<mode>]"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:102
+#: en/git-status.txt:104
#, priority:280
msgid "Show ignored files as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:105
+#: en/git-status.txt:108
#, priority:280
msgid "The mode parameter is used to specify the handling of ignored files. It is optional: it defaults to 'traditional'."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:109
+#: en/git-status.txt:112
#, priority:280
msgid "'traditional' - Shows ignored files and directories, unless"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:112
+#: en/git-status.txt:115
#, no-wrap, priority:280
msgid ""
"--untracked-files=all is specified, in which case\n"
@@ -46767,109 +47029,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:113
+#: en/git-status.txt:116
#, no-wrap, priority:280
msgid "'no'\t - Show no ignored files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:114
+#: en/git-status.txt:117
#, no-wrap, priority:280
msgid "'matching' - Shows ignored files and directories matching an\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:115
+#: en/git-status.txt:118
#, no-wrap, priority:280
msgid "ignore pattern.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:121
+#: en/git-status.txt:124
#, priority:280
msgid "When 'matching' mode is specified, paths that explicitly match an ignored pattern are shown. If a directory matches an ignore pattern, then it is shown, but not paths contained in the ignored directory. If a directory does not match an ignore pattern, but all contents are ignored, then the directory is not shown, but all contents are shown."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:125
+#: en/git-status.txt:129
#, priority:280
msgid "Terminate entries with NUL, instead of LF. This implies the `--porcelain=v1` output format if no other format is given."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:132
+#: en/git-status.txt:136
#, priority:280
msgid "Display untracked files in columns. See configuration variable column.status for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:133
+#: en/git-status.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--ahead-behind"
msgstr "--ahead-behind"
#. type: Labeled list
-#: en/git-status.txt:134
+#: en/git-status.txt:138
#, ignore-same, no-wrap, priority:280
msgid "--no-ahead-behind"
msgstr "--no-ahead-behind"
#. type: Plain text
-#: en/git-status.txt:137
+#: en/git-status.txt:141
#, priority:280
msgid "Display or do not display detailed ahead/behind counts for the branch relative to its upstream branch. Defaults to true."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:138
+#: en/git-status.txt:142
#, ignore-same, no-wrap, priority:280
msgid "--renames"
msgstr "--renames"
#. type: Plain text
-#: en/git-status.txt:142
+#: en/git-status.txt:146
#, priority:280
msgid "Turn on/off rename detection regardless of user configuration. See also linkgit:git-diff[1] `--no-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:147
+#: en/git-status.txt:151
#, priority:280
msgid "Turn on rename detection, optionally setting the similarity threshold. See also linkgit:git-diff[1] `--find-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:150
+#: en/git-status.txt:154
#, priority:280
msgid "See the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:158
+#: en/git-status.txt:162
#, priority:280
msgid "The output from this command is designed to be used as a commit template comment. The default, long format, is designed to be human readable, verbose and descriptive. Its contents and format are subject to change at any time."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:163
+#: en/git-status.txt:167
#, priority:280
msgid "The paths mentioned in the output, unlike many other Git commands, are made relative to the current directory if you are working in a subdirectory (this is on purpose, to help cutting and pasting). See the status.relativePaths config option below."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:165
+#: en/git-status.txt:169
#, no-wrap, priority:280
msgid "Short Format"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:169
+#: en/git-status.txt:173
#, priority:280
msgid "In the short-format, the status of each path is shown as one of these forms"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:172
+#: en/git-status.txt:176
#, no-wrap, priority:280
msgid ""
"\tXY PATH\n"
@@ -46877,73 +47139,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:176
+#: en/git-status.txt:180
#, priority:280
msgid "where `ORIG_PATH` is where the renamed/copied contents came from. `ORIG_PATH` is only shown when the entry is renamed or copied. The `XY` is a two-letter status code."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:182
+#: en/git-status.txt:186
#, priority:280
msgid "The fields (including the `->`) are separated from each other by a single space. If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash-escaped."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:188
+#: en/git-status.txt:192
#, priority:280
msgid "For paths with merge conflicts, `X` and `Y` show the modification states of each side of the merge. For paths that do not have merge conflicts, `X` shows the status of the index, and `Y` shows the status of the work tree. For untracked paths, `XY` are `??`. Other status codes can be interpreted as follows:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:190
+#: en/git-status.txt:194
#, priority:280
msgid "' ' = unmodified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:191
+#: en/git-status.txt:195
#, priority:280
msgid "'M' = modified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:192
+#: en/git-status.txt:196
#, priority:280
msgid "'A' = added"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:193
+#: en/git-status.txt:197
#, priority:280
msgid "'D' = deleted"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:194
+#: en/git-status.txt:198
#, priority:280
msgid "'R' = renamed"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:195
+#: en/git-status.txt:199
#, priority:280
msgid "'C' = copied"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:196
+#: en/git-status.txt:200
#, priority:280
msgid "'U' = updated but unmerged"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:199
+#: en/git-status.txt:203
#, priority:280
msgid "Ignored files are not listed, unless `--ignored` option is in effect, in which case `XY` are `!!`."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:226
+#: en/git-status.txt:230
#, no-wrap, priority:280
msgid ""
"X Y Meaning\n"
@@ -46974,7 +47236,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:235
+#: en/git-status.txt:239
#, no-wrap, priority:280
msgid ""
"Submodules have more state and instead report\n"
@@ -46987,91 +47249,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:238
+#: en/git-status.txt:242
#, priority:280
msgid "'m' and '?' are applied recursively. For example if a nested submodule in a submodule contains an untracked file, this is reported as '?' as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:240
+#: en/git-status.txt:244
#, priority:280
msgid "If -b is used the short-format status is preceded by a line"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:242
+#: en/git-status.txt:246
#, no-wrap, priority:280
msgid " ## branchname tracking info\n"
msgstr ""
#. type: Title ~
-#: en/git-status.txt:244
+#: en/git-status.txt:248
#, no-wrap, priority:280
msgid "Porcelain Format Version 1"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:251
+#: en/git-status.txt:255
#, priority:280
msgid "Version 1 porcelain format is similar to the short format, but is guaranteed not to change in a backwards-incompatible way between Git versions or based on user configuration. This makes it ideal for parsing by scripts. The description of the short format above also describes the porcelain format, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:254
+#: en/git-status.txt:258
#, priority:280
msgid "The user's color.status configuration is not respected; color will always be off."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:257
+#: en/git-status.txt:261
#, priority:280
msgid "The user's status.relativePaths configuration is not respected; paths shown will always be relative to the repository root."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:267
+#: en/git-status.txt:271
#, priority:280
msgid "There is also an alternate -z format recommended for machine parsing. In that format, the status field is the same, but some other things change. First, the '\\->' is omitted from rename entries and the field order is reversed (e.g 'from \\-> to' becomes 'to from'). Second, a NUL (ASCII 0) follows each filename, replacing space as a field separator and the terminating newline (but a space still separates the status field from the first filename). Third, filenames containing special characters are not specially formatted; no quoting or backslash-escaping is performed."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:269
+#: en/git-status.txt:273
#, priority:280
msgid "Any submodule changes are reported as modified `M` instead of `m` or single `?`."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:271
+#: en/git-status.txt:275
#, no-wrap, priority:280
msgid "Porcelain Format Version 2"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:276
+#: en/git-status.txt:280
#, priority:280
msgid "Version 2 format adds more detailed information about the state of the worktree and changed items. Version 2 also defines an extensible set of easy to parse optional headers."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:280
+#: en/git-status.txt:284
#, priority:280
msgid "Header lines start with \"#\" and are added in response to specific command line arguments. Parsers should ignore headers they don't recognize."
msgstr ""
#. type: Title ^
-#: en/git-status.txt:282
+#: en/git-status.txt:286
#, no-wrap, priority:280
msgid "Branch Headers"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:286
+#: en/git-status.txt:290
#, priority:280
msgid "If `--branch` is given, a series of header lines are printed with information about the current branch."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:296
+#: en/git-status.txt:300
#, no-wrap, priority:280
msgid ""
"Line Notes\n"
@@ -47085,43 +47347,43 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:299
+#: en/git-status.txt:303
#, no-wrap, priority:280
msgid "Changed Tracked Entries"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:306
+#: en/git-status.txt:310
#, priority:280
msgid "Following the headers, a series of lines are printed for tracked entries. One of three different line formats may be used to describe an entry depending on the type of change. Tracked entries are printed in an undefined order; parsers should allow for a mixture of the 3 line types in any order."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:308
+#: en/git-status.txt:312
#, priority:280
msgid "Ordinary changed entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:310
+#: en/git-status.txt:314
#, no-wrap, priority:280
msgid " 1 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:312
+#: en/git-status.txt:316
#, priority:280
msgid "Renamed or copied entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:314
+#: en/git-status.txt:318
#, no-wrap, priority:280
msgid " 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:345
+#: en/git-status.txt:349
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47156,19 +47418,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:349
+#: en/git-status.txt:353
#, priority:280
msgid "Unmerged entries have the following format; the first character is a \"u\" to distinguish from ordinary changed entries."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:351
+#: en/git-status.txt:355
#, no-wrap, priority:280
msgid " u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:368
+#: en/git-status.txt:372
#, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47189,86 +47451,86 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:371
+#: en/git-status.txt:375
#, fuzzy, no-wrap, priority:280
#| msgid "Other"
msgid "Other Items"
msgstr "Otro"
#. type: Plain text
-#: en/git-status.txt:376
+#: en/git-status.txt:380
#, priority:280
msgid "Following the tracked entries (and if requested), a series of lines will be printed for untracked and then ignored items found in the worktree."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:378
+#: en/git-status.txt:382
#, priority:280
msgid "Untracked items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:380
+#: en/git-status.txt:384
#, no-wrap, priority:280
msgid " ? <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:382
+#: en/git-status.txt:386
#, priority:280
msgid "Ignored items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:384
+#: en/git-status.txt:388
#, no-wrap, priority:280
msgid " ! <path>\n"
msgstr ""
#. type: Title ^
-#: en/git-status.txt:386
+#: en/git-status.txt:390
#, no-wrap, priority:280
msgid "Pathname Format Notes and -z"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:391
+#: en/git-status.txt:395
#, priority:280
msgid "When the `-z` option is given, pathnames are printed as is and without any quoting and lines are terminated with a NUL (ASCII 0x00) byte."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:395
+#: en/git-status.txt:399
#, 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])."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:404
+#: en/git-status.txt:408
#, priority:280
msgid "The command honors `color.status` (or `status.color` -- they mean the same thing and the latter is kept for backward compatibility) and `color.status.<slot>` configuration variables to colorize its output."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:408
+#: en/git-status.txt:412
#, priority:280
msgid "If the config variable `status.relativePaths` is set to false, then all paths shown are relative to the repository root, not to the current directory."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:419
+#: en/git-status.txt:423
#, priority:280
msgid "If `status.submoduleSummary` is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). Please note that the summary output from the status command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings."
msgstr ""
#. type: Title -
-#: en/git-status.txt:421
+#: en/git-status.txt:425
#, no-wrap, priority:280
msgid "BACKGROUND REFRESH"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:432
+#: en/git-status.txt:436
#, priority:280
msgid "By default, `git status` will automatically refresh the index, updating the cached stat information from the working tree and writing out the result. Writing out the updated index is an optimization that isn't strictly necessary (`status` computes the values for itself, but writing them out is just to save subsequent programs from repeating our computation). When `status` is run in the background, the lock held during the write may conflict with other simultaneous processes, causing them to fail. Scripts running `status` in the background should consider using `git --no-optional-locks status` (see linkgit:git[1] for details)."
msgstr ""
@@ -47712,282 +47974,288 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:176
#, no-wrap, priority:220
-msgid "set-branch ((-d|--default)|(-b|--branch <branch>)) [--] <path>"
+msgid "set-branch (-b|--branch) <branch> [--] <path>"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-submodule.txt:177
+#, no-wrap, priority:220
+msgid "set-branch (-d|--default) [--] <path>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:181
+#: en/git-submodule.txt:182
#, priority:220
msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:182
+#: en/git-submodule.txt:183
#, ignore-ellipsis, no-wrap, priority:220
msgid "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:191
+#: en/git-submodule.txt:192
#, priority:220
msgid "Show commit summary between the given commit (defaults to HEAD) and working tree/index. For a submodule in question, a series of commits in the submodule between the given super project commit and the index or working tree (switched by `--cached`) are shown. If the option `--files` is given, show the series of commits in the submodule between the index of the super project and the working tree of the submodule (this option doesn't allow to use the `--cached` option or to provide an explicit commit)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:194
+#: en/git-submodule.txt:195
#, priority:220
msgid "Using the `--submodule=log` option with linkgit:git-diff[1] will provide that information too."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:195
+#: en/git-submodule.txt:196
#, no-wrap, priority:220
msgid "foreach [--recursive] <command>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:216
+#: en/git-submodule.txt:217
#, priority:220
msgid "Evaluates an arbitrary shell command in each checked out submodule. The command has access to the variables $name, $sm_path, $displaypath, $sha1 and $toplevel: $name is the name of the relevant submodule section in `.gitmodules`, $sm_path is the path of the submodule as recorded in the immediate superproject, $displaypath contains the relative path from the current working directory to the submodules root directory, $sha1 is the commit as recorded in the immediate superproject, and $toplevel is the absolute path to the top-level of the immediate superproject. Note that to avoid conflicts with '$PATH' on Windows, the '$path' variable is now a deprecated synonym of '$sm_path' variable. Any submodules defined in the superproject but not checked out are ignored by this command. Unless given `--quiet`, foreach prints the name of each submodule before evaluating the command. If `--recursive` is given, submodules are traversed recursively (i.e. the given shell command is evaluated in nested submodules as well). A non-zero return from the command in any submodule causes the processing to terminate. This can be overridden by adding '|| :' to the end of the command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:219
+#: en/git-submodule.txt:220
#, priority:220
msgid "As an example, the command below will show the path and currently checked out commit for each submodule:"
msgstr ""
#. type: delimited block -
-#: en/git-submodule.txt:222
+#: en/git-submodule.txt:223
#, no-wrap, priority:220
msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:224
+#: en/git-submodule.txt:225
#, ignore-ellipsis, no-wrap, priority:220
msgid "sync [--recursive] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:231
+#: en/git-submodule.txt:232
#, priority:220
msgid "Synchronizes submodules' remote URL configuration setting to the value specified in `.gitmodules`. It will only affect those submodules which already have a URL entry in .git/config (that is the case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:234
+#: en/git-submodule.txt:235
#, priority:220
msgid "`git submodule sync` synchronizes all submodules while `git submodule sync -- A` synchronizes submodule \"A\" only."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:237
+#: en/git-submodule.txt:238
#, priority:220
msgid "If `--recursive` is specified, this command will recurse into the registered submodules, and sync any nested submodules within."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:238
+#: en/git-submodule.txt:239
#, no-wrap, priority:220
msgid "absorbgitdirs"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:245
+#: en/git-submodule.txt:246
#, priority:220
msgid "If a git directory of a submodule is inside the submodule, move the git directory of the submodule into its superprojects `$GIT_DIR/modules` path and then connect the git directory and its working directory by setting the `core.worktree` and adding a .git file pointing to the git directory embedded in the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:249
+#: en/git-submodule.txt:250
#, priority:220
msgid "A repository that was cloned independently and later added as a submodule or old setups have the submodules git directory inside the submodule instead of embedded into the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:251
+#: en/git-submodule.txt:252
#, priority:220
msgid "This command is recursive by default."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:257
+#: en/git-submodule.txt:258
#, priority:220
msgid "Only print error messages."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:264
+#: en/git-submodule.txt:265
#, priority:220
msgid "This option is only valid for add and update commands. Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:268
+#: en/git-submodule.txt:269
#, priority:220
msgid "This option is only valid for the deinit command. Unregister all submodules in the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:269
+#: en/git-submodule.txt:270
#, fuzzy, no-wrap, priority:220
#| msgid "<branch>"
msgid "-b <branch>"
msgstr "<rama>"
#. type: Plain text
-#: en/git-submodule.txt:277
+#: en/git-submodule.txt:278
#, priority:220
msgid "Branch of repository to add as submodule. The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository. If the option is not specified, it defaults to 'master'."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:290
+#: en/git-submodule.txt:291
#, priority:220
msgid "This option is only valid for add, deinit and update commands. When running add, allow adding an otherwise ignored submodule path. When running deinit the submodule working trees will be removed even if they contain local changes. When running update (only effective with the checkout procedure), throw away local changes in submodules when switching to a different commit; and always run a checkout operation in the submodule, even if the commit listed in the index of the containing repository matches the commit checked out in the submodule."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:295
+#: en/git-submodule.txt:296
#, priority:220
msgid "This option is only valid for status and summary commands. These commands typically use the commit found in the submodule HEAD, but with this option, the commit stored in the index is used instead."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:296
+#: en/git-submodule.txt:297
#, ignore-same, no-wrap, priority:220
msgid "--files"
msgstr "--files"
#. type: Plain text
-#: en/git-submodule.txt:300
+#: en/git-submodule.txt:301
#, priority:220
msgid "This option is only valid for the summary command. This command compares the commit in the index with that in the submodule HEAD when this option is used."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:302
+#: en/git-submodule.txt:303
#, ignore-same, no-wrap, priority:220
msgid "--summary-limit"
msgstr "--summary-limit"
#. type: Plain text
-#: en/git-submodule.txt:308
+#: en/git-submodule.txt:309
#, priority:220
msgid "This option is only valid for the summary command. Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:309
+#: en/git-submodule.txt:310
#, ignore-same, no-wrap, priority:220
msgid "--remote"
msgstr "--remote"
#. type: Plain text
-#: en/git-submodule.txt:318
+#: en/git-submodule.txt:319
#, priority:220
msgid "This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:324
+#: en/git-submodule.txt:325
#, priority:220
msgid "This works for any of the supported update procedures (`--checkout`, `--rebase`, etc.). The only change is the source of the target SHA-1. For example, `submodule update --remote --merge` will merge upstream submodule changes into the submodules, while `submodule update --merge` will merge superproject gitlink changes into the submodules."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:329
+#: en/git-submodule.txt:330
#, priority:220
msgid "In order to ensure a current tracking branch state, `update --remote` fetches the submodule's remote repository before calculating the SHA-1. If you don't want to fetch, you should use `submodule update --remote --no-fetch`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:339
+#: en/git-submodule.txt:340
#, priority:220
msgid "Use this option to integrate changes from the upstream subproject with your submodule's current HEAD. Alternatively, you can run `git pull` from the submodule, which is equivalent except for the remote branch name: `update --remote` uses the default upstream repository and `submodule.<name>.branch`, while `git pull` uses the submodule's `branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want to distribute the default upstream branch with the superproject and `branch.<name>.merge` if you want a more native feel while working in the submodule itself."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:341
+#: en/git-submodule.txt:342
#, ignore-same, no-wrap, priority:220
msgid "--no-fetch"
msgstr "--no-fetch"
#. type: Plain text
-#: en/git-submodule.txt:344
+#: en/git-submodule.txt:345
#, priority:220
msgid "This option is only valid for the update command. Don't fetch new objects from the remote site."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:345
+#: en/git-submodule.txt:346
#, ignore-same, no-wrap, priority:220
msgid "--checkout"
msgstr "--checkout"
#. type: Plain text
-#: en/git-submodule.txt:353
+#: en/git-submodule.txt:354
#, priority:220
msgid "This option is only valid for the update command. Checkout the commit recorded in the superproject on a detached HEAD in the submodule. This is the default behavior, the main use of this option is to override `submodule.$name.update` when set to a value other than `checkout`. If the key `submodule.$name.update` is either not explicitly set or set to `checkout`, this option is implicit."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:363
+#: en/git-submodule.txt:364
#, priority:220
msgid "This option is only valid for the update command. Merge the commit recorded in the superproject into the current branch of the submodule. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve the resulting conflicts within the submodule with the usual conflict resolution tools. If the key `submodule.$name.update` is set to `merge`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:364
+#: en/git-submodule.txt:365
#, ignore-same, no-wrap, priority:220
msgid "--rebase"
msgstr "--rebase"
#. type: Plain text
-#: en/git-submodule.txt:372
+#: en/git-submodule.txt:373
#, priority:220
msgid "This option is only valid for the update command. Rebase the current branch onto the commit recorded in the superproject. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve these failures with linkgit:git-rebase[1]. If the key `submodule.$name.update` is set to `rebase`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:373
+#: en/git-submodule.txt:374
#, ignore-same, no-wrap, priority:220
msgid "--init"
msgstr "--init"
#. type: Plain text
-#: en/git-submodule.txt:377
+#: en/git-submodule.txt:378
#, priority:220
msgid "This option is only valid for the update command. Initialize all submodules for which \"git submodule init\" has not been called so far before updating."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:378
+#: en/git-submodule.txt:379
#, ignore-same, no-wrap, priority:220
msgid "--name"
msgstr "--name"
#. type: Plain text
-#: en/git-submodule.txt:382
+#: en/git-submodule.txt:383
#, priority:220
msgid "This option is only valid for the add command. It sets the submodule's name to the given string instead of defaulting to its path. The name must be valid as a directory name and may not end with a '/'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:383
+#: en/git-submodule.txt:384
#, fuzzy, no-wrap, priority:220
msgid "--reference <repository>"
msgstr "repositorio de referencia"
#. type: Plain text
-#: en/git-submodule.txt:387 en/git-submodule.txt:396
+#: en/git-submodule.txt:388 en/git-submodule.txt:397
#, priority:220
msgid "This option is only valid for add and update commands. These commands sometimes need to clone a remote repository. In this case, this option will be passed to the linkgit:git-clone[1] command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:391
+#: en/git-submodule.txt:392
#, no-wrap, priority:220
msgid ""
"*NOTE*: Do *not* use this option unless you have read the note\n"
@@ -47996,61 +48264,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:398
+#: en/git-submodule.txt:399
#, no-wrap, priority:220
msgid "*NOTE*: see the NOTE for the `--reference` option.\n"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:404
+#: en/git-submodule.txt:405
#, priority:220
msgid "This option is only valid for foreach, update, status and sync commands. Traverse submodules recursively. The operation is performed not only in the submodules of the current repo, but also in any nested submodules inside those submodules (and so on)."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:405
+#: en/git-submodule.txt:406
#, ignore-same, no-wrap, priority:220
msgid "--depth"
msgstr "--depth"
#. type: Plain text
-#: en/git-submodule.txt:409
+#: en/git-submodule.txt:410
#, priority:220
msgid "This option is valid for add and update commands. Create a 'shallow' clone with a history truncated to the specified number of revisions. See linkgit:git-clone[1]"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:410
+#: en/git-submodule.txt:411
#, ignore-same, no-wrap, priority:220
msgid "--[no-]recommend-shallow"
msgstr "--[no-]recommend-shallow"
#. type: Plain text
-#: en/git-submodule.txt:415
+#: en/git-submodule.txt:416
#, priority:220
msgid "This option is only valid for the update command. The initial clone of a submodule will use the recommended `submodule.<name>.shallow` as provided by the `.gitmodules` file by default. To ignore the suggestions use `--no-recommend-shallow`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:421
+#: en/git-submodule.txt:422
#, priority:220
msgid "This option is only valid for the update command. Clone new submodules in parallel with as many jobs. Defaults to the `submodule.fetchJobs` option."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:426
+#: en/git-submodule.txt:427
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:434
+#: en/git-submodule.txt:435
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:438
+#: en/git-submodule.txt:439
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -48682,7 +48950,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:889
+#: en/git-svn.txt:346 en/rev-list-options.txt:905
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -49495,7 +49763,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:777
#, priority:100
-msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider linkgit:git-filter-branch[1] instead. filter-branch also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
+msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports, and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider https://github.com/newren/git-filter-repo[git-filter-repo] instead. filter-repo also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
msgstr ""
#. type: Labeled list
@@ -51422,16 +51690,6 @@ msgid ""
"#\n"
msgstr ""
-#. type: delimited block -
-#: en/git.txt:310
-#, 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/git.txt:315
#, no-wrap, priority:100
@@ -55473,98 +55731,104 @@ msgstr ""
msgid "This option determines how the merge message will be cleaned up before commiting. See linkgit:git-commit[1] for more details. In addition, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on to the commit machinery in the case of a merge conflict."
msgstr ""
+#. type: Labeled list
+#: en/merge-options.txt:44
+#, ignore-same, no-wrap, priority:240
+msgid "--ff-only"
+msgstr "--ff-only"
+
#. type: Plain text
-#: en/merge-options.txt:46
+#: en/merge-options.txt:50
#, priority:240
-msgid "When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. This is the default behavior."
+msgid "Specifies how a merge is handled when the merged-in history is already a descendant of the current history. `--ff` is the default unless merging an annotated (and possibly signed) tag that is not stored in its natural place in the `refs/tags/` hierarchy, in which case `--no-ff` is assumed."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:52
+#: en/merge-options.txt:55
#, priority:240
-msgid "Create a merge commit even when the merge resolves as a fast-forward. This is the default behaviour when merging an annotated (and possibly signed) tag that is not stored in its natural place in 'refs/tags/' hierarchy."
+msgid "With `--ff`, when possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit."
msgstr ""
-#. type: Labeled list
-#: en/merge-options.txt:53
-#, ignore-same, no-wrap, priority:240
-msgid "--ff-only"
-msgstr "--ff-only"
+#. type: Plain text
+#: en/merge-options.txt:58
+#, priority:240
+msgid "With `--no-ff`, create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward."
+msgstr ""
#. type: Plain text
-#: en/merge-options.txt:57
+#: en/merge-options.txt:61
#, priority:240
-msgid "Refuse to merge and exit with a non-zero status unless the current `HEAD` is already up to date or the merge can be resolved as a fast-forward."
+msgid "With `--ff-only`, resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:63
+#: en/merge-options.txt:67
#, priority:240
msgid "GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:69
+#: en/merge-options.txt:73
#, priority:240
msgid "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also linkgit:git-fmt-merge-msg[1]."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:72
+#: en/merge-options.txt:76
#, priority:240
msgid "With --no-log do not list one-line descriptions from the actual commits being merged."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:74
+#: en/merge-options.txt:78
#, ignore-same, no-wrap, priority:240
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
-#: en/merge-options.txt:83
+#: en/merge-options.txt:87
#, priority:240
msgid "With --no-signoff do not add a Signed-off-by line."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:89
+#: en/merge-options.txt:93
#, priority:240
msgid "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:92
+#: en/merge-options.txt:96
#, priority:240
msgid "With -n or --no-stat do not show a diffstat at the end of the merge."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:93
+#: en/merge-options.txt:97
#, ignore-same, no-wrap, priority:240
msgid "--squash"
msgstr "--squash"
#. type: Labeled list
-#: en/merge-options.txt:94
+#: en/merge-options.txt:98
#, ignore-same, no-wrap, priority:240
msgid "--no-squash"
msgstr "--no-squash"
#. type: Plain text
-#: en/merge-options.txt:102
+#: en/merge-options.txt:106
#, priority:240
msgid "Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:105
+#: en/merge-options.txt:109
#, priority:240
msgid "With --no-squash perform the merge and commit the result. This option can be used to override --squash."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:107
+#: en/merge-options.txt:111
#, priority:240
msgid "With --squash, --commit is not allowed, and will fail."
msgstr ""
@@ -55572,71 +55836,77 @@ msgstr ""
#. type: Plain text
#: en/merge-options.txt:115
#, priority:240
+msgid "This option bypasses the pre-merge and commit-msg hooks. See also linkgit:githooks[5]."
+msgstr ""
+
+#. type: Plain text
+#: en/merge-options.txt:123
+#, priority:240
msgid "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise)."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:116
+#: en/merge-options.txt:124
#, no-wrap, priority:240
msgid "-X <option>"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:120
+#: en/merge-options.txt:128
#, priority:240
msgid "Pass merge strategy specific option through to the merge strategy."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:121
+#: en/merge-options.txt:129
#, ignore-same, no-wrap, priority:240
msgid "--verify-signatures"
msgstr "--verify-signatures"
#. type: Labeled list
-#: en/merge-options.txt:122
+#: en/merge-options.txt:130
#, ignore-same, no-wrap, priority:240
msgid "--no-verify-signatures"
msgstr "--no-verify-signatures"
#. type: Plain text
-#: en/merge-options.txt:128
+#: en/merge-options.txt:136
#, priority:240
msgid "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:130
+#: en/merge-options.txt:138
#, ignore-same, no-wrap, priority:240
msgid "--no-summary"
msgstr "--no-summary"
#. type: Plain text
-#: en/merge-options.txt:133
+#: en/merge-options.txt:141
#, priority:240
msgid "Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:138
+#: en/merge-options.txt:146
#, priority:240
msgid "Operate quietly. Implies --no-progress."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:149
+#: en/merge-options.txt:157
#, priority:240
msgid "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:152
+#: en/merge-options.txt:160
#, ignore-same, no-wrap, priority:240
msgid "--allow-unrelated-histories"
msgstr "--allow-unrelated-histories"
#. type: Plain text
-#: en/merge-options.txt:158
+#: en/merge-options.txt:166
#, priority:240
msgid "By default, `git merge` command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added."
msgstr ""
@@ -56972,7 +57242,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:215
#, priority:260
-msgid "minutes ago`}; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -59350,263 +59620,281 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:762
#, priority:260
+msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:771
+#, ignore-ellipsis, priority:260
+msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:775
+#, priority:260
+msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:778
+#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:779
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:766
+#: en/rev-list-options.txt:782
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:773
+#: en/rev-list-options.txt:789
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:781
+#: en/rev-list-options.txt:797
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:800
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:791
+#: en/rev-list-options.txt:807
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:793
+#: en/rev-list-options.txt:809
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:801
+#: en/rev-list-options.txt:817
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:802
+#: en/rev-list-options.txt:818
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:804
+#: en/rev-list-options.txt:820
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:822
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:812
+#: en/rev-list-options.txt:828
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:832
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:818
+#: en/rev-list-options.txt:834
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:819
+#: en/rev-list-options.txt:835
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:826
+#: en/rev-list-options.txt:842
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:847
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:833
+#: en/rev-list-options.txt:849
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:852
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:838
+#: en/rev-list-options.txt:854
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:839
+#: en/rev-list-options.txt:855
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:840
+#: en/rev-list-options.txt:856
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:859
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:846
+#: en/rev-list-options.txt:862
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:864
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:873
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:864
+#: en/rev-list-options.txt:880
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:868
+#: en/rev-list-options.txt:884
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:875
+#: en/rev-list-options.txt:891
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:894
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:880
+#: en/rev-list-options.txt:896
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:882
+#: en/rev-list-options.txt:898
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:884
+#: en/rev-list-options.txt:900
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:887
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:892
+#: en/rev-list-options.txt:908
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:909
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:896
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:898
+#: en/rev-list-options.txt:914
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:902
+#: en/rev-list-options.txt:918
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:907
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:925
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:932
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -59617,19 +59905,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:919
+#: en/rev-list-options.txt:935
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:922
+#: en/rev-list-options.txt:938
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:929
+#: en/rev-list-options.txt:945
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -59641,85 +59929,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:931
+#: en/rev-list-options.txt:947
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:937
+#: en/rev-list-options.txt:953
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:939
+#: en/rev-list-options.txt:955
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:942
+#: en/rev-list-options.txt:958
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:943
+#: en/rev-list-options.txt:959
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:949
+#: en/rev-list-options.txt:965
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:959
+#: en/rev-list-options.txt:975
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:963
+#: en/rev-list-options.txt:979
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:984
#, priority:260
msgid "Listed below are options that control the formatting of diff output. Some of them are specific to linkgit:git-rev-list[1], however other diff options may be given. See linkgit:git-diff-files[1] for more options."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:991
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:981
+#: en/rev-list-options.txt:997
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:1012
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1015
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1018
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index 59b220b48e8c1e54a3206d95e429dd6ee7d48ba8..571ed21029f3ed3f492797d9311e66cc7a83b76d 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2019-08-26 23:13+0200\n"
+"POT-Creation-Date: 2019-12-08 16:35+0100\n"
"PO-Revision-Date: 2019-11-30 11:40+0100\n"
"Last-Translator: Adrien Ollier <adr.ollier@hotmail.fr>\n"
"Language-Team: Jean-No챘l Avila <jn.avila@free.fr>\n"
@@ -30,7 +30,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:319 en/git-fsck.txt:38 en/git-rebase.txt:471
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:321 en/git-fsck.txt:38 en/git-rebase.txt:493
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -90,7 +90,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1000
+#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1016
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -126,7 +126,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:433 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -469,7 +469,7 @@ msgid "Get and set repository or global options."
msgstr "voir et r챕gler les options globales ou de d챕p척t"
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1505
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1528
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-export[1]"
msgstr "linkgit:git-fast-export[1]"
@@ -481,7 +481,7 @@ msgid "Git data exporter."
msgstr "Exporteur de donn챕es Git"
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:243
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-import[1]"
msgstr "linkgit:git-fast-import[1]"
@@ -2264,95 +2264,95 @@ msgstr ""
msgid "Example"
msgstr "Exemple혻:"
-#. type: Plain text
-#: en/config.txt:185
+#. type: delimited block -
+#: en/config.txt:186
#, no-wrap, priority:100
msgid ""
-"\t# Core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"# Core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:190
+#. type: delimited block -
+#: en/config.txt:191
#, no-wrap, priority:100
msgid ""
-"\t# Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"# Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:194
+#. type: delimited block -
+#: en/config.txt:195
#, no-wrap, priority:100
msgid ""
-"\t[branch \"devel\"]\n"
-"\t\tremote = origin\n"
-"\t\tmerge = refs/heads/devel\n"
+"[branch \"devel\"]\n"
+"\tremote = origin\n"
+"\tmerge = refs/heads/devel\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:199
+#. type: delimited block -
+#: en/config.txt:200
#, no-wrap, priority:100
msgid ""
-"\t# Proxy settings\n"
-"\t[core]\n"
-"\t\tgitProxy=\"ssh\" for \"kernel.org\"\n"
-"\t\tgitProxy=default-proxy ; for the rest\n"
+"# Proxy settings\n"
+"[core]\n"
+"\tgitProxy=\"ssh\" for \"kernel.org\"\n"
+"\tgitProxy=default-proxy ; for the rest\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:204
+#. type: delimited block -
+#: en/config.txt:205
#, no-wrap, priority:100
msgid ""
-"\t[include]\n"
-"\t\tpath = /path/to/foo.inc ; include by absolute path\n"
-"\t\tpath = foo.inc ; find \"foo.inc\" relative to the current file\n"
-"\t\tpath = ~/foo.inc ; find \"foo.inc\" in your `$HOME` directory\n"
+"[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: Plain text
-#: en/config.txt:208
+#. type: delimited block -
+#: en/config.txt:209
#, no-wrap, priority:100
msgid ""
-"\t; include if $GIT_DIR is /path/to/foo/.git\n"
-"\t[includeIf \"gitdir:/path/to/foo/.git\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; 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: Plain text
-#: en/config.txt:212
+#. type: delimited block -
+#: en/config.txt:213
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside /path/to/group\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside /path/to/group\n"
+"[includeIf \"gitdir:/path/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:216
+#. type: delimited block -
+#: en/config.txt:217
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside $HOME/to/group\n"
-"\t[includeIf \"gitdir:~/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside $HOME/to/group\n"
+"[includeIf \"gitdir:~/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:222
+#. type: delimited block -
+#: en/config.txt:223
#, no-wrap, priority:100
msgid ""
-"\t; relative paths are always relative to the including\n"
-"\t; file (if the condition is true); their location is not\n"
-"\t; affected by the condition\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = foo.inc\n"
+"; 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:227
+#: en/config.txt:229
#, no-wrap, priority:100
msgid ""
"\t; include only if we are in a worktree where foo-branch is\n"
@@ -2362,43 +2362,43 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/config.txt:229
+#: en/config.txt:231
#, no-wrap, priority:100
msgid "Values"
msgstr ""
#. type: Plain text
-#: en/config.txt:234
+#: 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:235
+#: en/config.txt:237
#, no-wrap, priority:100
msgid "boolean"
msgstr ""
#. type: Plain text
-#: en/config.txt:240
+#: 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:241
+#: en/config.txt:243
#, no-wrap, priority:100
msgid "true"
msgstr ""
#. type: Plain text
-#: en/config.txt:242
+#: en/config.txt:244
#, priority:100
msgid "Boolean true literals are `yes`, `on`, `true`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:244
+#: en/config.txt:246
#, no-wrap, priority:100
msgid ""
"and `1`. Also, a variable defined without `= <value>`\n"
@@ -2406,109 +2406,109 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/config.txt:245
+#: en/config.txt:247
#, no-wrap, priority:100
msgid "false"
msgstr ""
#. type: Plain text
-#: en/config.txt:246
+#: en/config.txt:248
#, priority:100
msgid "Boolean false literals are `no`, `off`, `false`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:247
+#: en/config.txt:249
#, no-wrap, priority:100
msgid "`0` and the empty string.\n"
msgstr ""
#. type: Plain text
-#: en/config.txt:251
+#: 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:252
+#: en/config.txt:254
#, no-wrap, priority:100
msgid "integer"
msgstr ""
#. type: Plain text
-#: en/config.txt:256
+#: 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:257 en/diff-options.txt:356 en/git-for-each-ref.txt:177
+#: 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:261
+#: 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:265
+#: en/config.txt:267
#, 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."
msgstr ""
#. type: Plain text
-#: en/config.txt:270
+#: en/config.txt:272
#, 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:277
+#: en/config.txt:279
#, 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:280
+#: en/config.txt:282
#, 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:289
+#: en/config.txt:291
#, 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:290
+#: en/config.txt:292
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:296
+#: en/config.txt:298
#, 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:299 en/git-imap-send.txt:58
+#: en/config.txt:301 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:304
+#: en/config.txt:306
#, 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:309
+#: en/config.txt:311
#, 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 ""
@@ -3262,54 +3262,56 @@ msgstr "Le caract챔re `NUL` suppl챕mentaire avant le chemin de pr챕image dans le
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, no-wrap, priority:260
-msgid "Generating patches with -p"
+#, fuzzy, no-wrap, priority:260
+#| msgid "Generating patches with -p"
+msgid "Generating patch text with -p"
msgstr "G챕n챕ration de rustines avec -p"
#. type: Plain text
-#: en/diff-generate-patch.txt:10
-#, priority:260
-msgid "When \"git-diff-index\", \"git-diff-tree\", or \"git-diff-files\" are run with a `-p` option, \"git diff\" without the `--raw` option, or \"git log\" with the \"-p\" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
+#: en/diff-generate-patch.txt:14
+#, fuzzy, priority:260
+#| msgid "When \"git-diff-index\", \"git-diff-tree\", or \"git-diff-files\" are run with a `-p` option, \"git diff\" without the `--raw` option, or \"git log\" with the \"-p\" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
+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 "Quand \"git-diff-index\", \"git-diff-tree\", ou \"git-diff-files\" sont lanc챕es avec l'option `-p`, \"git diff\" sans l'option `--raw`, ou \"git log\" avec l'option \"-p\", elles ne produisent pas la sortie d챕crite ci-dessus혻; au lieu de cela, elles produisent un fichier rustine. Vous pouvez personnaliser la cr챕ation de telles rustines via les variables d'environnement `GIT_EXTERNAL_DIFF` et `GIT_DIFF_OPTS`."
#. type: Plain text
-#: en/diff-generate-patch.txt:13
+#: en/diff-generate-patch.txt:17
#, priority:260
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr "L'option produit quelque chose l챕g챔rement diff챕rent du format diff traditionnel혻:"
#. type: Plain text
-#: en/diff-generate-patch.txt:15
+#: en/diff-generate-patch.txt:19
#, priority:260
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr "Il est pr챕c챕d챕 d'un ent챗te \"git diff\" qui ressemble 횪 ceci혻:"
#. type: Plain text
-#: en/diff-generate-patch.txt:17
+#: en/diff-generate-patch.txt:21
#, no-wrap, priority:260
msgid "diff --git a/file1 b/file2\n"
msgstr "diff --git a/fichier1 b/fichier2\n"
#. type: Plain text
-#: en/diff-generate-patch.txt:21
+#: 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 "les noms de fichiers sous `a/` et `b/` sont identiques 횪 moins qu'il y ait eu un renommage ou une copie, m챗me pour un cr챕ation ou une suppression, `/dev/null` _n'est pas_ utilis챕 횪 la place des noms de fichier `a/` ou`b/`."
#. type: Plain text
-#: en/diff-generate-patch.txt:25
+#: 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 "Quand un renommage ou un copie est d챕crit, `fichier1` et `fichier2` indiquent les noms du fichier source et du fichier cible, respectivement."
#. type: Plain text
-#: en/diff-generate-patch.txt:27
+#: en/diff-generate-patch.txt:31
#, priority:260
msgid "It is followed by one or more extended header lines:"
msgstr "Suivent un ligne ou plus d'ent챗te 챕tendu혻:"
#. type: Plain text
-#: en/diff-generate-patch.txt:39
+#: en/diff-generate-patch.txt:43
#, no-wrap, priority:260
msgid ""
"old mode <mode>\n"
@@ -3337,43 +3339,44 @@ msgstr ""
"index <empreinte>..<empreinte> <mode>\n"
#. type: Plain text
-#: en/diff-generate-patch.txt:42
+#: 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 "Les modes de fichier sont affich챕s comme des nombres 횪 6 chiffres en octal incluant le type de fichier et les bits de permission."
#. type: Plain text
-#: en/diff-generate-patch.txt:44
+#: en/diff-generate-patch.txt:48
#, priority:260
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr "Les noms de chemin dans les ent챗tes 챕tendus n'incluent pas les pr챕fixes `a/` et `b/`."
#. type: Plain text
-#: en/diff-generate-patch.txt:51
+#: 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 "L'index de similarit챕 et le pourcentage de lignes inchang챕es et l'index de dissimilarit챕 est le pourcentage de lignes chang챕es. Il est arrondi 횪 l'entier inf챕rieur, suivi du signe pourcent. Une valeur d'index de similarit챕 횪 100혻% correspond donc 횪 deux fichiers identiques, tandis qu'un index de dissimilarit챕 de 100혻% signifie qu'aucune ligne de l'ancien fichier ne se retrouve dans le nouveau fichier."
#. type: Plain text
-#: en/diff-generate-patch.txt:55
-#, priority:260
-msgid "The index line includes the SHA-1 checksum 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."
+#: en/diff-generate-patch.txt:59
+#, fuzzy, priority:260
+#| msgid "The index line includes the SHA-1 checksum 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."
+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 "La ligne d'index inclut l'empreinte SHA-1 avant et apr챔s la modification. Le <mode> est inclus si le mode du fichier n'est pas modifi챕혻; sinon, des lignes s챕par챕es indiquent l'ancien et le nouveau mode."
#. type: Plain text
-#: en/diff-generate-patch.txt:59
+#: 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 "Les noms de chemin avec des caract챔res 짬혻inhabituels혻쨩 sont cit챕s comme expliqu챕 pour la variable de configuration `core.quotePath` (voir linkgit:git-config[1])."
#. type: Plain text
-#: en/diff-generate-patch.txt:64
+#: 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 "Tous les fichiers `fichier1` de la sortie font r챕f챕rence 횪 des fichiers avant la validation, et tous les fichiers `fichier2` font r챕f챕rence aux fichiers apr챔s la validation. Il est incorrect d'appliquer chaque modification 횪 chaque fichier s챕quentiellement. Par exemple, cette rustine 챕change a et b혻:"
#. type: Plain text
-#: en/diff-generate-patch.txt:71
+#: en/diff-generate-patch.txt:75
#, no-wrap, priority:260
msgid ""
"diff --git a/a b/b\n"
@@ -3391,25 +3394,27 @@ msgstr ""
"rename to a\n"
#. type: Title -
-#: en/diff-generate-patch.txt:74
-#, no-wrap, priority:260
-msgid "combined diff format"
+#: en/diff-generate-patch.txt:78
+#, fuzzy, no-wrap, priority:260
+#| msgid "combined diff format"
+msgid "Combined diff format"
msgstr "format de diff combin챕"
#. type: Plain text
-#: en/diff-generate-patch.txt:82
+#: 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 "Toute commande g챕n챕rant un diff accepte l'option `-c` ou `-cc` pour produire un 'diff combin챕' lors de l'affichage d'une fusion. C'est le format par d챕faut pour afficher les fusions avec linkgit:git-diff[1] ou linkgit:git-show[1]. Notez aussi que vous pouvez ajouter l'option `-m` 횪 toutes ces commandes pour forcer la g챕n챕ration des diffs avec un parent individuel d'une fusion."
#. type: Plain text
-#: en/diff-generate-patch.txt:84
-#, priority:260
-msgid "A 'combined diff' format looks like this:"
+#: en/diff-generate-patch.txt:88
+#, fuzzy, priority:260
+#| msgid "A 'combined diff' format looks like this:"
+msgid "A \"combined diff\" format looks like this:"
msgstr "Un format de 'diff combin챕' ressemble 횪 ceci혻:"
#. type: delimited block -
-#: en/diff-generate-patch.txt:93
+#: en/diff-generate-patch.txt:97
#, no-wrap, priority:260
msgid ""
"diff --combined describe.c\n"
@@ -3429,7 +3434,7 @@ msgstr ""
" }\n"
#. type: delimited block -
-#: en/diff-generate-patch.txt:103
+#: en/diff-generate-patch.txt:107
#, no-wrap, priority:260
msgid ""
"- static void describe(char *arg)\n"
@@ -3453,7 +3458,7 @@ msgstr ""
"\tstruct commit_name *n;\n"
#. type: delimited block -
-#: en/diff-generate-patch.txt:113
+#: en/diff-generate-patch.txt:117
#, no-wrap, priority:260
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
@@ -3477,37 +3482,39 @@ msgstr ""
"\t\tfor_each_ref(get_name);\n"
#. type: Plain text
-#: en/diff-generate-patch.txt:117
-#, priority:260
-msgid "It is preceded with a \"git diff\" header, that looks like this (when `-c` option is used):"
+#: en/diff-generate-patch.txt:121
+#, fuzzy, priority:260
+#| msgid "It is preceded with a \"git diff\" header, that looks like this (when `-c` option is used):"
+msgid "It is preceded with a \"git diff\" header, that looks like this (when the `-c` option is used):"
msgstr "Il est pr챕c챕d챕 d'un ent챗te \"git diff\", qui ressemble 횪 ceci (quand l'option `-c` est utilis챕e)혻:"
#. type: Plain text
-#: en/diff-generate-patch.txt:119
+#: en/diff-generate-patch.txt:123
#, no-wrap, priority:260
msgid "diff --combined file\n"
msgstr "diff --combined file\n"
#. type: Plain text
-#: en/diff-generate-patch.txt:121
-#, priority:260
-msgid "or like this (when `--cc` option is used):"
+#: en/diff-generate-patch.txt:125
+#, fuzzy, priority:260
+#| msgid "or like this (when `--cc` option is used):"
+msgid "or like this (when the `--cc` option is used):"
msgstr "ou 횪 ceci (lorsque l'option `--cc` est utilis챕e)혻:"
#. type: Plain text
-#: en/diff-generate-patch.txt:123
+#: en/diff-generate-patch.txt:127
#, no-wrap, priority:260
msgid " diff --cc file\n"
msgstr " diff --cc file\n"
#. type: Plain text
-#: en/diff-generate-patch.txt:126
+#: 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 "Il est suivi par une ligne d'ent챗te 챕tendu ou plus (cet exemple montre une fusion avec deux parents)혻:"
#. type: Plain text
-#: en/diff-generate-patch.txt:131
+#: en/diff-generate-patch.txt:135
#, no-wrap, priority:260
msgid ""
"index <hash>,<hash>..<hash>\n"
@@ -3521,91 +3528,92 @@ msgstr ""
"deleted file mode <mode>,<mode>\n"
#. type: Plain text
-#: en/diff-generate-patch.txt:137
+#: 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 "La ligne `mode <mode>,<mode>..<mode>` n'appara챤t que si au moins un des modes est diff챕rent du reste. Les ent챗tes 챕tendus avec l'information 횪 propos des d챕placements d챕tect챕s de contenu (d챕tection de renommages et de copies) sont con챌us pour fonctionner avec le diff de deux <arbre-esques> et ne sont pas utilis챕s dans le format de diff combin챕."
#. type: Plain text
-#: en/diff-generate-patch.txt:139
+#: en/diff-generate-patch.txt:143
#, priority:260
msgid "It is followed by two-line from-file/to-file header"
msgstr "Il est suivi par un ent챗te de deux lignes fichier-source/fichier-cible"
#. type: Plain text
-#: en/diff-generate-patch.txt:141 en/diff-generate-patch.txt:152 en/diff-generate-patch.txt:153 en/diff-generate-patch.txt:154
+#: 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 "a/fichier"
#. type: Plain text
-#: en/diff-generate-patch.txt:142 en/diff-generate-patch.txt:155
+#: en/diff-generate-patch.txt:146 en/diff-generate-patch.txt:159
#, priority:260
msgid "b/file"
msgstr "b/fichier"
#. type: Plain text
-#: en/diff-generate-patch.txt:146
+#: 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 "Similaire 횪 l'ent챗te 횪 deux lignes pour le format diff unifi챕 traditionnel, `/dev/null` est utilis챕 pour indiquer un fichier cr챕챕 ou supprim챕."
#. type: Plain text
-#: en/diff-generate-patch.txt:150
+#: 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 "Cependant, si l'option --combined-all-paths est fournie, au lieu des deux lignes de fichier-source/fichier-cible, vous obtenez un en-t챗te de N+1 lignes de fichier-source/fichier-cible, o첫 N est le nombre de parents dans le commit de fusion"
#. type: Plain text
-#: en/diff-generate-patch.txt:159
+#: 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 "Ce format 챕tendu peut 챗tre utile si la d챕tection de renommage ou de copie est active, pour vous permettre de voir le nom original du fichier dans diff챕rents parents."
#. type: Plain text
-#: en/diff-generate-patch.txt:165
-#, 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 for apply. The change is similar to the change in the extended 'index' header:"
+#: en/diff-generate-patch.txt:169
+#, fuzzy, 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 for apply. The change is similar to the change in the extended 'index' header:"
+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 "Le format d'ent챗te de section est modifi챕 pour emp챗cher l'utilisation accidentelle avec `patch -p1`. Le format de diff combin챕 a 챕t챕 cr챕챕 pour les revues des modifications de commits de fusions, et n'챕tait pas destin챕 횪 챗tre appliqu챕. La modification est similaire 횪 la modification dans l'ent챗te 챕tendu d'index혻:"
#. type: Plain text
-#: en/diff-generate-patch.txt:167
+#: en/diff-generate-patch.txt:171
#, no-wrap, priority:260
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr "@@@ <intervalle-de-fichier-source> <intervalle-de-fichier-source> <intervalle-de-fichier-cible> @@@\n"
#. type: Plain text
-#: en/diff-generate-patch.txt:170
+#: 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 "Il y a (nombre de parents + 1) caract챔res `@` dans l'ent챗te de section pour le format de diff combin챕."
#. type: Plain text
-#: en/diff-generate-patch.txt:179
+#: 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 "� la diff챕rence du format diff 'unifi챕' traditionnel qui montre deux fichiers A et B avec une seule colonne qui a un pr챕fixe `-` (moins -- appara챤t dans A mais supprim챕 dans B), `+` (plus -- manquant dans A mais ajout챕 dans B), ou `\" \"` (espace -- non modifi챕), ce format compare un fichier ou plus fichier1, fichier2,�� avec un fichier X, et affiche comment X diff챔re de chaque fichierN. Une colonne pour chaque fichierN est ins챕r챕e dans la sortie pour montrer comment la ligne de X est diff챕rente de la ligne correspondante de celui-ci."
#. type: Plain text
-#: en/diff-generate-patch.txt:185
+#: 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 "Un caract챔re `-` dans la colonne N signifie que la ligne appara챤t dans fichierN mais pas dans le r챕sultat. Un caract챔re `+` dans la colonne N signifie que la ligne appara챤t dans le r챕sultat, et fichierN ne l'a pas (en d'autres termes, la ligne a 챕t챕 ajout챕e du point de vue de ce parent)."
#. type: Plain text
-#: en/diff-generate-patch.txt:191
+#: 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 "Dans l'exemple de sortie ci-dessus, la signature de la fonction a 챕t챕 chang챕e depuis les deux fichiers (d'o첫 les deux suppressions `-` depuis fichier1 et fichier2, plus `++` pour signifier qu'une ligne qui a 챕t챕 ajout챕e n'appara챤t ni dans fichier1 ni dans fichier2). De plus, huit autres lignes sont identiques depuis fichier1 mais n'apparaissent pas dans fichier2 (et sont donc pr챕fix챕es par `+`)."
#. type: Plain text
-#: en/diff-generate-patch.txt:197
+#: 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 "Quand affich챕 par `git diff-tree -c`, les parents du commit de fusion sont compar챕s avec le r챕sultat de fusion (c-횪-d fichier1..fichierN sont les parents)혻; Quand affich챕 par `git diff-files -c`, les deux parents de fusion non r챕solue sont compar챕s avec le fichier dans l'arbre de travail (c-횪-d fichier1 est stage 2, 짬혻notre version혻쨩, fichier2 est stage 3, 짬혻leur version혻쨩)."
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:327 en/merge-options.txt:86
+#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3617,7 +3625,7 @@ msgid "Generate plain patches without any diffstats."
msgstr "G챕n챕rer des correctifs normaux sans aucun diffstat."
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:186 en/git-add.txt:111 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/diff-options.txt:23 en/fetch-options.txt:198 en/git-add.txt:111 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
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
@@ -3641,7 +3649,7 @@ msgid "\tThis is the default.\n"
msgstr "\tC'est l'option par d챕faut.\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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:117 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
+#: 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:118 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"
@@ -4065,7 +4073,7 @@ msgid "Synonym for --dirstat=files,param1,param2..."
msgstr "Synonyme de --dirstat=files,param1,param2...."
#. type: Labeled list
-#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:129
+#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--summary"
msgstr "--summary"
@@ -4089,7 +4097,7 @@ msgid "Synonym for `-p --stat`."
msgstr "Synonyme de `-p --stat`."
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:122 en/git-update-index.txt:168
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:168
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4505,7 +4513,7 @@ msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word
msgstr "횋quivalent 횪 `--word-diff=color` plus (si une regex a 챕t챕 sp챕cifi챕e) `--word-diff-regex=<regex>`."
#. type: Labeled list
-#: en/diff-options.txt:402 en/git-status.txt:139
+#: en/diff-options.txt:402 en/git-status.txt:143
#, ignore-same, no-wrap, priority:280
msgid "--no-renames"
msgstr "--no-renames"
@@ -4608,8 +4616,9 @@ msgstr "Casser les modifications de r챕챕criture compl챔te en paires de suppress
#. type: Plain text
#: en/diff-options.txt:463
-#, priority:280
-msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
+#, fuzzy, priority:280
+#| msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
+msgid "It affects the way a change that amounts to a total rewrite of a file does not appear as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
msgstr "Cela affecte la fa챌on dont un changement qui 챕quivaut 횪 une r챕챕criture totale d'un fichier appara챤t non pas comme une s챕rie de suppressions et d'insertions m챕lang챕es avec quelques lignes qui (par hasard) correspondent entre les deux versions comme contexte, mais comme une simple suppression de tout ce qui est ancien suivi d'une simple insertion de tout ce qui est nouveau, et le nombre `m` contr척le cet aspect de l'option -B (par d챕faut 60혻%). `-B/70%` sp챕cifie que moins de 30혻% de l'original doit rester dans le r챕sultat pour que Git le consid챔re comme une r챕챕criture totale (autrement, la rustine r챕sultante sera une s챕rie de suppressions et d'insertions m챕lang챕es avec des lignes de contexte)."
#. type: Plain text
@@ -4625,7 +4634,7 @@ msgid "-M[<n>]"
msgstr "-M[<n>]"
#. type: Labeled list
-#: en/diff-options.txt:473 en/git-status.txt:143
+#: en/diff-options.txt:473 en/git-status.txt:147
#, no-wrap, priority:280
msgid "--find-renames[=<n>]"
msgstr "--find-renames[=<n>]"
@@ -5063,7 +5072,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr "Faire sortir le programme avec un code similaire 횪 diff(1). Autrement dit, il sort avec 1 s'il y avait des diff챕rences et 0 signifie aucune diff챕rence."
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:203 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:52 en/git-clone.txt:120 en/git-commit.txt:314 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:301 en/git-gc.txt:68 en/git-grep.txt:296 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:315 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:255 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:136 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:215 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:316 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:302 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:256 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5117,7 +5126,7 @@ msgid "Allow (or disallow) external text conversion filters to be run when compa
msgstr "Permettre (ou d챕sactiver) le lancement des filtres externes de conversion en texte lors de la comparaison de fichiers binaires. Voir linkgit:gitattributes[5] pour plus de d챕tails. Comme les filtres textconv sont typiquement des conversions 횪 sens unique, la diff r챕sultante est adapt챕e 횪 la consommation humaine, mais ne peut pas 챗tre appliqu챕e. Pour cette raison, les filtres textconv sont activ챕s par d챕faut seulement pour linkgit:git-diff[1] et linkgit:git-log[1], mais pas pour linkgit:git-format-patch[1] ou les commandes de plomberie de diff."
#. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:85
+#: en/diff-options.txt:722 en/git-status.txt:87
#, no-wrap, priority:280
msgid "--ignore-submodules[=<when>]"
msgstr "--ignore-submodules[=<quand>]"
@@ -5195,7 +5204,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr "Pour une explication plus d챕taill챕e sur ces options communes, voir aussi linkgit:gitdiffcore[7]."
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:265 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:266 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5327,7 +5336,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:48 en/git-commit.txt:317 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:50 en/git-commit.txt:319 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5339,13 +5348,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:34 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:195 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:347 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:278 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:279 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:35 en/git-fast-import.txt:37 en/git-filter-branch.txt:196 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:279 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:280 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5377,7 +5386,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:112 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:113 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5455,7 +5464,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:47 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:97 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:326 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:301 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:85
+#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:98 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:302 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5521,187 +5530,211 @@ msgid "--jobs=<n>"
msgstr "--jobs <n>"
#. type: Plain text
-#: en/fetch-options.txt:167
+#: en/fetch-options.txt:164
+#, priority:220
+msgid "Number of parallel children to be used for all forms of fetching."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:169
+#, priority:220
+msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:172
#, priority:220
-msgid "Number of parallel children to be used for fetching submodules. Each will fetch from different submodules, such that fetching many submodules will be faster. By default submodules will be fetched one at a time."
+msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:168 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:173 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:171
+#: en/fetch-options.txt:176
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:172
+#: en/fetch-options.txt:177 en/git-branch.txt:225 en/git-push.txt:349
+#, ignore-same, no-wrap, priority:240
+msgid "--set-upstream"
+msgstr "--set-upstream"
+
+#. type: Plain text
+#: en/fetch-options.txt:183
+#, priority:220
+msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:184
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr "--submodule-prefix=<chemin>"
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:188
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177
+#: en/fetch-options.txt:189
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:184
+#: en/fetch-options.txt:196
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:199
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:194
+#: en/fetch-options.txt:206
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:195 en/git-clone.txt:182
+#: en/fetch-options.txt:207 en/git-clone.txt:182
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr "--upload-pack <upload-pack>"
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:212
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:202 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:51 en/git-clone.txt:119 en/git-commit.txt:313 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:300 en/git-grep.txt:295 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:314 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:254 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:135
+#: en/fetch-options.txt:214 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:315 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:301 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:255 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:207
+#: en/fetch-options.txt:219
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:208 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:298 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:318 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:139
+#: en/fetch-options.txt:220 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:300 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:209 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:299 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:319 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:140
+#: en/fetch-options.txt:221 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:301 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:211 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:142
+#: en/fetch-options.txt:223 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr "Mode bavard."
#. type: Labeled list
-#: en/fetch-options.txt:213 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:326 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:258 en/git-switch.txt:144 en/merge-options.txt:143
+#: en/fetch-options.txt:225 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:328 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:259 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:218 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:230 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr "L'챕tat d'avancement est affich챕 sur la sortie d'erreur standard quand elle est attach챕e 횪 un terminal, 횪 moins que -q soit sp챕cifi챕. Ce drapeau force l'챕tat d'avancement m챗me si le flux d'erreur standard n'est pas dirig챕 vers un terminal."
#. type: Labeled list
-#: en/fetch-options.txt:219 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:231 en/git-ls-remote.txt:73 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr "-o <option>"
#. type: Labeled list
-#: en/fetch-options.txt:220 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:232 en/git-clone.txt:135 en/git-ls-remote.txt:74
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr "--server-option=<option>"
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-clone.txt:142
+#: en/fetch-options.txt:239 en/git-clone.txt:142
#, priority:300
msgid "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."
msgstr "Transmettre la cha챤ne donn챕e au serveur lors d'une communication utilisant la version 2 du protocole. La cha챤ne donn챕e ne doit pas contenir de caract챔re NUL ou LF. La gestion par le serveur des options du serveur, y compris les options inconnues, est sp챕cifique au serveur. Lorsque plusieurs `---server-option=<option>' sont donn챕s, ils sont tous envoy챕s 횪 l'autre c척t챕 dans l'ordre indiqu챕 sur la ligne de commande."
#. type: Labeled list
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:240
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:233
+#: en/fetch-options.txt:245
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:234
+#: en/fetch-options.txt:246
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:240
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:241 en/git-push.txt:398
+#: en/fetch-options.txt:253 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:242 en/git-push.txt:399
+#: en/fetch-options.txt:254 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:244 en/git-push.txt:401
+#: en/fetch-options.txt:256 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:245 en/git-push.txt:402
+#: en/fetch-options.txt:257 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:246 en/git-push.txt:403
+#: en/fetch-options.txt:258 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:247 en/git-push.txt:405
+#: en/fetch-options.txt:259 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5745,7 +5778,7 @@ msgstr ""
"\t [--chmod=(+|-)x] [--] [<sp챕cificateur de chemin>...]\n"
#. type: Title -
-#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:20 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:67 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
+#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr "DESCRIPTION"
@@ -5787,13 +5820,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr "R챕f챕rez-vous linkgit:git-commit[1] pour des m챕thodes alternatives d'ajout de contenu 횪 une validation."
#. type: Title -
-#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:83 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:85 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:115 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:253 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:86 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:254 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr "OPTIONS"
#. type: Labeled list
-#: en/git-add.txt:52 en/git-grep.txt:308 en/git-status.txt:148
+#: en/git-add.txt:52 en/git-grep.txt:325 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr "<sp챕cificateur de chemin>..."
@@ -5805,7 +5838,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr "Fichiers dont le contenu doit 챗tre ajout챕. Les patrons (ex : `*.c`) permettent de restreindre 횪 tous les fichiers correspondants. Un nom de r챕pertoire (ex : `rep` pour ajouter `rep/fichier1` et `rep/fichier2`) permet d'ajouter r챕cursivement tous les fichiers d'un r챕pertoire (par exemple sp챕cifier `rep` n'enregistrera pas seulement le fichier modifi챕 dans l'arbre de travail `rep/fichier1` ou un fichier ajout챕 `rep/fichier2`, mais aussi un fichier `rep/fichier3` supprim챕 de l'arbre de travail). Veuillez noter que des version anciennes de Git ignoraient les fichiers supprim챕s혻; utilisez l'option `--no-all` si vous souhaitez ajouter les fichiers nouveaux ou modifi챕s mais ignorer les fichiers supprim챕s."
#. type: Plain text
-#: en/git-add.txt:67 en/git-grep.txt:314
+#: en/git-add.txt:67 en/git-grep.txt:331
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr "Pour de plus amples d챕tails sur la syntaxe <sp챕cificateur de chemin>, r챕f챕rez-vous 횪 la section 'pathspec' dans linkgit:gitglossary[7]."
@@ -5823,13 +5856,13 @@ msgid "Allow adding otherwise ignored files."
msgstr "Permettre l'ajout de fichiers qui sont normalement ignor챕s."
#. type: Labeled list
-#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:42 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:394 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:43 en/git-rebase.txt:395 en/git-rebase.txt:536 en/git-svn.txt:297
+#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5853,7 +5886,7 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr "Cela lance effectivement `add --interactive` mais court-circuite le menu initial et saute directement 횪 la sous-commande `patch`. R챕f챕rez-vous 횪 짬혻Mode interactif혻쨩 pour plus de d챕tails."
#. type: Labeled list
-#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:275 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
@@ -5943,7 +5976,7 @@ msgid "This option is primarily to help users who are used to older versions of
msgstr "Cette option sert principalement 횪 aider les utilisateurs de versions anciennes de Git pour lesquels 짬혻git add <chemin>...혻쨩 챕tait synonyme de 짬혻git add --no-all <chemin>...혻쨩, c'est-횪-dire qui ignorait les fichiers effac챕s."
#. type: Labeled list
-#: en/git-add.txt:146 en/git-format-patch.txt:101 en/git-submodule.txt:340
+#: en/git-add.txt:146 en/git-format-patch.txt:102 en/git-submodule.txt:341
#, no-wrap, priority:300
msgid "-N"
msgstr "-N"
@@ -6033,7 +6066,7 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr "Forcer le bit ex챕cutable des fichiers ajout챕s. Le bit ex챕cutable n'est modifi챕 que dans l'index, les fichiers de la copie de travail ne sont pas modifi챕s."
#. type: Labeled list
-#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:343 en/git-grep.txt:304 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
+#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:345 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr "\\--"
@@ -6045,7 +6078,7 @@ msgid "This option can be used to separate command-line options from the list of
msgstr "Cette option permet de s챕parer les options de la ligne de commande de la liste des fichiers (utile si certains noms de fichiers peuvent 챗tre confondus avec des options)."
#. type: Title -
-#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:357 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:153 en/git-fetch.txt:242 en/git-filter-branch.txt:234 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:634 en/git-grep.txt:316 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:206 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:359 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:638 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr "EXEMPLES"
@@ -6087,7 +6120,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr "Comme cet exemple laisse le shell r챕aliser l'expansion de l'ast챕risque (c'est-횪-dire que vous listez explicitement les fichiers du r챕pertoire), il ne traite pas `subdir/git-foo.sh`."
#. type: Title -
-#: en/git-add.txt:221 en/git-rebase.txt:591
+#: en/git-add.txt:221 en/git-rebase.txt:613
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr "MODE INTERACTIF"
@@ -6099,7 +6132,7 @@ msgid "When the command enters the interactive mode, it shows the output of the
msgstr "Quand la commande entre en mode interactif, elle affiche le r챕sultat de la sous-commande 'status', puis entre en boucle de commande interactive."
#. type: Plain text
-#: en/git-add.txt:230 en/git-clean.txt:83
+#: en/git-add.txt:230 en/git-clean.txt:85
#, priority:300
msgid "The command loop shows the list of subcommands available, and gives a prompt \"What now> \". In general, when the prompt ends with a single '>', you can pick only one of the choices given and type return, like this:"
msgstr "La boucle de commande affiche la liste des sous-commandes disponibles et affiche le prompt 짬혻What now>혻쨩 (Que faire maintenant). En g챕n챕ral, lorsque le prompt se termine par un '>' unique, vous ne pouvez choisir qu'une seule des propositions et appuyer Entr챕e, comme cela :"
@@ -6423,7 +6456,7 @@ msgid "modifying the contents of context or removal lines"
msgstr "modification de contenu de contexte ou de lignes supprim챕es"
#. type: Title -
-#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:135 en/git-commit-tree.txt:118 en/git-commit.txt:487 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:241 en/git-fast-import.txt:1503 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:679 en/git-gc.txt:154 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:112 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:247 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:519 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:292 en/git-status.txt:434 en/git-submodule.txt:436 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
+#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:489 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1526 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:683 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:437 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr "VOIR AUSSI"
@@ -6435,13 +6468,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:139 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:495 en/git-config.txt:492 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:245 en/git-fast-import.txt:1507 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:480 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:683 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:334 en/git-gui.txt:126 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:116 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:230 en/git-merge-file.txt:94 en/git-merge-index.txt:78 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1052 en/git-receive-pack.txt:251 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:123 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:523 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:300 en/git-status.txt:438 en/git-stripspace.txt:93 en/git-submodule.txt:440 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
+#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:497 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1530 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:693 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:687 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:441 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
#, no-wrap, priority:300
msgid "GIT"
msgstr "GIT"
#. type: Plain text
-#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:140 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:496 en/git-config.txt:493 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:246 en/git-fast-import.txt:1508 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:481 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:684 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:335 en/git-gui.txt:127 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:117 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:231 en/git-merge-file.txt:95 en/git-merge-index.txt:79 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1053 en/git-receive-pack.txt:252 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:124 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:524 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:301 en/git-status.txt:439 en/git-stripspace.txt:94 en/git-submodule.txt:441 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
+#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:498 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1531 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:694 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:688 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:442 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr "Fait partie de la suite linkgit:git[1]"
@@ -6499,7 +6532,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr "La liste de fichiers de bo챤te aux lettres desquelles on lit les rustines. Si vous ne fournissez pas cet argument, la commande lit depuis l'entr챕e standard. Si vous fournissez des r챕pertoires, ils sont lus comme des Maildirs."
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:118 en/git-rebase.txt:387 en/git-revert.txt:98 en/merge-options.txt:73
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:119 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6541,7 +6574,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr "Avec `--keep-cr`, appeler 'git mailsplit' (voir linkgit:git-mailsplit[1]) avec la m챗me option, pour l'emp챗cher de supprimer les CR en fin de ligne. La variable de configuration `am.keepcr` peut 챗tre utilis챕e pour sp챕cifier le comportement par d챕faut. `--no-keep-cr` permet de surcharger `am.keepcr`."
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:969
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:985
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6571,7 +6604,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr "Ignorer les lignes ciseaux (voir linkgit:git-mailinfo[1])."
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:267 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:989
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1005
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6665,37 +6698,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr "Quand la rustine ne s'applique pas correctement, revenir 횪 une fusion 횪 3 points si la rustine contient l'identit챕 des blobs auxquels elle est suppos챕e s'appliquer et que ces blobs sont disponibles localement. `--no-3way` permet de surcharger la variable de configuration am.threeWay. Pour plus d'information, r챕f챕rez-vous 횪 am.threeWay dans linkgit:git-config[1]."
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:303 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:304 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:307 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:373 en/git-rebase.txt:524
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:374
+#: en/git-am.txt:109 en/git-rebase.txt:396
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr "--whitespace=<option>"
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:337
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
#, no-wrap, priority:100
msgid "-C<n>"
msgstr "-C<n>"
@@ -6755,7 +6788,7 @@ msgid "Run interactively."
msgstr "Lancer de mani챔re interactive."
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:380 en/git-rebase.txt:521
+#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6767,7 +6800,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:381 en/git-rebase.txt:522
+#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6779,7 +6812,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:256 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6791,31 +6824,31 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:333 en/git-rebase.txt:308 en/git-revert.txt:91 en/merge-options.txt:58
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:335 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr "-S[<idcl챕>]"
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:334 en/git-rebase.txt:309 en/git-revert.txt:92 en/merge-options.txt:59
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:336 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr "--gpg-sign[=<idcl챕>]"
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:338 en/git-rebase.txt:313 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:340 en/git-rebase.txt:331 en/git-revert.txt:96
#, priority:280
msgid "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."
msgstr "Signer les commits avec GPG. L'argument `idcl챕` est optionnel avec par d챕faut l'identit챕 du validateur혻; si sp챕cifi챕e, elle doit 챗tre coll챕e 횪 l'option sans aucun espace."
#. type: Labeled list
-#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:228 en/sequencer.txt:1
+#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:246 en/sequencer.txt:1
#, ignore-same, no-wrap, priority:240
msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:406 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:997
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1013
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6845,7 +6878,7 @@ msgid "When a patch failure occurs, <msg> will be printed to the screen before e
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:231 en/sequencer.txt:15
+#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:249 en/sequencer.txt:15
#, ignore-same, no-wrap, priority:240
msgid "--abort"
msgstr "--abort"
@@ -6857,7 +6890,7 @@ msgid "Restore the original branch and abort the patching operation."
msgstr "restaurer la branche originale et abandonner les applications de patch."
#. type: Labeled list
-#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:238 en/sequencer.txt:10
+#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:256 en/sequencer.txt:10
#, ignore-same, no-wrap, priority:240
msgid "--quit"
msgstr "--quit"
@@ -6869,7 +6902,7 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:262
+#: en/git-am.txt:179 en/git-rebase.txt:280
#, ignore-same, no-wrap, priority:100
msgid "--show-current-patch"
msgstr "--show-current-patch"
@@ -6881,7 +6914,7 @@ msgid "Show the patch being applied when \"git am\" is stopped because of confli
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:451 en/git-format-patch.txt:351 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:188 en/git-tag.txt:231
+#: en/git-am.txt:184 en/git-commit.txt:453 en/git-format-patch.txt:355 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr "DISCUSSION"
@@ -6965,7 +6998,7 @@ msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the curren
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:471 en/git-gc.txt:147
+#: en/git-am.txt:234 en/git-commit.txt:473 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr "CROCHETS"
@@ -7063,7 +7096,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr "Prendre le message de validation depuis le fichier indiqu챕. Utilisez '-' pour lire le message depuis l'entr챕e standard."
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:322 en/merge-options.txt:84
+#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -7105,7 +7138,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:291
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:292
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7177,7 +7210,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:342
+#: en/git-apply.txt:134 en/git-rebase.txt:360
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7393,7 +7426,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:330 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:398 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:332 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr "CONFIGURATION"
@@ -9316,7 +9349,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:525
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9352,13 +9385,13 @@ msgid "Sorting and filtering branches are case insensitive."
msgstr "le tri et le filtrage sont non-sensibles 횪 la casse"
#. type: Labeled list
-#: en/git-branch.txt:153 en/git-status.txt:126 en/git-tag.txt:134
+#: en/git-branch.txt:153 en/git-status.txt:130 en/git-tag.txt:134
#, no-wrap, priority:280
msgid "--column[=<options>]"
msgstr "--column[=<options>]"
#. type: Labeled list
-#: en/git-branch.txt:154 en/git-status.txt:127 en/git-tag.txt:135
+#: en/git-branch.txt:154 en/git-status.txt:131 en/git-tag.txt:135
#, ignore-same, no-wrap, priority:280
msgid "--no-column"
msgstr "--no-column"
@@ -9483,12 +9516,6 @@ msgstr "--no-track"
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr "Ne pas renseigner la configuration 짬혻amont혻쨩, m챗me si la configuration branch.autoSetupMerge est true."
-#. type: Labeled list
-#: en/git-branch.txt:225 en/git-push.txt:349
-#, ignore-same, no-wrap, priority:240
-msgid "--set-upstream"
-msgstr "--set-upstream"
-
#. type: Plain text
#: en/git-branch.txt:228
#, priority:240
@@ -9765,7 +9792,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-filter-branch.txt:449 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10385,7 +10412,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:152 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr "SORTIE"
@@ -11034,7 +11061,7 @@ msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will al
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:226
+#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
@@ -11231,7 +11258,7 @@ msgid "Only meaningful with `--stdin`; paths are separated with NUL character in
msgstr ""
#. type: Plain text
-#: en/git-checkout-index.txt:73 en/git-commit.txt:345 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
+#: en/git-checkout-index.txt:73 en/git-commit.txt:347 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
#, priority:280
msgid "Do not interpret any more arguments as options."
msgstr "Ne pas interpr챕ter les arguments qui suivent comme options."
@@ -11570,7 +11597,7 @@ msgid "Quiet, suppress feedback messages."
msgstr "Silencieux, supprimer les messages d'챕tat."
#. type: Labeled list
-#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:144
+#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:152
#, ignore-same, no-wrap, priority:240
msgid "--no-progress"
msgstr "--no-progress"
@@ -11767,7 +11794,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr "En mode d'extraction clairsem챕, `git혻checkout혻--혻<chemins>` mettrait seulement 횪 jour les entr챕es correspondant 횪 <chemins> et aux motifs clairsem챕s dans $GIT_DIR/info/sparse-checkout. Cette option ignore les motifs clairsem챕s et r챕-ajoute tous les fichiers de <chemins>."
#. type: Labeled list
-#: en/git-checkout.txt:241 en/git-rebase.txt:268 en/git-rebase.txt:529 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:354 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
+#: en/git-checkout.txt:241 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:355 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11890,7 +11917,7 @@ msgid "In the default overlay mode, `git checkout` never removes files from the
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:312 en/git-rebase.txt:225 en/git-switch.txt:36
+#: en/git-checkout.txt:312 en/git-rebase.txt:243 en/git-switch.txt:36
#, no-wrap, priority:240
msgid "<branch>"
msgstr "<branche>"
@@ -12682,7 +12709,7 @@ msgid "This option determines how the commit message will be cleaned up before b
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:65 en/git-clean.txt:61
+#: en/git-cherry-pick.txt:65 en/git-clean.txt:63
#, ignore-same, no-wrap, priority:100
msgid "-x"
msgstr "-x"
@@ -12766,7 +12793,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:249 en/git-rebase.txt:532
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:267 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12790,7 +12817,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:282 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:109
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12808,7 +12835,7 @@ msgid "-X<option>"
msgstr "-X<option>"
#. type: Labeled list
-#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:125
#, fuzzy, no-wrap, priority:240
msgid "--strategy-option=<option>"
msgstr "--server-option=<option>"
@@ -13004,7 +13031,7 @@ msgid "Show the commit subjects next to the SHA1s."
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:32 en/git-rebase.txt:220
+#: en/git-cherry.txt:32 en/git-rebase.txt:238
#, fuzzy, no-wrap, priority:100
msgid "<upstream>"
msgstr "amont"
@@ -13022,7 +13049,7 @@ msgid "<head>"
msgstr ""
#. type: Plain text
-#: en/git-cherry.txt:38 en/git-rebase.txt:227
+#: en/git-cherry.txt:38 en/git-rebase.txt:245
#, priority:100
msgid "Working branch; defaults to HEAD."
msgstr ""
@@ -13235,85 +13262,85 @@ msgid "If any optional `<path>...` arguments are given, only those paths are aff
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:33
+#: en/git-clean.txt:35
#, priority:100
-msgid "Remove untracked directories in addition to untracked files. If an untracked directory is managed by a different Git repository, it is not removed by default. Use -f option twice if you really want to remove such a directory."
+msgid "Normally, when no <path> is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. If any paths are specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under `--force`) will be removed."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:41
+#: en/git-clean.txt:43
#, priority:100
-msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f, -n or -i. Git will refuse to delete directories with .git sub directory or file unless a second -f is given."
+msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f or -i. Git will refuse to modify untracked nested git repositories (directories with a .git subdirectory) unless a second -f is given."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:46
+#: en/git-clean.txt:48
#, priority:100
msgid "Show what would be done and clean files interactively. See ``Interactive mode'' for details."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:50
+#: en/git-clean.txt:52
#, priority:100
msgid "Don't actually remove anything, just show what would be done."
msgstr "Ne rien supprimer effectivement, montrer juste ce qui serait fait."
#. type: Plain text
-#: en/git-clean.txt:55
+#: en/git-clean.txt:57
#, priority:100
msgid "Be quiet, only report errors, but not the files that are successfully removed."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:56
+#: en/git-clean.txt:58
#, no-wrap, priority:100
msgid "-e <pattern>"
msgstr "-e <motif>"
#. type: Labeled list
-#: en/git-clean.txt:57 en/git-ls-files.txt:85 en/git-name-rev.txt:33
+#: en/git-clean.txt:59 en/git-ls-files.txt:85 en/git-name-rev.txt:33
#, no-wrap, priority:100
msgid "--exclude=<pattern>"
msgstr "--exclude=<motif>"
#. type: Plain text
-#: en/git-clean.txt:60
+#: en/git-clean.txt:62
#, priority:100
msgid "Use the given exclude pattern in addition to the standard ignore rules (see linkgit:gitignore[5])."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:68
+#: en/git-clean.txt:70
#, priority:100
msgid "Don't use the standard ignore rules (see linkgit:gitignore[5]), but still use the ignore rules given with `-e` options from the command line. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git restore' or 'git reset') to create a pristine working directory to test a clean build."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:69
+#: en/git-clean.txt:71
#, no-wrap, priority:100
msgid "-X"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:72
+#: en/git-clean.txt:74
#, priority:100
msgid "Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files."
msgstr ""
#. type: Title -
-#: en/git-clean.txt:74
+#: en/git-clean.txt:76
#, no-wrap, priority:100
msgid "Interactive mode"
msgstr "Mode interactif"
#. type: Plain text
-#: en/git-clean.txt:78
+#: en/git-clean.txt:80
#, priority:100
msgid "When the command enters the interactive mode, it shows the files and directories to be cleaned, and goes into its interactive command loop."
msgstr "Quand la commande entre en mode interactif, elle affiche les fichiers et r챕pertoires 횪 supprimer, puis entre en boucle de commande interactive."
#. type: delimited block -
-#: en/git-clean.txt:89
+#: en/git-clean.txt:91
#, no-wrap, priority:100
msgid ""
" *** Commands ***\n"
@@ -13327,91 +13354,91 @@ msgstr ""
" What now> 1\n"
#. type: Plain text
-#: en/git-clean.txt:92
+#: en/git-clean.txt:94
#, priority:100
msgid "You also could say `c` or `clean` above as long as the choice is unique."
msgstr "Vous pouvez indiquer `c` ou `clean` ci-dessus, 횪 condition que le choix soit unique."
#. type: Plain text
-#: en/git-clean.txt:94
+#: en/git-clean.txt:96
#, priority:100
msgid "The main command loop has 6 subcommands."
msgstr "La boucle de commande principale propose 6 sous-commandes."
#. type: Labeled list
-#: en/git-clean.txt:95
+#: en/git-clean.txt:97
#, no-wrap, priority:100
msgid "clean"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:98
+#: en/git-clean.txt:100
#, priority:100
msgid "Start cleaning files and directories, and then quit."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:99
+#: en/git-clean.txt:101
#, no-wrap, priority:100
msgid "filter by pattern"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:107
+#: en/git-clean.txt:109
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Input ignore patterns>>\" prompt. You can input space-separated patterns to exclude files and directories from deletion. E.g. \"*.c *.h\" will excludes files end with \".c\" and \".h\" from deletion. When you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:108
+#: en/git-clean.txt:110
#, no-wrap, priority:100
msgid "select by numbers"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:119
+#: en/git-clean.txt:121
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Select items to delete>>\" prompt. When the prompt ends with double '>>' like this, you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything. Also when you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr "Affiche les fichiers et les r챕pertoires 횪 supprimer et un prompt \"Slect items to delete>>\". Quand le prompt se termine par un double '>', comme ceci, vous pouvez s챕lectionner plus d'une option, concat챕n챕es avec des espaces ou des virgules. Vous pouvez aussi indiquer des intervalles. Par exemple \"2-5 7,9\" pour choisir 2, 3, 4, 5, 7 et 9 dans la liste. Si le second nombre d'un intervalle est absent, tous les items restants sont s챕lectionn챕s. Par ex. \"7-\" choisit 7, 8 et 9 dans la liste. Vous pouvez indiquer '*' pour tout s챕lectionner. Enfin, quand le resultat filtr챕 est satisfaisant, pressez ENTR횋E (vide) pour retourner au menu principal."
#. type: Labeled list
-#: en/git-clean.txt:120
+#: en/git-clean.txt:122
#, no-wrap, priority:100
msgid "ask each"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:125
+#: en/git-clean.txt:127
#, priority:100
msgid "This will start to clean, and you must confirm one by one in order to delete items. Please note that this action is not as efficient as the above two actions."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:126
+#: en/git-clean.txt:128
#, fuzzy, no-wrap, priority:100
msgid "quit"
msgstr "quiet"
#. type: Plain text
-#: en/git-clean.txt:129
+#: en/git-clean.txt:131
#, priority:100
msgid "This lets you quit without do cleaning."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:130
+#: en/git-clean.txt:132
#, no-wrap, priority:100
msgid "help"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:133
+#: en/git-clean.txt:135
#, priority:100
msgid "Show brief usage of interactive git-clean."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:137 en/git-status.txt:436
+#: en/git-clean.txt:139 en/git-status.txt:440
#, ignore-same, priority:280
msgid "linkgit:gitignore[5]"
msgstr "linkgit:gitignore[5]"
@@ -13569,7 +13596,7 @@ msgstr ""
"l'option `--dissociate`.\n"
#. type: Labeled list
-#: en/git-clone.txt:108 en/git-submodule.txt:392
+#: en/git-clone.txt:108 en/git-submodule.txt:393
#, ignore-same, no-wrap, priority:300
msgid "--dissociate"
msgstr "--dissociate"
@@ -13815,13 +13842,13 @@ msgid "Instead of placing the cloned repository where it is supposed to be, plac
msgstr "Au lieu de placer le d챕p척t clone l횪 o첫 il est suppos챕 챗tre, placer le d챕p척t clone dans le r챕pertoire sp챕cifi챕, puis cr챕er un lien symbolique Git ind챕pendant du syst챔me de fichiers. Le r챕sultat est un d챕p척t Git qui est s챕par챕 de son arbre de travail."
#. type: Labeled list
-#: en/git-clone.txt:277 en/git-submodule.txt:416
+#: en/git-clone.txt:277 en/git-submodule.txt:417
#, no-wrap, priority:300
msgid "-j <n>"
msgstr "-j <n>"
#. type: Labeled list
-#: en/git-clone.txt:278 en/git-submodule.txt:417
+#: en/git-clone.txt:278 en/git-submodule.txt:418
#, no-wrap, priority:300
msgid "--jobs <n>"
msgstr "--jobs <n>"
@@ -14190,7 +14217,7 @@ msgid "Read the commit log message from the given file. Use `-` to read from the
msgstr "Lire le message de validation depuis le fichier indiqu챕. Utilisez '-' pour lire le message depuis l'entr챕e standard."
#. type: Labeled list
-#: en/git-commit-tree.txt:68 en/git-commit.txt:339
+#: en/git-commit-tree.txt:68 en/git-commit.txt:341
#, ignore-same, no-wrap, priority:280
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
@@ -14274,7 +14301,7 @@ msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:477 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:428 en/git-svn.txt:1156
+#: en/git-commit-tree.txt:114 en/git-commit.txt:479 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:429 en/git-svn.txt:1156
#, no-wrap, priority:280
msgid "FILES"
msgstr "FICHIERS"
@@ -14586,13 +14613,13 @@ msgid "When editing the commit message, start the editor with the contents in th
msgstr "� l'챕dition du message de validation, d챕marrer l'챕diteur avec le contenu du fichier indiqu챕. La variable de configuration `commit.template` est souvent utilis챕e pour fournir implicitement cette option 횪 la commande. Ce m챕canisme peut 챗tre utilis챕 par les projets qui souhaitent guider les collaborateurs avec une aide sur ce qu'il faut 챕crire dans le message et dans quel ordre. Si l'utilisateur sort de l'챕diteur sans changer le message, la validation est annul챕e. Ceci n'a aucun effet quand un message est fourni par un autre moyen, par exemple par les options `-m` ou `-F`."
#. type: Plain text
-#: en/git-commit.txt:173 en/merge-options.txt:81
+#: en/git-commit.txt:173 en/merge-options.txt:85
#, priority:280
msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)."
msgstr "Ajouter une ligne Signed-off-by du validateur 횪 la fin du message de validation. La signification de signoff d챕pend du projet, mais ceci certifie typiquement que le validateur a les droits de soumettre son travail sous la m챗me licence et accepte un Certificat d'Origine de D챕veloppeur (voir http://developercertificate.org/ pour plus d'information)."
#. type: Labeled list
-#: en/git-commit.txt:175 en/git-rebase.txt:330
+#: en/git-commit.txt:175 en/git-rebase.txt:348 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14802,115 +14829,115 @@ msgid "Show untracked files."
msgstr "Montrer les fichiers non-suivis."
#. type: Plain text
-#: en/git-commit.txt:288
+#: en/git-commit.txt:289
#, priority:280
msgid "The mode parameter is optional (defaults to 'all'), and is used to specify the handling of untracked files; when -u is not used, the default is 'normal', i.e. show untracked files and directories."
msgstr "Le param챔tre de mode est optionnel (par d챕faut, 'all') et sert 횪 sp챕cifier la gestion des fichiers non suivis ; quand -u n'est pas utilis챕, le mode par d챕faut est 'normal', c'est-횪-dire montrer les fichiers et les dossiers non-suivis."
#. type: Plain text
-#: en/git-commit.txt:290 en/git-status.txt:67 en/git-status.txt:107
+#: en/git-commit.txt:291 en/git-status.txt:68 en/git-status.txt:110
#, priority:280
msgid "The possible options are:"
msgstr "Les options possibles sont혻:"
#. type: Plain text
-#: en/git-commit.txt:292
+#: en/git-commit.txt:293
#, no-wrap, priority:280
msgid "'no' - Show no untracked files\n"
msgstr "'no' - Ne montrer aucun fichier non-suivi\n"
#. type: Plain text
-#: en/git-commit.txt:293
+#: en/git-commit.txt:294
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories\n"
msgstr "'normal' - Montrer les fichiers non-suivis et les dossiers dont le contenu est non-suivi\n"
#. type: Plain text
-#: en/git-commit.txt:294 en/git-status.txt:71
+#: en/git-commit.txt:295 en/git-status.txt:72
#, no-wrap, priority:280
msgid "'all' - Also shows individual files in untracked directories.\n"
msgstr "'all' - Montrer aussi les fichiers dans les dossiers dont le contenu n'est pas suivi.\n"
#. type: Plain text
-#: en/git-commit.txt:297 en/git-status.txt:84
+#: en/git-commit.txt:298 en/git-status.txt:85
#, priority:280
msgid "The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]."
msgstr "La valeur par d챕faut est contenue dans la variable de configuration status.showUntrackedFiles document챕e dans linkgit:git-config[1]."
#. type: Plain text
-#: en/git-commit.txt:308
+#: en/git-commit.txt:310
#, priority:280
msgid "Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template to help the user describe the commit by reminding what changes the commit has. Note that this diff output doesn't have its lines prefixed with '#'. This diff will not be a part of the commit message. See the `commit.verbose` configuration variable in linkgit:git-config[1]."
msgstr "Afficher en bas du mod챔le de message de validation un diff unifi챕 entre le commit HEAD et ce qui serait valid챕 pour aider l'utilisateur 횪 d챕crire le commit en lui rappelant les modifications qui seront valid챕es. Veuillez noter que cette sortie de diff n'est pas pr챕fix챕e par des '#'. Elle ne fera pas pour autant partie du message de validation. R챕f챕rez-vous 횪 la variable de configuration `commit.verbose` dans linkgit:git-config[1]."
#. type: Plain text
-#: en/git-commit.txt:312
+#: en/git-commit.txt:314
#, priority:280
msgid "If specified twice, show in addition the unified diff between what would be committed and the worktree files, i.e. the unstaged changes to tracked files."
msgstr "Si sp챕cifi챕 deux fois, afficher en plus le diff unifi챕 entre ce qui serait valid챕 et les fichiers de l'arbre de travail, c'est-횪-dire les modifications non-index챕es des fichiers suivis."
#. type: Plain text
-#: en/git-commit.txt:316
+#: en/git-commit.txt:318
#, priority:280
msgid "Suppress commit summary message."
msgstr "Supprimer le message de r챕sum챕 de commit."
#. type: Plain text
-#: en/git-commit.txt:321
+#: en/git-commit.txt:323
#, priority:280
msgid "Do not create a commit, but show a list of paths that are to be committed, paths with local changes that will be left uncommitted and paths that are untracked."
msgstr "Ne pas cr챕er de commit, mais montrer une liste des chemins qui seront valid챕s, une de ceux contenant des modifications locales et qui ne seront pas valid챕s, et une de ceux non-suivis."
#. type: Labeled list
-#: en/git-commit.txt:322
+#: en/git-commit.txt:324
#, ignore-same, no-wrap, priority:280
msgid "--status"
msgstr "--status"
#. type: Plain text
-#: en/git-commit.txt:327
+#: en/git-commit.txt:329
#, priority:280
msgid "Include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the commit message. Defaults to on, but can be used to override configuration variable commit.status."
msgstr "Inclure la sortie de linkgit:git-status[1] dans le mod챔le de message de validation lors de l'utilisation d'un 챕diteur pour pr챕parer le message de validation. Activ챕 par d챕faut, mais peut surcharger la variable de configuration commit.status."
#. type: Labeled list
-#: en/git-commit.txt:328
+#: en/git-commit.txt:330
#, ignore-same, no-wrap, priority:280
msgid "--no-status"
msgstr "--no-status"
#. type: Plain text
-#: en/git-commit.txt:332
+#: en/git-commit.txt:334
#, priority:280
msgid "Do not include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the default commit message."
msgstr "Ne pas inclure la sortie de linkgit:git-status[1] dans le mod챔le de message de validation lors de l'utilisation d'un 챕diteur pour pr챕parer le message de validation par d챕faut."
#. type: Plain text
-#: en/git-commit.txt:342
+#: en/git-commit.txt:344
#, priority:280
msgid "Countermand `commit.gpgSign` configuration variable that is set to force each and every commit to be signed."
msgstr "Annuler la variable de configuration `commit.gpgSign` qui force tous les commits 횪 챗tre sign챕s."
#. type: Labeled list
-#: en/git-commit.txt:346 en/git-rm.txt:29
+#: en/git-commit.txt:348 en/git-rm.txt:29
#, ignore-ellipsis, no-wrap, priority:280
msgid "<file>..."
msgstr "<fichier>..."
#. type: Plain text
-#: en/git-commit.txt:352
+#: en/git-commit.txt:354
#, priority:280
msgid "When files are given on the command line, the command commits the contents of the named files, without recording the changes already staged. The contents of these files are also staged for the next commit on top of what have been staged before."
msgstr "Quand des chemins sont fournis sur la ligne de commande, la commande valide le contenu des fichiers sp챕cifi챕s, sans enregistrer les modifications d챕j횪 index챕es. Le contenu de ces fichiers est aussi index챕 pour le commit suivant par-dessus ce qui a 챕t챕 index챕 auparavant."
#. type: Plain text
-#: en/git-commit.txt:369
+#: en/git-commit.txt:371
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr "Lors de l'enregistrement de votre propre travail, le contenu des fichiers modifi챕s dans votre arbre de travail est temporairement stock챕 au moyen de `git add` dans une zone de stockage interm챕diaire appel챕e 짬혻l'index혻쨩. Un fichier peut n'챗tre ramen챕 횪 son contenu correspondant au dernier commit seulement dans l'index mais pas dans l'arbre de travail gr창ce 횪 `git restore --staged <fichier>`, ce qui inverse effectivement le 'git add' et emp챗che les modifications de ce fichier de participer 횪 la prochaine validation. Apr챔s avoir construit l'챕tat 횪 valider de mani챔re incr챕mentale avec ces commandes, `git commit` (sans aucun nom de chemin en param챔tre) sert 횪 enregistrer ce qui a 챕t챕 pr챕par챕 jusqu'ici. C'est la forme la plus simple de la commande. Par exemple혻:"
#. type: delimited block -
-#: en/git-commit.txt:375
+#: en/git-commit.txt:377
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14924,13 +14951,13 @@ msgstr ""
"$ git commit\n"
#. type: Plain text
-#: en/git-commit.txt:383
+#: en/git-commit.txt:385
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr "Au lieu d'indexer les fichiers apr챔s chaque modification individuelle, vous pouvez ordonner 횪 `git commit` d'inspecter les modifications des fichiers dont le contenu est d챕j횪 suivi dans votre arbre de travail et de r챕aliser les `git add` et `git rm` correspondant pour vous. De fait, l'exemple suivant fait la m챗me chose que l'exemple pr챕c챕dent si aucune autre modification n'a eu lieu dans votre arbre de travail혻:"
#. type: delimited block -
-#: en/git-commit.txt:388
+#: en/git-commit.txt:390
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14942,19 +14969,19 @@ msgstr ""
"$ git commit -a\n"
#. type: Plain text
-#: en/git-commit.txt:393
+#: en/git-commit.txt:395
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr "La commande `git commit -a` inspecte votre arbre de travail, remarque que vous avez modifi챕 hello.c et supprim챕 goodbye.c, puis r챕alise les `git add` et `git rm` n챕cessaires pour vous."
#. type: Plain text
-#: en/git-commit.txt:398
+#: en/git-commit.txt:400
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr "Apr챔s l'indexation des modifications de nombreux fichiers, vous pouvez modifier l'ordre dans lequel les modifications sont enregistr챕es, en fournissant des chemins 횪 `git commit`. Quand ces chemins sont fournis, la commande cr챕e un commit qui n'enregistre que les modifications des chemins indiqu챕s혻:"
#. type: delimited block -
-#: en/git-commit.txt:404
+#: en/git-commit.txt:406
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14968,31 +14995,31 @@ msgstr ""
"$ git commit Makefile\n"
#. type: Plain text
-#: en/git-commit.txt:411
+#: en/git-commit.txt:413
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr "Ceci cr챕e un commit qui enregistre les modifications de `Makefile`. Les modifications index챕es pour `hello.c` et `hello.h` ne sont pas incluses dans le commit r챕sultant. Cependant, leurs modifications ne sont pas perdues -- elles sont toujours index챕es et simplement suspendues. Apr챔s la s챕quence ci-dessus, si vous faites혻:"
#. type: delimited block -
-#: en/git-commit.txt:414 en/git-commit.txt:440
+#: en/git-commit.txt:416 en/git-commit.txt:442
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr "$ git commit\n"
#. type: Plain text
-#: en/git-commit.txt:418
+#: en/git-commit.txt:420
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr "cette seconde validation enregistrerait les modifications de `hello.c` et `hello.h` comme attendu."
#. type: Plain text
-#: en/git-commit.txt:426
+#: en/git-commit.txt:428
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr "Apr챔s l'arr챗t d'une fusion (commenc챕e avec `git merge` ou `git pull`) pour cause de conflit, les chemins fusionn챕s proprement sont d챕j횪 index챕s pour vous, et les chemins en conflit sont laiss챕s dans un 챕tat non-fusionn챕. Vous auriez 횪 chercher d'abord les chemins en conflit avec `git status` et apr챔s les avoir corrig챕s manuellement dans votre copie de travail, vous les indexeriez comme d'habitude avec `git add`혻:"
#. type: delimited block -
-#: en/git-commit.txt:432
+#: en/git-commit.txt:434
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -15006,55 +15033,55 @@ msgstr ""
"$ git add hello.c\n"
#. type: Plain text
-#: en/git-commit.txt:437
+#: en/git-commit.txt:439
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr "Apr챔s avoir r챕solu les conflits et index챕 le r챕sultat, `git ls-files -u` arr챗terait de mentionner les chemins en conflit. Quand vous avez termin챕, lancez `git commit` pour finaliser la validation de la fusion혻:"
#. type: Plain text
-#: en/git-commit.txt:448
+#: en/git-commit.txt:450
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr "Comme dans le cas de la validation de vos propres modifications, vous pouvez utiliser l'option `-a` pour vous 챕pargner de la frappe. Une diff챕rence est que pendant la r챕solution de fusion, vous ne pouvez pas utiliser `git commit` avec des noms de chemin pour changer l'ordre des modifications 횪 valider, parce que la fusion doit 챗tre enregistr챕e comme un commit unique. En fait, la commande refuse d'챗tre lanc챕e avec des noms de chemin (voir par contre l'option `-i`)."
#. type: Plain text
-#: en/git-commit.txt:460
+#: en/git-commit.txt:462
#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr "Bien que 챌a ne soit pas requis, c'est une bonne pratique de commencer les messages de validation avec une seule ligne courte (moins de 50 caract챔res) pour r챕sumer la modification, suivie d'une ligne blanche, suivie d'un description plus pr챕cise. Le texte jusqu'횪 la ligne vide du message de validation est trait챕 comme le titre du commit, et ce titre est utilis챕 extensivement dans Git. Par exemple, linkgit:git-format-patch[1] transforme un commit en courriel et utilise le titre comme sujet et le reste du texte comme corps."
#. type: Title -
-#: en/git-commit.txt:464
+#: en/git-commit.txt:466
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr "ENVIRONNEMENT ET VARIABLES DE CONFIGURATION"
#. type: Plain text
-#: en/git-commit.txt:469
+#: en/git-commit.txt:471
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr "L'챕diteur utilis챕 pour 챕diter le message de validation sera choisi dans l'ordre de recherche depuis la variable d'environnement `GIT_EDITOR`, puis depuis la variable de configuration `core.editor`, puis depuis la variable d'environnement `VISUAL` ou la variable d'environnement `EDITOR`. Voir linkgit:git-var[1] pour plus de d챕tails."
#. type: Plain text
-#: en/git-commit.txt:475
+#: en/git-commit.txt:477
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr "Cette commande peut lancer les crochets `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` et `post-rewrite`. Voir linkgit:githooks[5] pour de plus amples informations."
#. type: Labeled list
-#: en/git-commit.txt:479
+#: en/git-commit.txt:481
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr "`$GIT_DIR/COMMIT_EDITMSG`"
#. type: Plain text
-#: en/git-commit.txt:485
+#: en/git-commit.txt:487
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr "Ce fichier contient le message de validation en cours. Si `git commit` sort 횪 cause d'une erreur avant de cr챕er un commit, tout message de validation fourni par l'utilisateur (par exemple dans une session d'챕diteur) sera disponible dans ce fichier, mais sera 챕cras챕 par l'invocation suivante de `git commit`."
#. type: Plain text
-#: en/git-commit.txt:493
+#: en/git-commit.txt:495
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -15722,211 +15749,211 @@ msgstr ""
msgid "Given a .git/config like this:"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:347
+#. type: delimited block -
+#: en/git-config.txt:348
#, no-wrap, priority:100
msgid ""
-"\t#\n"
-"\t# This is the config file, and\n"
-"\t# a '#' or ';' character indicates\n"
-"\t# a comment\n"
-"\t#\n"
+"#\n"
+"# This is the config file, and\n"
+"# a '#' or ';' character indicates\n"
+"# a comment\n"
+"#\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:352
+#. type: delimited block -
+#: en/git-config.txt:353 en/git.txt:310
#, no-wrap, priority:100
msgid ""
-"\t; core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"; core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:357
+#. type: delimited block -
+#: en/git-config.txt:358
#, no-wrap, priority:100
msgid ""
-"\t; Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"; Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:362
+#. type: delimited block -
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
-"\t; Proxy settings\n"
-"\t[core]\n"
-"\t\tgitproxy=proxy-command for kernel.org\n"
-"\t\tgitproxy=default-proxy ; for all the rest\n"
+"; Proxy settings\n"
+"[core]\n"
+"\tgitproxy=proxy-command for kernel.org\n"
+"\tgitproxy=default-proxy ; for all the rest\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:369
+#. type: delimited block -
+#: en/git-config.txt:370
#, no-wrap, priority:100
msgid ""
-"\t; HTTP\n"
-"\t[http]\n"
-"\t\tsslVerify\n"
-"\t[http \"https://weak.example.com\"]\n"
-"\t\tsslVerify = false\n"
-"\t\tcookieFile = /tmp/cookie.txt\n"
+"; HTTP\n"
+"[http]\n"
+"\tsslVerify\n"
+"[http \"https://weak.example.com\"]\n"
+"\tsslVerify = false\n"
+"\tcookieFile = /tmp/cookie.txt\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:371
+#: en/git-config.txt:373
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:374
+#: en/git-config.txt:376
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:379
+#: en/git-config.txt:381
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:382
+#: en/git-config.txt:384
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:385
+#: en/git-config.txt:387
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:389
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:390
+#: en/git-config.txt:392
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:394
+#: en/git-config.txt:396
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:398
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:399
+#: en/git-config.txt:401
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:402 en/git-gui.txt:120 en/git-merge-index.txt:64
+#: en/git-config.txt:404 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:407
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:410
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:413
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:414
+#: en/git-config.txt:416
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:417
+#: en/git-config.txt:419
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:421
+#: en/git-config.txt:423
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:424
+#: en/git-config.txt:426
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:428
+#: en/git-config.txt:430
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:431
+#: en/git-config.txt:433
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:434
+#: en/git-config.txt:436
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:437
+#: en/git-config.txt:439
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:440
+#: en/git-config.txt:442
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:443
+#: en/git-config.txt:445
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:447
+#: en/git-config.txt:449
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:453
+#: en/git-config.txt:455
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15936,13 +15963,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:457
+#: en/git-config.txt:459
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:466
+#: en/git-config.txt:468
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15955,19 +15982,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:471 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1029 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
+#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr "BOGUES"
#. type: Plain text
-#: en/git-config.txt:476
+#: en/git-config.txt:478
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:482
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15975,13 +16002,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:483
+#: en/git-config.txt:485
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:488
+#: en/git-config.txt:490
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -17344,7 +17371,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
msgstr ""
#. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:234
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
#, no-wrap, priority:100
msgid "LIMITATIONS"
msgstr ""
@@ -18862,7 +18889,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr "Par d챕faut, la diff챕rence est calcul챕e contre notre branche (-2) et les chemins r챕solus proprement. L'option -0 peut 챗tre fournie pour omettre la sortie pour les entr챕es non fusionn챕es et afficher juste 짬혻non fusionn챕혻쨩."
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:976
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:992
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19414,7 +19441,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:422
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:423
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr "<chemin>..."
@@ -19510,13 +19537,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:982
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:998
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:988
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1004
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr "Cet indicateur fait en sorte que les diffs combin챕s (utilis챕s pour les commits de fusion) listent le nom du fichier de tous les parents. Il n'a donc d'effet que lorsque -c ou --cc sont sp챕cifi챕s, et n'est probablement utile que si des changements de nom de fichier sont d챕tect챕s (c.-횪-d. lorsque la d챕tection de renommage ou de copie a 챕t챕 demand챕e)."
@@ -19890,9 +19917,9 @@ msgid "This program dumps the given revisions in a form suitable to be piped int
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:22
+#: en/git-fast-export.txt:23
#, priority:100
-msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a kind of an interactive 'git filter-branch'."
+msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
@@ -19979,146 +20006,158 @@ msgstr "--import-marks=<fichier>"
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
+#. type: Labeled list
+#: en/git-fast-export.txt:79
+#, ignore-same, no-wrap, priority:100
+msgid "--mark-tags"
+msgstr "--mark-tags"
+
+#. type: Plain text
+#: en/git-fast-export.txt:87
+#, priority:100
+msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
+msgstr ""
+
#. type: Plain text
-#: en/git-fast-export.txt:83
+#: en/git-fast-export.txt:92
#, priority:100
-msgid "Any commits that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
+msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:84
+#: en/git-fast-export.txt:93
#, ignore-same, no-wrap, priority:100
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
-#: en/git-fast-export.txt:89
+#: en/git-fast-export.txt:98
#, priority:100
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:90
+#: en/git-fast-export.txt:99
#, ignore-same, no-wrap, priority:100
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
-#: en/git-fast-export.txt:93
+#: en/git-fast-export.txt:102
#, priority:100
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:94
+#: en/git-fast-export.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
-#: en/git-fast-export.txt:101
+#: en/git-fast-export.txt:110
#, priority:100
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
+#: en/git-fast-export.txt:111 en/git-ls-tree.txt:72
#, ignore-same, no-wrap, priority:100
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
-#: en/git-fast-export.txt:107
+#: en/git-fast-export.txt:116
#, priority:100
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:108
+#: en/git-fast-export.txt:117
#, ignore-same, no-wrap, priority:100
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
-#: en/git-fast-export.txt:112
+#: en/git-fast-export.txt:121
#, priority:100
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:113
+#: en/git-fast-export.txt:122
#, ignore-same, no-wrap, priority:100
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
-#: en/git-fast-export.txt:124
+#: en/git-fast-export.txt:133
#, priority:100
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:125
+#: en/git-fast-export.txt:134
#, ignore-same, no-wrap, priority:100
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
-#: en/git-fast-export.txt:131
+#: en/git-fast-export.txt:140
#, priority:100
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:132
+#: en/git-fast-export.txt:141
#, no-wrap, priority:100
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:138
+#: en/git-fast-export.txt:147
#, priority:100
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be reencoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:139
+#: en/git-fast-export.txt:148
#, ignore-same, no-wrap, priority:100
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
-#: en/git-fast-export.txt:142
+#: en/git-fast-export.txt:151
#, priority:100
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:143
+#: en/git-fast-export.txt:152
#, ignore-ellipsis, no-wrap, priority:100
msgid "[<git-rev-list-args>...]"
msgstr "[<git-rev-list-args>...]"
#. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:160
#, priority:100
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:157
+#: en/git-fast-export.txt:166
#, no-wrap, priority:100
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:162
+#: en/git-fast-export.txt:171
#, priority:100
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:167
+#: en/git-fast-export.txt:176
#, no-wrap, priority:100
msgid ""
"$ git fast-export master~5..master |\n"
@@ -20127,55 +20166,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:180
#, priority:100
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:175
+#: en/git-fast-export.txt:184
#, priority:100
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
-#: en/git-fast-export.txt:178
+#: en/git-fast-export.txt:187
#, no-wrap, priority:100
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:186
+#: en/git-fast-export.txt:195
#, priority:100
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:198
+#: en/git-fast-export.txt:207
#, priority:100
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:201
+#: en/git-fast-export.txt:210
#, priority:100
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:204
+#: en/git-fast-export.txt:213
#, no-wrap, priority:100
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:209
+#: en/git-fast-export.txt:218
#, priority:100
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:215
+#: en/git-fast-export.txt:224
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git init anon-repo\n"
@@ -20185,25 +20224,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:222
+#: en/git-fast-export.txt:231
#, priority:100
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:225
+#: en/git-fast-export.txt:234
#, no-wrap, priority:100
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:240
#, priority:100
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:239
+#: en/git-fast-export.txt:248
#, priority:100
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
@@ -20437,7 +20476,7 @@ msgid "See linkgit:git-config[1]"
msgstr "Voir linkgit:git-config[1]"
#. type: Title -
-#: en/git-fast-import.txt:144 en/git-p4.txt:507
+#: en/git-fast-import.txt:144 en/git-filter-branch.txt:463 en/git-p4.txt:507
#, no-wrap, priority:100
msgid "PERFORMANCE"
msgstr ""
@@ -20671,7 +20710,7 @@ msgid "fast-import accepts several commands to update the current repository and
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:319 en/git-fast-import.txt:381
+#: en/git-fast-import.txt:319 en/git-fast-import.txt:388
#, ignore-same, no-wrap, priority:100
msgid "`commit`"
msgstr "`commit`"
@@ -20683,7 +20722,7 @@ msgid "Creates a new branch or updates an existing branch by creating a new comm
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:324 en/git-fast-import.txt:771
+#: en/git-fast-import.txt:324 en/git-fast-import.txt:778
#, ignore-same, no-wrap, priority:100
msgid "`tag`"
msgstr "`tag`"
@@ -20695,7 +20734,7 @@ msgid "Creates an annotated tag object from an existing commit or branch. Light
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:330 en/git-fast-import.txt:815
+#: en/git-fast-import.txt:330 en/git-fast-import.txt:823
#, ignore-same, no-wrap, priority:100
msgid "`reset`"
msgstr "`reset`"
@@ -20707,7 +20746,7 @@ msgid "Reset an existing branch (or a new branch) to a specific revision. This
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:335 en/git-fast-import.txt:844
+#: en/git-fast-import.txt:335 en/git-fast-import.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`blob`"
msgstr "`blob`"
@@ -20719,109 +20758,121 @@ msgid "Convert raw file data into a blob, for future use in a `commit` command.
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:340 en/git-fast-import.txt:917
+#: en/git-fast-import.txt:340 en/git-fast-import.txt:925
+#, ignore-same, no-wrap, priority:100
+msgid "`alias`"
+msgstr "`alias`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:346
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
+msgstr ""
+
+#. type: Title ~
+#: en/git-fast-import.txt:347 en/git-fast-import.txt:940
#, ignore-same, no-wrap, priority:100
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
-#: en/git-fast-import.txt:345
+#: en/git-fast-import.txt:352
#, priority:100
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:346 en/git-fast-import.txt:945
+#: en/git-fast-import.txt:353 en/git-fast-import.txt:968
#, ignore-same, no-wrap, priority:100
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
-#: en/git-fast-import.txt:350
+#: en/git-fast-import.txt:357
#, priority:100
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:351 en/git-fast-import.txt:1152
+#: en/git-fast-import.txt:358 en/git-fast-import.txt:1175
#, ignore-same, no-wrap, priority:100
msgid "`done`"
msgstr "`done`"
#. type: Plain text
-#: en/git-fast-import.txt:355
+#: en/git-fast-import.txt:362
#, priority:100
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:356 en/git-fast-import.txt:970
+#: en/git-fast-import.txt:363 en/git-fast-import.txt:993
#, ignore-same, no-wrap, priority:100
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
-#: en/git-fast-import.txt:360
+#: en/git-fast-import.txt:367
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:361 en/git-fast-import.txt:985
+#: en/git-fast-import.txt:368 en/git-fast-import.txt:1008
#, ignore-same, no-wrap, priority:100
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
-#: en/git-fast-import.txt:365
+#: en/git-fast-import.txt:372
#, priority:100
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:366 en/git-fast-import.txt:1016
+#: en/git-fast-import.txt:373 en/git-fast-import.txt:1039
#, ignore-same, no-wrap, priority:100
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
-#: en/git-fast-import.txt:370
+#: en/git-fast-import.txt:377
#, priority:100
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:371 en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:378 en/git-fast-import.txt:1092
#, ignore-same, no-wrap, priority:100
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
#, priority:100
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:1124
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:1147
#, ignore-same, no-wrap, priority:100
msgid "`option`"
msgstr "`option`"
#. type: Plain text
-#: en/git-fast-import.txt:379
+#: en/git-fast-import.txt:386
#, priority:100
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:384
+#: en/git-fast-import.txt:391
#, priority:100
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
#, no-wrap, priority:100
msgid ""
"\t'commit' SP <ref> LF\n"
@@ -20832,247 +20883,247 @@ msgid ""
"\t('encoding' SP <encoding>)?\n"
"\tdata\n"
"\t('from' SP <commit-ish> LF)?\n"
-"\t('merge' SP <commit-ish> LF)?\n"
+"\t('merge' SP <commit-ish> LF)*\n"
"\t(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*\n"
"\tLF?\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:405
+#: en/git-fast-import.txt:412
#, priority:100
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:411
+#: en/git-fast-import.txt:418
#, priority:100
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:417
+#: en/git-fast-import.txt:424
#, priority:100
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:425
+#: en/git-fast-import.txt:432
#, priority:100
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:432
+#: en/git-fast-import.txt:439
#, priority:100
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:434
+#: en/git-fast-import.txt:441
#, ignore-same, no-wrap, priority:100
msgid "`author`"
msgstr "`author`"
#. type: Plain text
-#: en/git-fast-import.txt:440
+#: en/git-fast-import.txt:447
#, priority:100
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:442
+#: en/git-fast-import.txt:449
#, ignore-same, no-wrap, priority:100
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
-#: en/git-fast-import.txt:445
+#: en/git-fast-import.txt:452
#, priority:100
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
#, priority:100
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:458
+#: en/git-fast-import.txt:465
#, priority:100
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:460
+#: en/git-fast-import.txt:467
#, ignore-same, no-wrap, priority:100
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
-#: en/git-fast-import.txt:464
+#: en/git-fast-import.txt:471
#, priority:100
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:466
+#: en/git-fast-import.txt:473
#, ignore-same, no-wrap, priority:100
msgid "`from`"
msgstr "`from`"
#. type: Plain text
-#: en/git-fast-import.txt:472
+#: en/git-fast-import.txt:479
#, priority:100
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
#, priority:100
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:485
+#: en/git-fast-import.txt:492
#, priority:100
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
#, priority:100
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:491
+#: en/git-fast-import.txt:498
#, priority:100
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:493
+#: en/git-fast-import.txt:500
#, priority:100
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:499
+#: en/git-fast-import.txt:506
#, priority:100
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:501
+#: en/git-fast-import.txt:508
#, priority:100
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:503
+#: en/git-fast-import.txt:510
#, priority:100
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
#, priority:100
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:509
+#: en/git-fast-import.txt:516
#, priority:100
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:512
+#: en/git-fast-import.txt:519
#, priority:100
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
#, no-wrap, priority:100
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:521
+#: en/git-fast-import.txt:528
#, priority:100
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:523
+#: en/git-fast-import.txt:530
#, ignore-same, no-wrap, priority:100
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
-#: en/git-fast-import.txt:531
+#: en/git-fast-import.txt:538
#, priority:100
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:534
+#: en/git-fast-import.txt:541
#, priority:100
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:536
+#: en/git-fast-import.txt:543
#, ignore-same, no-wrap, priority:100
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:540
+#: en/git-fast-import.txt:547
#, priority:100
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:541 en/git-fast-import.txt:708
+#: en/git-fast-import.txt:548 en/git-fast-import.txt:715
#, no-wrap, priority:100
msgid "External data format"
msgstr "Format externe de donn챕es"
#. type: Plain text
-#: en/git-fast-import.txt:544
+#: en/git-fast-import.txt:551
#, priority:100
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:547
+#: en/git-fast-import.txt:554
#, no-wrap, priority:100
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
#, priority:100
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:555 en/git-fast-import.txt:721
+#: en/git-fast-import.txt:562 en/git-fast-import.txt:728
#, no-wrap, priority:100
msgid "Inline data format"
msgstr "Format en ligne de donn챕es"
#. type: Plain text
-#: en/git-fast-import.txt:559
+#: en/git-fast-import.txt:566
#, priority:100
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
#, no-wrap, priority:100
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -21080,259 +21131,259 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:566 en/git-fast-import.txt:732
+#: en/git-fast-import.txt:573 en/git-fast-import.txt:739
#, priority:100
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:569
+#: en/git-fast-import.txt:576
#, priority:100
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
#, priority:100
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:574
+#: en/git-fast-import.txt:581
#, priority:100
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:575
+#: en/git-fast-import.txt:582
#, priority:100
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
#, priority:100
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:580
+#: en/git-fast-import.txt:587
#, priority:100
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:583
+#: en/git-fast-import.txt:590
#, priority:100
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:587
+#: en/git-fast-import.txt:594
#, priority:100
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:594
+#: en/git-fast-import.txt:601
#, priority:100
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
#, priority:100
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:598
+#: en/git-fast-import.txt:605
#, priority:100
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:599
+#: en/git-fast-import.txt:606
#, priority:100
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:600
+#: en/git-fast-import.txt:607
#, priority:100
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:602
+#: en/git-fast-import.txt:609
#, priority:100
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:604
+#: en/git-fast-import.txt:611
#, priority:100
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:606
+#: en/git-fast-import.txt:613
#, priority:100
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:608
+#: en/git-fast-import.txt:615
#, ignore-same, no-wrap, priority:100
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
-#: en/git-fast-import.txt:614
+#: en/git-fast-import.txt:621
#, priority:100
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
#, no-wrap, priority:100
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
#, priority:100
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:624
+#: en/git-fast-import.txt:631
#, ignore-same, no-wrap, priority:100
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
#, priority:100
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:632
+#: en/git-fast-import.txt:639
#, no-wrap, priority:100
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:638 en/git-fast-import.txt:658
+#: en/git-fast-import.txt:645 en/git-fast-import.txt:665
#, priority:100
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:643
+#: en/git-fast-import.txt:650
#, priority:100
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:645
+#: en/git-fast-import.txt:652
#, ignore-same, no-wrap, priority:100
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
-#: en/git-fast-import.txt:649
+#: en/git-fast-import.txt:656
#, priority:100
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:652
+#: en/git-fast-import.txt:659
#, no-wrap, priority:100
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:663
+#: en/git-fast-import.txt:670
#, priority:100
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:672
+#: en/git-fast-import.txt:679
#, priority:100
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
-#: en/git-fast-import.txt:679
+#: en/git-fast-import.txt:686
#, priority:100
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:682
+#: en/git-fast-import.txt:689
#, no-wrap, priority:100
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:688
+#: en/git-fast-import.txt:695
#, priority:100
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:696
+#: en/git-fast-import.txt:703
#, priority:100
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:698
+#: en/git-fast-import.txt:705
#, ignore-same, no-wrap, priority:100
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:707
+#: en/git-fast-import.txt:714
#, priority:100
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:712
+#: en/git-fast-import.txt:719
#, priority:100
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:715
+#: en/git-fast-import.txt:722
#, no-wrap, priority:100
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:720
+#: en/git-fast-import.txt:727
#, priority:100
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:725
+#: en/git-fast-import.txt:732
#, priority:100
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:729
+#: en/git-fast-import.txt:736
#, no-wrap, priority:100
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -21340,76 +21391,77 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:735
+#: en/git-fast-import.txt:742
#, priority:100
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:737
+#: en/git-fast-import.txt:744
#, ignore-same, no-wrap, priority:100
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
-#: en/git-fast-import.txt:743
+#: en/git-fast-import.txt:750
#, priority:100
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:746
+#: en/git-fast-import.txt:753
#, no-wrap, priority:100
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:752
+#: en/git-fast-import.txt:759
#, priority:100
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:756
+#: en/git-fast-import.txt:763
#, priority:100
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:758
+#: en/git-fast-import.txt:765
#, ignore-same, no-wrap, priority:100
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
-#: en/git-fast-import.txt:763
+#: en/git-fast-import.txt:770
#, priority:100
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:766
+#: en/git-fast-import.txt:773
#, no-wrap, priority:100
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:769
+#: en/git-fast-import.txt:776
#, priority:100
msgid "where `<object-identifer>` is any string not containing LF."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:774
+#: en/git-fast-import.txt:781
#, priority:100
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:781
+#: en/git-fast-import.txt:789
#, no-wrap, priority:100
msgid ""
"\t'tag' SP <name> LF\n"
+"\tmark?\n"
"\t'from' SP <commit-ish> LF\n"
"\toriginal-oid?\n"
"\t'tagger' (SP <name>)? SP LT <email> GT SP <when> LF\n"
@@ -21417,55 +21469,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:784
+#: en/git-fast-import.txt:792
#, priority:100
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:789
+#: en/git-fast-import.txt:797
#, priority:100
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:793
+#: en/git-fast-import.txt:801
#, priority:100
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:796
+#: en/git-fast-import.txt:804
#, priority:100
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:799
+#: en/git-fast-import.txt:807
#, priority:100
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:813
#, priority:100
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:813
+#: en/git-fast-import.txt:821
#, priority:100
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:820
+#: en/git-fast-import.txt:828
#, priority:100
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:825
+#: en/git-fast-import.txt:833
#, no-wrap, priority:100
msgid ""
"\t'reset' SP <ref> LF\n"
@@ -21474,25 +21526,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:829
+#: en/git-fast-import.txt:837
#, priority:100
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:831 en/git-fast-import.txt:943
+#: en/git-fast-import.txt:839 en/git-fast-import.txt:966
#, priority:100
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:834
+#: en/git-fast-import.txt:842
#, priority:100
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:838
+#: en/git-fast-import.txt:846
#, no-wrap, priority:100
msgid ""
"\treset refs/tags/938\n"
@@ -21500,19 +21552,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:850
#, priority:100
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:849
+#: en/git-fast-import.txt:857
#, priority:100
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:855
+#: en/git-fast-import.txt:863
#, no-wrap, priority:100
msgid ""
"\t'blob' LF\n"
@@ -21522,43 +21574,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:861
+#: en/git-fast-import.txt:869
#, priority:100
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:871
#, ignore-same, no-wrap, priority:100
msgid "`data`"
msgstr "`data`"
#. type: Plain text
-#: en/git-fast-import.txt:870
+#: en/git-fast-import.txt:878
#, priority:100
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:875
+#: en/git-fast-import.txt:883
#, priority:100
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:876
+#: en/git-fast-import.txt:884
#, no-wrap, priority:100
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:878
+#: en/git-fast-import.txt:886
#, priority:100
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:882
+#: en/git-fast-import.txt:890
#, no-wrap, priority:100
msgid ""
"\t'data' SP <count> LF\n"
@@ -21566,31 +21618,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:888
+#: en/git-fast-import.txt:896
#, priority:100
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:893
+#: en/git-fast-import.txt:901
#, priority:100
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:894
+#: en/git-fast-import.txt:902
#, no-wrap, priority:100
msgid "Delimited format"
msgstr "Format d챕limit챕"
#. type: Plain text
-#: en/git-fast-import.txt:899
+#: en/git-fast-import.txt:907
#, priority:100
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:905
+#: en/git-fast-import.txt:913
#, no-wrap, priority:100
msgid ""
"\t'data' SP '<<' <delim> LF\n"
@@ -21600,25 +21652,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:921
#, priority:100
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:915
+#: en/git-fast-import.txt:923
#, priority:100
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:920
+#: en/git-fast-import.txt:928
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object."
+msgstr ""
+
+#. type: delimited block .
+#: en/git-fast-import.txt:934
+#, no-wrap, priority:100
+msgid ""
+"\t'alias' LF\n"
+"\tmark\n"
+"\t'to' SP <commit-ish> LF\n"
+"\tLF?\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:937
+#, priority:100
+msgid "For a detailed description of `<commit-ish>` see above under `from`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:943
#, priority:100
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:924
+#: en/git-fast-import.txt:947
#, no-wrap, priority:100
msgid ""
"\t'checkpoint' LF\n"
@@ -21626,31 +21700,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:930
+#: en/git-fast-import.txt:953
#, priority:100
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:935
+#: en/git-fast-import.txt:958
#, priority:100
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:941
+#: en/git-fast-import.txt:964
#, priority:100
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:950
+#: en/git-fast-import.txt:973
#, priority:100
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:954
+#: en/git-fast-import.txt:977
#, no-wrap, priority:100
msgid ""
"\t'progress' SP <any> LF\n"
@@ -21658,67 +21732,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:960
+#: en/git-fast-import.txt:983
#, priority:100
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:986
#, no-wrap, priority:100
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:968
+#: en/git-fast-import.txt:991
#, priority:100
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:976
+#: en/git-fast-import.txt:999
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:979
+#: en/git-fast-import.txt:1002
#, no-wrap, priority:100
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:983 en/git-fast-import.txt:1014 en/git-fast-import.txt:1067
+#: en/git-fast-import.txt:1006 en/git-fast-import.txt:1037 en/git-fast-import.txt:1090
#, priority:100
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:991
+#: en/git-fast-import.txt:1014
#, priority:100
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:994
+#: en/git-fast-import.txt:1017
#, no-wrap, priority:100
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1022
#, priority:100
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:1024
#, priority:100
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1005
+#: en/git-fast-import.txt:1028
#, no-wrap, priority:100
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21726,283 +21800,283 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1011
+#: en/git-fast-import.txt:1034
#, priority:100
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1022
+#: en/git-fast-import.txt:1045
#, priority:100
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1025
+#: en/git-fast-import.txt:1048
#, priority:100
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1049
#, no-wrap, priority:100
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1030
+#: en/git-fast-import.txt:1053
#, priority:100
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1033
+#: en/git-fast-import.txt:1056
#, no-wrap, priority:100
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1035
+#: en/git-fast-import.txt:1058
#, no-wrap, priority:100
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1041
+#: en/git-fast-import.txt:1064
#, priority:100
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1044
+#: en/git-fast-import.txt:1067
#, no-wrap, priority:100
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1047
+#: en/git-fast-import.txt:1070
#, priority:100
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1072
#, priority:100
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1075
#, no-wrap, priority:100
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1080
#, priority:100
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1060
+#: en/git-fast-import.txt:1083
#, priority:100
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1086
#, no-wrap, priority:100
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1072
+#: en/git-fast-import.txt:1095
#, priority:100
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1075
+#: en/git-fast-import.txt:1098
#, no-wrap, priority:100
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1078
+#: en/git-fast-import.txt:1101
#, priority:100
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1079 en/git-fast-import.txt:1146
+#: en/git-fast-import.txt:1102 en/git-fast-import.txt:1169
#, no-wrap, priority:100
msgid "date-format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1080 en/git-fast-import.txt:1148
+#: en/git-fast-import.txt:1103 en/git-fast-import.txt:1171
#, no-wrap, priority:100
msgid "export-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1081
+#: en/git-fast-import.txt:1104
#, no-wrap, priority:100
msgid "relative-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1082
+#: en/git-fast-import.txt:1105
#, fuzzy, no-wrap, priority:100
msgid "no-relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
-#: en/git-fast-import.txt:1083 en/git-fast-import.txt:1150
+#: en/git-fast-import.txt:1106 en/git-fast-import.txt:1173
#, no-wrap, priority:100
msgid "force"
msgstr "forcer"
#. type: Plain text
-#: en/git-fast-import.txt:1087
+#: en/git-fast-import.txt:1110
#, priority:100
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1088 en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1111 en/git-fast-import.txt:1170
#, no-wrap, priority:100
msgid "import-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1089
+#: en/git-fast-import.txt:1112
#, no-wrap, priority:100
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1097
+#: en/git-fast-import.txt:1120
#, priority:100
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1098
+#: en/git-fast-import.txt:1121
#, fuzzy, no-wrap, priority:100
msgid "get-mark"
msgstr "`get-mark`"
#. type: Labeled list
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1122
#, fuzzy, no-wrap, priority:100
msgid "cat-blob"
msgstr "`cat-blob`"
#. type: Labeled list
-#: en/git-fast-import.txt:1100
+#: en/git-fast-import.txt:1123
#, no-wrap, priority:100
msgid "ls"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1108
+#: en/git-fast-import.txt:1131
#, priority:100
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1109
+#: en/git-fast-import.txt:1132
#, no-wrap, priority:100
msgid "notes"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1114
+#: en/git-fast-import.txt:1137
#, priority:100
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1138
#, no-wrap, priority:100
msgid "done"
msgstr "fait"
#. type: Plain text
-#: en/git-fast-import.txt:1122
+#: en/git-fast-import.txt:1145
#, priority:100
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1129
+#: en/git-fast-import.txt:1152
#, priority:100
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1132
+#: en/git-fast-import.txt:1155
#, no-wrap, priority:100
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1137
+#: en/git-fast-import.txt:1160
#, priority:100
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1141
+#: en/git-fast-import.txt:1164
#, priority:100
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1144
+#: en/git-fast-import.txt:1167
#, priority:100
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1149
+#: en/git-fast-import.txt:1172
#, priority:100
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1178
#, priority:100
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1159
+#: en/git-fast-import.txt:1182
#, priority:100
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1161
+#: en/git-fast-import.txt:1184
#, no-wrap, priority:100
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1168
+#: en/git-fast-import.txt:1191
#, priority:100
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1175
+#: en/git-fast-import.txt:1198
#, priority:100
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1203
#, no-wrap, priority:100
msgid ""
"\tmkfifo fast-import-output\n"
@@ -22011,49 +22085,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1184
+#: en/git-fast-import.txt:1207
#, priority:100
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1188
+#: en/git-fast-import.txt:1211
#, priority:100
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1213
#, no-wrap, priority:100
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1196
+#: en/git-fast-import.txt:1219
#, priority:100
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1203
+#: en/git-fast-import.txt:1226
#, priority:100
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1211
+#: en/git-fast-import.txt:1234
#, priority:100
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1236
#, priority:100
msgid "An example crash:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1229
+#: en/git-fast-import.txt:1252
#, no-wrap, priority:100
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
@@ -22073,7 +22147,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1256
#, no-wrap, priority:100
msgid ""
"\t$ git fast-import <in\n"
@@ -22082,7 +22156,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1239
+#: en/git-fast-import.txt:1262
#, no-wrap, priority:100
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
@@ -22093,13 +22167,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1241
+#: en/git-fast-import.txt:1264
#, no-wrap, priority:100
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1251
+#: en/git-fast-import.txt:1274
#, no-wrap, priority:100
msgid ""
"\tMost Recent Commands Before Crash\n"
@@ -22114,13 +22188,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1252
+#: en/git-fast-import.txt:1275
#, no-wrap, priority:100
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1255
+#: en/git-fast-import.txt:1278
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
@@ -22128,25 +22202,25 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1256
+#: en/git-fast-import.txt:1279
#, no-wrap, priority:100
msgid "active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1259
+#: en/git-fast-import.txt:1282
#, priority:100
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1260
+#: en/git-fast-import.txt:1283
#, priority:100
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1264
+#: en/git-fast-import.txt:1287
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
@@ -22155,7 +22229,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1270
+#: en/git-fast-import.txt:1293
#, no-wrap, priority:100
msgid ""
"status : active loaded dirty\n"
@@ -22167,307 +22241,307 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1274
+#: en/git-fast-import.txt:1297
#, priority:100
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1277
+#: en/git-fast-import.txt:1300
#, no-wrap, priority:100
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1280
+#: en/git-fast-import.txt:1303
#, priority:100
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1282
+#: en/git-fast-import.txt:1305
#, no-wrap, priority:100
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1290
+#: en/git-fast-import.txt:1313
#, priority:100
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1294
+#: en/git-fast-import.txt:1317
#, priority:100
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1296
+#: en/git-fast-import.txt:1319
#, no-wrap, priority:100
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1301
+#: en/git-fast-import.txt:1324
#, priority:100
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1305
+#: en/git-fast-import.txt:1328
#, priority:100
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1307
+#: en/git-fast-import.txt:1330
#, no-wrap, priority:100
msgid "Handling Renames"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1312
+#: en/git-fast-import.txt:1335
#, priority:100
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1337
#, no-wrap, priority:100
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1341
#, priority:100
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1325
+#: en/git-fast-import.txt:1348
#, priority:100
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1331
+#: en/git-fast-import.txt:1354
#, priority:100
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1337
+#: en/git-fast-import.txt:1360
#, priority:100
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1363
#, priority:100
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1342
+#: en/git-fast-import.txt:1365
#, no-wrap, priority:100
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1346
+#: en/git-fast-import.txt:1369
#, priority:100
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1353
+#: en/git-fast-import.txt:1376
#, priority:100
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1358
+#: en/git-fast-import.txt:1381
#, priority:100
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1360
+#: en/git-fast-import.txt:1383
#, no-wrap, priority:100
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1367
+#: en/git-fast-import.txt:1390
#, priority:100
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1369
+#: en/git-fast-import.txt:1392
#, no-wrap, priority:100
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1399
#, priority:100
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1379
+#: en/git-fast-import.txt:1402
#, no-wrap, priority:100
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1385
+#: en/git-fast-import.txt:1408
#, priority:100
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1393
+#: en/git-fast-import.txt:1416
#, priority:100
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1423
#, priority:100
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1407
+#: en/git-fast-import.txt:1430
#, priority:100
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1415
+#: en/git-fast-import.txt:1438
#, priority:100
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1417
+#: en/git-fast-import.txt:1440
#, no-wrap, priority:100
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1423
+#: en/git-fast-import.txt:1446
#, priority:100
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1448
#, no-wrap, priority:100
msgid "per object"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1432
+#: en/git-fast-import.txt:1455
#, priority:100
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1438
+#: en/git-fast-import.txt:1461
#, priority:100
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1440
+#: en/git-fast-import.txt:1463
#, no-wrap, priority:100
msgid "per mark"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1446
+#: en/git-fast-import.txt:1469
#, priority:100
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1448
+#: en/git-fast-import.txt:1471
#, no-wrap, priority:100
msgid "per branch"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1474
#, priority:100
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1457
+#: en/git-fast-import.txt:1480
#, priority:100
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1464
+#: en/git-fast-import.txt:1487
#, priority:100
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1468
+#: en/git-fast-import.txt:1491
#, priority:100
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1496
#, priority:100
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1498
#, no-wrap, priority:100
msgid "per active tree"
msgstr "par arbre actif"
#. type: Plain text
-#: en/git-fast-import.txt:1480
+#: en/git-fast-import.txt:1503
#, priority:100
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1482
+#: en/git-fast-import.txt:1505
#, no-wrap, priority:100
msgid "per active file entry"
msgstr "par entr챕e active de fichier"
#. type: Plain text
-#: en/git-fast-import.txt:1488
+#: en/git-fast-import.txt:1511
#, priority:100
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1493
+#: en/git-fast-import.txt:1516
#, priority:100
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1495
+#: en/git-fast-import.txt:1518
#, no-wrap, priority:100
msgid "SIGNALS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1501
+#: en/git-fast-import.txt:1524
#, priority:100
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -23028,7 +23102,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1041
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -23144,20 +23218,32 @@ msgid ""
"\t[--state-branch <branch>] [--] [<rev-list options>...]\n"
msgstr ""
+#. type: Title -
+#: en/git-filter-branch.txt:20
+#, no-wrap, priority:100
+msgid "WARNING"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:31
+#, priority:100
+msgid "'git filter-branch' has a plethora of pitfalls that can produce non-obvious manglings of the intended history rewrite (and can leave you with little time to investigate such problems since it has such abysmal performance). These safety and performance issues cannot be backward compatibly fixed and as such, its use is not recommended. Please use an alternative history filtering tool such as https://github.com/newren/git-filter-repo/[git filter-repo]. If you still need to use 'git filter-branch', please carefully read <<SAFETY>> (and <<PERFORMANCE>>) to learn about the land mines of filter-branch, and then vigilantly avoid as many of the hazards listed there as reasonably possible."
+msgstr ""
+
#. type: Plain text
-#: en/git-filter-branch.txt:27
+#: en/git-filter-branch.txt:40
#, priority:100
msgid "Lets you rewrite Git revision history by rewriting the branches mentioned in the <rev-list options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge information) will be preserved."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:34
+#: en/git-filter-branch.txt:47
#, priority:100
msgid "The command will only rewrite the _positive_ refs mentioned in the command line (e.g. if you pass 'a..b', only 'b' will be rewritten). If you specify no filters, the commits will be recommitted without any changes, which would normally have no effect. Nevertheless, this may be useful in the future for compensating for some Git bugs or such, therefore such a usage is permitted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:39
+#: en/git-filter-branch.txt:52
#, no-wrap, priority:100
msgid ""
"*NOTE*: This command honors `.git/info/grafts` file and refs in\n"
@@ -23167,7 +23253,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:48
+#: en/git-filter-branch.txt:61
#, no-wrap, priority:100
msgid ""
"*WARNING*! The rewritten history will have different object names for all\n"
@@ -23181,337 +23267,337 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:52
+#: en/git-filter-branch.txt:65
#, priority:100
msgid "Always verify that the rewritten version is correct: The original refs, if different from the rewritten ones, will be stored in the namespace 'refs/original/'."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:56
+#: en/git-filter-branch.txt:69
#, priority:100
msgid "Note that since this operation is very I/O expensive, it might be a good idea to redirect the temporary directory off-disk with the `-d` option, e.g. on tmpfs. Reportedly the speedup is very noticeable."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:59
+#: en/git-filter-branch.txt:72
#, no-wrap, priority:100
msgid "Filters"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:71
+#: en/git-filter-branch.txt:84
#, priority:100
msgid "The filters are applied in the order as listed below. The <command> argument is always evaluated in the shell context using the 'eval' command (with the notable exception of the commit filter, for technical reasons). Prior to that, the `$GIT_COMMIT` environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, and GIT_COMMITTER_DATE are taken from the current commit and exported to the environment, in order to affect the author and committer identities of the replacement commit created by linkgit:git-commit-tree[1] after the filters have run."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:74
+#: en/git-filter-branch.txt:87
#, priority:100
msgid "If any evaluation of <command> returns a non-zero exit status, the whole operation will be aborted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:80
+#: en/git-filter-branch.txt:93
#, priority:100
msgid "A 'map' function is available that takes an \"original sha1 id\" argument and outputs a \"rewritten sha1 id\" if the commit has been already rewritten, and \"original sha1 id\" otherwise; the 'map' function can return several ids on separate lines if your commit filter emitted multiple commits."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:85
+#: en/git-filter-branch.txt:98
#, no-wrap, priority:100
msgid "--setup <command>"
msgstr "--setup <commande>"
#. type: Plain text
-#: en/git-filter-branch.txt:91
+#: en/git-filter-branch.txt:104
#, priority:100
msgid "This is not a real filter executed for each commit but a one time setup just before the loop. Therefore no commit-specific variables are defined yet. Functions or variables defined here can be used or modified in the following filter steps except the commit filter, for technical reasons."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:92
+#: en/git-filter-branch.txt:105
#, no-wrap, priority:100
msgid "--subdirectory-filter <directory>"
msgstr "--subdirectory-filter <r챕pertoire>"
#. type: Plain text
-#: en/git-filter-branch.txt:96
+#: en/git-filter-branch.txt:109
#, priority:100
msgid "Only look at the history which touches the given subdirectory. The result will contain that directory (and only that) as its project root. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:97
+#: en/git-filter-branch.txt:110
#, no-wrap, priority:100
msgid "--env-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:102
+#: en/git-filter-branch.txt:115
#, priority:100
msgid "This filter may be used if you only need to modify the environment in which the commit will be performed. Specifically, you might want to rewrite the author/committer name/email/time environment variables (see linkgit:git-commit-tree[1] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:103
+#: en/git-filter-branch.txt:116
#, no-wrap, priority:100
msgid "--tree-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:110
+#: en/git-filter-branch.txt:123
#, priority:100
msgid "This is the filter for rewriting the tree and its contents. The argument is evaluated in shell with the working directory set to the root of the checked out tree. The new tree is then used as-is (new files are auto-added, disappeared files are auto-removed - neither .gitignore files nor any other ignore rules *HAVE ANY EFFECT*!)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:111
+#: en/git-filter-branch.txt:124
#, no-wrap, priority:100
msgid "--index-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:117
+#: en/git-filter-branch.txt:130
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the index. It is similar to the tree filter but does not check out the tree, which makes it much faster. Frequently used with `git rm --cached --ignore-unmatch ...`, see EXAMPLES below. For hairy cases, see linkgit:git-update-index[1]."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:118
+#: en/git-filter-branch.txt:131
#, no-wrap, priority:100
msgid "--parent-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:125
+#: en/git-filter-branch.txt:138
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the commit's parent list. It will receive the parent string on stdin and shall output the new parent string on stdout. The parent string is in the format described in linkgit:git-commit-tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and \"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:126
+#: en/git-filter-branch.txt:139
#, no-wrap, priority:100
msgid "--msg-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:131
+#: en/git-filter-branch.txt:144
#, priority:100
msgid "This is the filter for rewriting the commit messages. The argument is evaluated in the shell with the original commit message on standard input; its standard output is used as the new commit message."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:132
+#: en/git-filter-branch.txt:145
#, no-wrap, priority:100
msgid "--commit-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:138
+#: en/git-filter-branch.txt:151
#, ignore-ellipsis, priority:100
msgid "This is the filter for performing the commit. If this filter is specified, it will be called instead of the 'git commit-tree' command, with arguments of the form \"<TREE_ID> [(-p <PARENT_COMMIT_ID>)...]\" and the log message on stdin. The commit id is expected on stdout."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:142
+#: en/git-filter-branch.txt:155
#, priority:100
msgid "As a special extension, the commit filter may emit multiple commit ids; in that case, the rewritten children of the original commit will have all of them as parents."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:147
+#: en/git-filter-branch.txt:160
#, priority:100
msgid "You can use the 'map' convenience function in this filter, and other convenience functions, too. For example, calling 'skip_commit \"$@\"' will leave out the current commit (but not its changes! If you want that, use 'git rebase' instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:151
+#: en/git-filter-branch.txt:164
#, priority:100
msgid "You can also use the `git_commit_non_empty_tree \"$@\"` instead of `git commit-tree \"$@\"` if you don't wish to keep commits with a single parent and that makes no change to the tree."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:152
+#: en/git-filter-branch.txt:165
#, no-wrap, priority:100
msgid "--tag-name-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:158
+#: en/git-filter-branch.txt:171
#, priority:100
msgid "This is the filter for rewriting tag names. When passed, it will be called for every tag ref that points to a rewritten object (or to a tag object which points to a rewritten object). The original tag name is passed via standard input, and the new tag name is expected on standard output."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:163
+#: en/git-filter-branch.txt:176
#, priority:100
msgid "The original tags are not deleted, but can be overwritten; use \"--tag-name-filter cat\" to simply update the tags. In this case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:174
+#: en/git-filter-branch.txt:187
#, priority:100
msgid "Nearly proper rewriting of tag objects is supported. If the tag has a message attached, a new tag object will be created with the same message, author, and timestamp. If the tag has a signature attached, the signature will be stripped. It is by definition impossible to preserve signatures. The reason this is \"nearly\" proper, is because ideally if the tag did not change (points to the same object, has the same name, etc.) it should retain any signature. That is not the case, signatures will always be removed, buyer beware. There is also no support for changing the author or timestamp (or the tag message for that matter). Tags which point to other tags will be rewritten to point to the underlying commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:175
+#: en/git-filter-branch.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--prune-empty"
msgstr "--prune-empty"
#. type: Plain text
-#: en/git-filter-branch.txt:182
+#: en/git-filter-branch.txt:195
#, priority:100
msgid "Some filters will generate empty commits that leave the tree untouched. This option instructs git-filter-branch to remove such commits if they have exactly one or zero non-pruned parents; merge commits will therefore remain intact. This option cannot be used together with `--commit-filter`, though the same effect can be achieved by using the provided `git_commit_non_empty_tree` function in a commit filter."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:183
+#: en/git-filter-branch.txt:196
#, no-wrap, priority:100
msgid "--original <namespace>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:186
+#: en/git-filter-branch.txt:199
#, priority:100
msgid "Use this option to set the namespace where the original commits will be stored. The default value is 'refs/original'."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:187
+#: en/git-filter-branch.txt:200
#, no-wrap, priority:100
msgid "-d <directory>"
msgstr "-d <r챕pertoire>"
#. type: Plain text
-#: en/git-filter-branch.txt:194
+#: en/git-filter-branch.txt:207
#, priority:100
msgid "Use this option to set the path to the temporary directory used for rewriting. When applying a tree filter, the command needs to temporarily check out the tree to some directory, which may consume considerable space in case of large projects. By default it does this in the `.git-rewrite/` directory but you can override that choice by this parameter."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:200
+#: en/git-filter-branch.txt:213
#, priority:100
msgid "'git filter-branch' refuses to start with an existing temporary directory or when there are already refs starting with 'refs/original/', unless forced."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:201
+#: en/git-filter-branch.txt:214
#, no-wrap, priority:100
msgid "--state-branch <branch>"
msgstr "--state-branch <branche>"
#. type: Plain text
-#: en/git-filter-branch.txt:206
+#: en/git-filter-branch.txt:219
#, priority:100
msgid "This option will cause the mapping from old to new objects to be loaded from named branch upon startup and saved as a new commit to that branch upon exit, enabling incremental of large trees. If '<branch>' does not exist it will be created."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:207
+#: en/git-filter-branch.txt:220
#, ignore-ellipsis, no-wrap, priority:100
msgid "<rev-list options>..."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:212
+#: en/git-filter-branch.txt:225
#, priority:100
msgid "Arguments for 'git rev-list'. All positive refs included by these options are rewritten. You may also specify options such as `--all`, but you must use `--` to separate them from the 'git filter-branch' options. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:216
+#: en/git-filter-branch.txt:229
#, no-wrap, priority:100
msgid "Remap to ancestor"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:223
+#: en/git-filter-branch.txt:236
#, priority:100
msgid "By using linkgit:git-rev-list[1] arguments, e.g., path limiters, you can limit the set of revisions which get rewritten. However, positive refs on the command line are distinguished: we don't let them be excluded by such limiters. For this purpose, they are instead rewritten to point at the nearest ancestor that was not excluded."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:231
+#: en/git-filter-branch.txt:244
#, priority:100
msgid "On success, the exit status is `0`. If the filter can't find any commits to rewrite, the exit status is `2`. On any other error, the exit status may be any other non-zero value."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:238
+#: en/git-filter-branch.txt:251
#, priority:100
msgid "Suppose you want to remove a file (containing confidential information or copyright violation) from all commits:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:241
+#: en/git-filter-branch.txt:254
#, no-wrap, priority:100
msgid "git filter-branch --tree-filter 'rm filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:246
+#: en/git-filter-branch.txt:259
#, priority:100
msgid "However, if the file is absent from the tree of some commit, a simple `rm filename` will fail for that tree and commit. Thus you may instead want to use `rm -f filename` as the script."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:252
+#: en/git-filter-branch.txt:265
#, priority:100
msgid "Using `--index-filter` with 'git rm' yields a significantly faster version. Like with using `rm filename`, `git rm --cached filename` will fail if the file is absent from the tree of a commit. If you want to \"completely forget\" a file, it does not matter when it entered history, so we also add `--ignore-unmatch`:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:255
+#: en/git-filter-branch.txt:268
#, no-wrap, priority:100
msgid "git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:258
+#: en/git-filter-branch.txt:271
#, priority:100
msgid "Now, you will get the rewritten history saved in HEAD."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:261
+#: en/git-filter-branch.txt:274
#, priority:100
msgid "To rewrite the repository to look as if `foodir/` had been its project root, and discard all other history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:264
+#: en/git-filter-branch.txt:277
#, no-wrap, priority:100
msgid "git filter-branch --subdirectory-filter foodir -- --all\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:269
+#: en/git-filter-branch.txt:282
#, priority:100
msgid "Thus you can, e.g., turn a library subdirectory into a repository of its own. Note the `--` that separates 'filter-branch' options from revision options, and the `--all` to rewrite all branches and tags."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:273
+#: en/git-filter-branch.txt:286
#, priority:100
msgid "To set a commit (which typically is at the tip of another history) to be the parent of the current initial commit, in order to paste the other history behind the current history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:276
+#: en/git-filter-branch.txt:289
#, no-wrap, priority:100
msgid "git filter-branch --parent-filter 'sed \"s/^\\$/-p <graft-id>/\"' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:282
+#: en/git-filter-branch.txt:295
#, priority:100
msgid "(if the parent string is empty - which happens when we are dealing with the initial commit - add graftcommit as a parent). Note that this assumes history with a single root (that is, no merge without common ancestors happened). If this is not the case, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:286
+#: en/git-filter-branch.txt:299
#, no-wrap, priority:100
msgid ""
"git filter-branch --parent-filter \\\n"
@@ -23519,13 +23605,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:289
+#: en/git-filter-branch.txt:302
#, priority:100
msgid "or even simpler:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:293
+#: en/git-filter-branch.txt:306
#, no-wrap, priority:100
msgid ""
"git replace --graft $commit-id $graft-id\n"
@@ -23533,13 +23619,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:296
+#: en/git-filter-branch.txt:309
#, priority:100
msgid "To remove commits authored by \"Darl McBribe\" from the history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:305
+#: en/git-filter-branch.txt:318
#, no-wrap, priority:100
msgid ""
"git filter-branch --commit-filter '\n"
@@ -23552,13 +23638,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:308
+#: en/git-filter-branch.txt:321
#, priority:100
msgid "The function 'skip_commit' is defined as follows:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:320
+#: en/git-filter-branch.txt:333
#, no-wrap, priority:100
msgid ""
"skip_commit()\n"
@@ -23574,13 +23660,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:327
+#: en/git-filter-branch.txt:340
#, priority:100
msgid "The shift magic first throws away the tree id and then the -p parameters. Note that this handles merges properly! In case Darl committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 as their parents instead of the merge commit."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:332
+#: en/git-filter-branch.txt:345
#, no-wrap, priority:100
msgid ""
"*NOTE* the changes introduced by the commits, and which are not reverted\n"
@@ -23590,13 +23676,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:336
+#: en/git-filter-branch.txt:349
#, priority:100
msgid "You can rewrite the commit log messages using `--msg-filter`. For example, 'git svn-id' strings in a repository created by 'git svn' can be removed this way:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:341
+#: en/git-filter-branch.txt:354
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23605,13 +23691,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:345
+#: en/git-filter-branch.txt:358
#, priority:100
msgid "If you need to add 'Acked-by' lines to, say, the last 10 commits (none of which is a merge), use this command:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:351
+#: en/git-filter-branch.txt:364
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23621,13 +23707,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:357
+#: en/git-filter-branch.txt:370
#, priority:100
msgid "The `--env-filter` option can be used to modify committer and/or author identity. For example, if you found out that your commits have the wrong identity due to a misconfigured user.email, you can make a correction, before publishing the project, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:369
+#: en/git-filter-branch.txt:382
#, no-wrap, priority:100
msgid ""
"git filter-branch --env-filter '\n"
@@ -23643,19 +23729,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:375
+#: en/git-filter-branch.txt:388
#, priority:100
msgid "To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will point to the top-most revision that a 'git rev-list' of this range will print."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:377
+#: en/git-filter-branch.txt:390
#, priority:100
msgid "Consider this history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:382
+#: en/git-filter-branch.txt:395
#, no-wrap, priority:100
msgid ""
" D--E--F--G--H\n"
@@ -23664,25 +23750,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:385
+#: en/git-filter-branch.txt:398
#, priority:100
msgid "To rewrite only commits D,E,F,G,H, but leave A, B and C alone, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:388
+#: en/git-filter-branch.txt:401
#, ignore-ellipsis, no-wrap, priority:100
msgid "git filter-branch ... C..H\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:391
+#: en/git-filter-branch.txt:404
#, priority:100
msgid "To rewrite commits E,F,G,H, use one of these:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:395
+#: en/git-filter-branch.txt:408
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"git filter-branch ... C..H --not D\n"
@@ -23690,13 +23776,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:398
+#: en/git-filter-branch.txt:411
#, priority:100
msgid "To move the whole tree into a subdirectory, or remove it from there:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:405
+#: en/git-filter-branch.txt:418
#, no-wrap, priority:100
msgid ""
"git filter-branch --index-filter \\\n"
@@ -23707,87 +23793,279 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-filter-branch.txt:410
+#: en/git-filter-branch.txt:423
#, no-wrap, priority:100
msgid "CHECKLIST FOR SHRINKING A REPOSITORY"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:418
+#: en/git-filter-branch.txt:431
#, priority:100
msgid "git-filter-branch can be used to get rid of a subset of files, usually with some combination of `--index-filter` and `--subdirectory-filter`. People expect the resulting repository to be smaller than the original, but you need a few more steps to actually make it smaller, because Git tries hard not to lose your objects until you tell it to. First make sure that:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:422
+#: en/git-filter-branch.txt:435
#, priority:100
msgid "You really removed all variants of a filename, if a blob was moved over its lifetime. `git log --name-only --follow --all -- filename` can help you find renames."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:425
+#: en/git-filter-branch.txt:438
#, priority:100
msgid "You really filtered all refs: use `--tag-name-filter cat -- --all` when calling git-filter-branch."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:428
+#: en/git-filter-branch.txt:441
#, priority:100
msgid "Then there are two ways to get a smaller repository. A safer way is to clone, that keeps your original intact."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:432
+#: en/git-filter-branch.txt:445
#, priority:100
msgid "Clone it with `git clone file:///path/to/repo`. The clone will not have the removed objects. See linkgit:git-clone[1]. (Note that cloning with a plain path just hardlinks everything!)"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:437
+#: en/git-filter-branch.txt:450
#, priority:100
msgid "If you really don't want to clone it, for whatever reasons, check the following points instead (in this order). This is a very destructive approach, so *make a backup* or go back to cloning it. You have been warned."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:441
+#: en/git-filter-branch.txt:454
#, priority:100
msgid "Remove the original refs backed up by git-filter-branch: say `git for-each-ref --format=\"%(refname)\" refs/original/ | xargs -n 1 git update-ref -d`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:443
+#: en/git-filter-branch.txt:456
#, priority:100
msgid "Expire all reflogs with `git reflog expire --expire=now --all`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:447
+#: en/git-filter-branch.txt:460
#, priority:100
msgid "Garbage collect all unreferenced objects with `git gc --prune=now` (or if your git-gc is not new enough to support arguments to `--prune`, use `git repack -ad; git prune` instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:459
+#: en/git-filter-branch.txt:467
#, priority:100
-msgid "git-filter-branch allows you to make complex shell-scripted rewrites of your Git history, but you probably don't need this flexibility if you're simply _removing unwanted data_ like large files or passwords. For those operations you may want to consider http://rtyley.github.io/bfg-repo-cleaner/[The BFG Repo-Cleaner], a JVM-based alternative to git-filter-branch, typically at least 10-50x faster for those use-cases, and with quite different characteristics:"
+msgid "The performance of git-filter-branch is glacially slow; its design makes it impossible for a backward-compatible implementation to ever be fast:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:467
+#: en/git-filter-branch.txt:473
#, priority:100
-msgid "Any particular version of a file is cleaned exactly _once_. The BFG, unlike git-filter-branch, does not give you the opportunity to handle a file differently based on where or when it was committed within your history. This constraint gives the core performance benefit of The BFG, and is well-suited to the task of cleansing bad data - you don't care _where_ the bad data is, you just want it _gone_."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:473
+#: en/git-filter-branch.txt:476
+#, priority:100
+msgid "If you try and cheat and try to make git-filter-branch only work on files modified in a commit, then two things happen"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:482
+#, priority:100
+msgid "you run into problems with deletions whenever the user is simply trying to rename files (because attempting to delete files that don't exist looks like a no-op; it takes some chicanery to remap deletes across file renames when the renames happen via arbitrary user-provided shell)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:488
+#, priority:100
+msgid "even if you succeed at the map-deletes-for-renames chicanery, you still technically violate backward compatibility because users are allowed to filter files in ways that depend upon topology of commits instead of filtering solely based on file contents or names (though this has not been observed in the wild)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:494
+#, priority:100
+msgid "Even if you don't need to edit files but only want to e.g. rename or remove some and thus can avoid checking out each file (i.e. you can use --index-filter), you still are passing shell snippets for your filters. This means that for every commit, you have to have a prepared git repo where those filters can be run. That's a significant setup."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:505
+#, priority:100
+msgid "Further, several additional files are created or updated per commit by git-filter-branch. Some of these are for supporting the convenience functions provided by git-filter-branch (such as map()), while others are for keeping track of internal state (but could have also been accessed by user filters; one of git-filter-branch's regression tests does so). This essentially amounts to using the filesystem as an IPC mechanism between git-filter-branch and the user-provided filters. Disks tend to be a slow IPC mechanism, and writing these files also effectively represents a forced synchronization point between separate processes that we hit with every commit."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:511
+#, priority:100
+msgid "The user-provided shell commands will likely involve a pipeline of commands, resulting in the creation of many processes per commit. Creating and running another process takes a widely varying amount of time between operating systems, but on any platform it is very slow relative to invoking a function."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:517
+#, priority:100
+msgid "git-filter-branch itself is written in shell, which is kind of slow. This is the one performance issue that could be backward-compatibly fixed, but compared to the above problems that are intrinsic to the design of git-filter-branch, the language of the tool itself is a relatively minor issue."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:528
+#, priority:100
+msgid "Side note: Unfortunately, people tend to fixate on the written-in-shell aspect and periodically ask if git-filter-branch could be rewritten in another language to fix the performance issues. Not only does that ignore the bigger intrinsic problems with the design, it'd help less than you'd expect: if git-filter-branch itself were not shell, then the convenience functions (map(), skip_commit(), etc) and the `--setup` argument could no longer be executed once at the beginning of the program but would instead need to be prepended to every user filter (and thus re-executed with every commit)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:539
+#, priority:100
+msgid "The https://github.com/newren/git-filter-repo/[git filter-repo] tool is an alternative to git-filter-branch which does not suffer from these performance problems or the safety problems (mentioned below). For those with existing tooling which relies upon git-filter-branch, 'git repo-filter' also provides https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], a drop-in git-filter-branch replacement (with a few caveats). While filter-lamely suffers from all the same safety issues as git-filter-branch, it at least ameloriates the performance issues a little."
+msgstr ""
+
+#. type: Title -
+#: en/git-filter-branch.txt:542
+#, no-wrap, priority:100
+msgid "SAFETY"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:547
+#, priority:100
+msgid "git-filter-branch is riddled with gotchas resulting in various ways to easily corrupt repos or end up with a mess worse than what you started with:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:560
+#, priority:100
+msgid "Someone can have a set of \"working and tested filters\" which they document or provide to a coworker, who then runs them on a different OS where the same commands are not working/tested (some examples in the git-filter-branch manpage are also affected by this). BSD vs. GNU userland differences can really bite. If lucky, error messages are spewed. But just as likely, the commands either don't do the filtering requested, or silently corrupt by making some unwanted change. The unwanted change may only affect a few commits, so it's not necessarily obvious either. (The fact that problems won't necessarily be obvious means they are likely to go unnoticed until the rewritten history is in use for quite a while, at which point it's really hard to justify another flag-day for another rewrite.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:570
+#, priority:100
+msgid "Filenames with spaces are often mishandled by shell snippets since they cause problems for shell pipelines. Not everyone is familiar with find -print0, xargs -0, git-ls-files -z, etc. Even people who are familiar with these may assume such flags are not relevant because someone else renamed any such files in their repo back before the person doing the filtering joined the project. And often, even those familiar with handling arguments with spaces may not do so just because they aren't in the mindset of thinking about everything that could possibly go wrong."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:580
+#, priority:100
+msgid "Non-ascii filenames can be silently removed despite being in a desired directory. Keeping only wanted paths is often done using pipelines like `git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`. ls-files will only quote filenames if needed, so folks may not notice that one of the files didn't match the regex (at least not until it's much too late). Yes, someone who knows about core.quotePath can avoid this (unless they have other special characters like \\t, \\n, or \"), and people who use ls-files -z with something other than grep can avoid this, but that doesn't mean they will."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:586
+#, priority:100
+msgid "Similarly, when moving files around, one can find that filenames with non-ascii or special characters end up in a different directory, one that includes a double quote character. (This is technically the same issue as above with quoting, but perhaps an interesting different way that it can and has manifested as a problem.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:594
+#, priority:100
+msgid "It's far too easy to accidentally mix up old and new history. It's still possible with any tool, but git-filter-branch almost invites it. If lucky, the only downside is users getting frustrated that they don't know how to shrink their repo and remove the old stuff. If unlucky, they merge old and new history and end up with multiple \"copies\" of each commit, some of which have unwanted or sensitive files and others which don't. This comes about in multiple different ways:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:597
+#, priority:100
+msgid "the default to only doing a partial history rewrite ('--all' is not the default and few examples show it)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:599
+#, priority:100
+msgid "the fact that there's no automatic post-run cleanup"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:602
+#, priority:100
+msgid "the fact that --tag-name-filter (when used to rename tags) doesn't remove the old tags but just adds new ones with the new name"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:611
+#, priority:100
+msgid "the fact that little educational information is provided to inform users of the ramifications of a rewrite and how to avoid mixing old and new history. For example, this man page discusses how users need to understand that they need to rebase their changes for all their branches on top of new history (or delete and reclone), but that's only one of multiple concerns to consider. See the \"DISCUSSION\" section of the git filter-repo manual page for more details."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:614
+#, priority:100
+msgid "Annotated tags can be accidentally converted to lightweight tags, due to either of two issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:619
#, priority:100
-msgid "By default The BFG takes full advantage of multi-core machines, cleansing commit file-trees in parallel. git-filter-branch cleans commits sequentially (i.e. in a single-threaded manner), though it _is_ possible to write filters that include their own parallelism, in the scripts executed against each commit."
+msgid "Someone can do a history rewrite, realize they messed up, restore from the backups in refs/original/, and then redo their git-filter-branch command. (The backup in refs/original/ is not a real backup; it dereferences tags first.)"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:478
+#: en/git-filter-branch.txt:624
#, priority:100
-msgid "The http://rtyley.github.io/bfg-repo-cleaner/#examples[command options] are much more restrictive than git-filter branch, and dedicated just to the tasks of removing unwanted data- e.g: `--strip-blobs-bigger-than 1M`."
+msgid "Running git-filter-branch with either --tags or --all in your <rev-list options>. In order to retain annotated tags as annotated, you must use --tag-name-filter (and must not have restored from refs/original/ in a previously botched rewrite)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:629
+#, priority:100
+msgid "Any commit messages that specify an encoding will become corrupted by the rewrite; git-filter-branch ignores the encoding, takes the original bytes, and feeds it to commit-tree without telling it the proper encoding. (This happens whether or not --msg-filter is used.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:633
+#, priority:100
+msgid "Commit messages (even if they are all UTF-8) by default become corrupted due to not being updated -- any references to other commit hashes in commit messages will now refer to no-longer-extant commits."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:644
+#, priority:100
+msgid "There are no facilities for helping users find what unwanted crud they should delete, which means they are much more likely to have incomplete or partial cleanups that sometimes result in confusion and people wasting time trying to understand. (For example, folks tend to just look for big files to delete instead of big directories or extensions, and once they do so, then sometime later folks using the new repository who are going through history will notice a build artifact directory that has some files but not others, or a cache of dependencies (node_modules or similar) which couldn't have ever been functional since it's missing some files.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:647
+#, priority:100
+msgid "If --prune-empty isn't specified, then the filtering process can create hoards of confusing empty commits"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:651
+#, priority:100
+msgid "If --prune-empty is specified, then intentionally placed empty commits from before the filtering operation are also pruned instead of just pruning commits that became empty due to filtering rules."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:654
+#, ignore-ellipsis, priority:100
+msgid "If --prune empty is specified, sometimes empty commits are missed and left around anyway (a somewhat rare bug, but it happens...)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:658
+#, priority:100
+msgid "A minor issue, but users who have a goal to update all names and emails in a repository may be led to --env-filter which will only update authors and committers, missing taggers."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:664
+#, priority:100
+msgid "If the user provides a --tag-name-filter that maps multiple tags to the same name, no warning or error is provided; git-filter-branch simply overwrites each tag in some undocumented pre-defined order resulting in only one tag at the end. (A git-filter-branch regression test requires this surprising behavior.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:667
+#, priority:100
+msgid "Also, the poor performance of git-filter-branch often leads to safety issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:683
+#, priority:100
+msgid "Coming up with the correct shell snippet to do the filtering you want is sometimes difficult unless you're just doing a trivial modification such as deleting a couple files. Unfortunately, people often learn if the snippet is right or wrong by trying it out, but the rightness or wrongness can vary depending on special circumstances (spaces in filenames, non-ascii filenames, funny author names or emails, invalid timezones, presence of grafts or replace objects, etc.), meaning they may have to wait a long time, hit an error, then restart. The performance of git-filter-branch is so bad that this cycle is painful, reducing the time available to carefully re-check (to say nothing about what it does to the patience of the person doing the rewrite even if they do technically have more time available). This problem is extra compounded because errors from broken filters may not be shown for a long time and/or get lost in a sea of output. Even worse, broken filters often just result in silent incorrect rewrites."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:691
+#, priority:100
+msgid "To top it all off, even when users finally find working commands, they naturally want to share them. But they may be unaware that their repo didn't have some special cases that someone else's does. So, when someone else with a different repository runs the same commands, they get hit by the problems above. Or, the user just runs commands that really were vetted for special cases, but they run it on a different OS where it doesn't work, as noted above."
msgstr ""
#. type: Title =
@@ -23823,7 +24101,7 @@ msgid "This command is intended mostly for internal use by scripts automatically
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:64
+#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:68
#, no-wrap, priority:240
msgid "--log[=<n>]"
msgstr ""
@@ -23835,7 +24113,7 @@ msgid "In addition to branch names, populate the log message with one-line descr
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:65
+#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:69
#, ignore-same, no-wrap, priority:240
msgid "--no-log"
msgstr "--no-log"
@@ -24506,9 +24784,9 @@ msgid ""
"\t\t [--signature-file=<file>]\n"
"\t\t [-n | --numbered | -N | --no-numbered]\n"
"\t\t [--start-number <n>] [--numbered-files]\n"
-"\t\t [--in-reply-to=Message-Id] [--suffix=.<sfx>]\n"
+"\t\t [--in-reply-to=<message id>] [--suffix=.<sfx>]\n"
"\t\t [--ignore-if-in-upstream]\n"
-"\t\t [--rfc] [--subject-prefix=Subject-Prefix]\n"
+"\t\t [--rfc] [--subject-prefix=<subject prefix>]\n"
"\t\t [(--reroll-count|-v) <n>]\n"
"\t\t [--to=<email>] [--cc=<email>]\n"
"\t\t [--[no-]cover-letter] [--quiet]\n"
@@ -24557,523 +24835,525 @@ msgid "By default, each output file is numbered sequentially from 1, and uses th
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:70
+#: en/git-format-patch.txt:71
#, priority:100
-msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`."
+msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`. All directory components will be created."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:74
+#: en/git-format-patch.txt:75
#, priority:100
msgid "By default, the subject of a single patch is \"[PATCH] \" followed by the concatenation of lines from the commit message up to the first blank line (see the DISCUSSION section of linkgit:git-commit[1])."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:78
+#: en/git-format-patch.txt:79
#, priority:100
msgid "When multiple patches are output, the subject prefix will instead be \"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. To omit patch numbers from the subject, use `-N`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:83
+#: en/git-format-patch.txt:84
#, priority:100
msgid "If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a `Message-Id` header to reference."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:89
+#: en/git-format-patch.txt:90
#, fuzzy, no-wrap, priority:100
msgid "-<n>"
msgstr "-U<n>"
#. type: Plain text
-#: en/git-format-patch.txt:91
+#: en/git-format-patch.txt:92
#, priority:100
msgid "Prepare patches from the topmost <n> commits."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:92
+#: en/git-format-patch.txt:93
#, no-wrap, priority:100
msgid "-o <dir>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:93
+#: en/git-format-patch.txt:94
#, no-wrap, priority:100
msgid "--output-directory <dir>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:96
+#: en/git-format-patch.txt:97
#, priority:100
msgid "Use <dir> to store the resulting files, instead of the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:98 en/git-shortlog.txt:30
+#: en/git-format-patch.txt:99 en/git-shortlog.txt:30
#, ignore-same, no-wrap, priority:260
msgid "--numbered"
msgstr "--numbered"
#. type: Plain text
-#: en/git-format-patch.txt:100
+#: en/git-format-patch.txt:101
#, priority:100
msgid "Name output in '[PATCH n/m]' format, even with a single patch."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:102
+#: en/git-format-patch.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-numbered"
msgstr "--no-numbered"
#. type: Plain text
-#: en/git-format-patch.txt:104
+#: en/git-format-patch.txt:105
#, priority:100
msgid "Name output in '[PATCH]' format."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:105
+#: en/git-format-patch.txt:106
#, no-wrap, priority:100
msgid "--start-number <n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:107
+#: en/git-format-patch.txt:108
#, fuzzy, priority:100
msgid "Start numbering the patches at <n> instead of 1."
msgstr "d챕marrer la num챕rotation des patchs 횪 <n> au lieu de 1"
#. type: Labeled list
-#: en/git-format-patch.txt:108
+#: en/git-format-patch.txt:109
#, ignore-same, no-wrap, priority:100
msgid "--numbered-files"
msgstr "--numbered-files"
#. type: Plain text
-#: en/git-format-patch.txt:111
+#: en/git-format-patch.txt:112
#, priority:100
msgid "Output file names will be a simple number sequence without the default first line of the commit appended."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:113
+#: en/git-format-patch.txt:114
#, ignore-same, no-wrap, priority:100
msgid "--keep-subject"
msgstr "--keep-subject"
#. type: Plain text
-#: en/git-format-patch.txt:116
+#: en/git-format-patch.txt:117
#, priority:100
msgid "Do not strip/add '[PATCH]' from the first line of the commit log message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:122
+#: en/git-format-patch.txt:123
#, fuzzy, priority:100
msgid "Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
msgstr "Ajouter une ligne `Signed-off-by:` au message de commit, en utilisant votre identit챕 pour validateur. R챕f챕rez-vous 횪 l'option signoff dans linkgit:git-commit[1] pour plus d'information."
#. type: Labeled list
-#: en/git-format-patch.txt:123 en/git-pack-objects.txt:59
+#: en/git-format-patch.txt:124 en/git-pack-objects.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--stdout"
msgstr "--stdout"
#. type: Plain text
-#: en/git-format-patch.txt:126
+#: en/git-format-patch.txt:127
#, priority:100
msgid "Print all commits to the standard output in mbox format, instead of creating a file for each one."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:127
+#: en/git-format-patch.txt:128
#, no-wrap, priority:100
msgid "--attach[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:131
+#: en/git-format-patch.txt:132
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: attachment`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:132
+#: en/git-format-patch.txt:133
#, ignore-same, no-wrap, priority:100
msgid "--no-attach"
msgstr "--no-attach"
#. type: Plain text
-#: en/git-format-patch.txt:135
+#: en/git-format-patch.txt:136
#, priority:100
msgid "Disable the creation of an attachment, overriding the configuration setting."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:136
+#: en/git-format-patch.txt:137
#, no-wrap, priority:100
msgid "--inline[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:140
+#: en/git-format-patch.txt:141
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: inline`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:141
+#: en/git-format-patch.txt:142
#, no-wrap, priority:100
msgid "--thread[=<style>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:142
+#: en/git-format-patch.txt:143
#, ignore-same, no-wrap, priority:100
msgid "--no-thread"
msgstr "--no-thread"
#. type: Plain text
-#: en/git-format-patch.txt:147
+#: en/git-format-patch.txt:148
#, priority:100
msgid "Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the first. Also controls generation of the `Message-Id` header to reference."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:153
+#: en/git-format-patch.txt:154
#, priority:100
msgid "The optional <style> argument can be either `shallow` or `deep`. 'shallow' threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order. 'deep' threading makes every mail a reply to the previous one."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:157
+#: en/git-format-patch.txt:158
#, priority:100
msgid "The default is `--no-thread`, unless the `format.thread` configuration is set. If `--thread` is specified without a style, it defaults to the style specified by `format.thread` if any, or else `shallow`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:161
+#: en/git-format-patch.txt:162
#, priority:100
msgid "Beware that the default for 'git send-email' is to thread emails itself. If you want `git format-patch` to take care of threading, you will want to ensure that threading is disabled for `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:162
-#, no-wrap, priority:100
-msgid "--in-reply-to=Message-Id"
-msgstr ""
+#: en/git-format-patch.txt:163
+#, fuzzy, no-wrap, priority:100
+#| msgid "--no-message-id"
+msgid "--in-reply-to=<message id>"
+msgstr "--no-message-id"
#. type: Plain text
-#: en/git-format-patch.txt:166
+#: en/git-format-patch.txt:167
#, priority:100
-msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given Message-Id, which avoids breaking threads to provide a new patch series."
+msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given <message id>, which avoids breaking threads to provide a new patch series."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:167
+#: en/git-format-patch.txt:168
#, ignore-same, no-wrap, priority:100
msgid "--ignore-if-in-upstream"
msgstr "--ignore-if-in-upstream"
#. type: Plain text
-#: en/git-format-patch.txt:173
+#: en/git-format-patch.txt:174
#, priority:100
msgid "Do not include a patch that matches a commit in <until>..<since>. This will examine all patches reachable from <since> but not from <until> and compare them with the patches being generated, and any patch that matches is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:174
-#, no-wrap, priority:100
-msgid "--subject-prefix=<Subject-Prefix>"
-msgstr ""
+#: en/git-format-patch.txt:175
+#, fuzzy, no-wrap, priority:100
+#| msgid "--dst-prefix=<prefix>"
+msgid "--subject-prefix=<subject prefix>"
+msgstr "--dst-prefix=<pr챕fixe>"
#. type: Plain text
-#: en/git-format-patch.txt:179
+#: en/git-format-patch.txt:180
#, priority:100
-msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<Subject-Prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
+msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<subject prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:180
+#: en/git-format-patch.txt:181
#, ignore-same, no-wrap, priority:100
msgid "--rfc"
msgstr "--rfc"
#. type: Plain text
-#: en/git-format-patch.txt:184
+#: en/git-format-patch.txt:185
#, priority:100
msgid "Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For Comments\"; use this when sending an experimental patch for discussion rather than application."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:185
+#: en/git-format-patch.txt:186
#, fuzzy, no-wrap, priority:100
msgid "-v <n>"
msgstr "-j <n>"
#. type: Labeled list
-#: en/git-format-patch.txt:186
+#: en/git-format-patch.txt:187
#, no-wrap, priority:100
msgid "--reroll-count=<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:193
+#: en/git-format-patch.txt:194
#, priority:100
msgid "Mark the series as the <n>-th iteration of the topic. The output filenames have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default, but configurable via the `--subject-prefix` option) has ` v<n>` appended to it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:194
+#: en/git-format-patch.txt:195
#, no-wrap, priority:100
msgid "--to=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:199
+#: en/git-format-patch.txt:200
#, priority:100
msgid "Add a `To:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-to` discards all `To:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:200
+#: en/git-format-patch.txt:201
#, no-wrap, priority:100
msgid "--cc=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:205
+#: en/git-format-patch.txt:206
#, priority:100
msgid "Add a `Cc:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-cc` discards all `Cc:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:206
+#: en/git-format-patch.txt:207
#, ignore-same, no-wrap, priority:100
msgid "--from"
msgstr "--from"
#. type: Labeled list
-#: en/git-format-patch.txt:207
+#: en/git-format-patch.txt:208
#, no-wrap, priority:100
msgid "--from=<ident>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:213
+#: en/git-format-patch.txt:214
#, priority:100
msgid "Use `ident` in the `From:` header of each commit email. If the author ident of the commit is not textually identical to the provided `ident`, place a `From:` header in the body of the message with the original author. If no `ident` is given, use the committer ident."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:220
+#: en/git-format-patch.txt:221
#, priority:100
msgid "Note that this option is only useful if you are actually sending the emails and want to identify yourself as the sender, but retain the original author (and `git am` will correctly pick up the in-body header). Note also that `git send-email` already handles this transformation for you, and this option should not be used if you are feeding the result to `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:221
+#: en/git-format-patch.txt:222
#, no-wrap, priority:100
msgid "--add-header=<header>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:228
+#: en/git-format-patch.txt:229
#, priority:100
msgid "Add an arbitrary header to the email headers. This is in addition to any configured headers, and may be used multiple times. For example, `--add-header=\"Organization: git-foo\"`. The negated form `--no-add-header` discards *all* (`To:`, `Cc:`, and custom) headers added so far from config or command line."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:229
+#: en/git-format-patch.txt:230
#, ignore-same, no-wrap, priority:100
msgid "--[no-]cover-letter"
msgstr "--[no-]cover-letter"
#. type: Plain text
-#: en/git-format-patch.txt:233
+#: en/git-format-patch.txt:234
#, priority:100
msgid "In addition to the patches, generate a cover letter file containing the branch description, shortlog and the overall diffstat. You can fill in a description in the file before sending it out."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:234
+#: en/git-format-patch.txt:235
#, no-wrap, priority:100
msgid "--interdiff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:242
+#: en/git-format-patch.txt:243
#, priority:100
msgid "As a reviewer aid, insert an interdiff into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` is a single revision naming the tip of the previous series which shares a common base with the series being formatted (for example `git format-patch --cover-letter --interdiff=feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:243
+#: en/git-format-patch.txt:244
#, no-wrap, priority:100
msgid "--range-diff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:254
+#: en/git-format-patch.txt:255
#, priority:100
msgid "As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1]) into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` can be a single revision naming the tip of the previous series if it shares a common base with the series being formatted (for example `git format-patch --cover-letter --range-diff=feature/v1 -3 feature/v2`), or a revision range if the two versions of the series are disjoint (for example `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:259
+#: en/git-format-patch.txt:260
#, priority:100
msgid "Note that diff options passed to the command affect how the primary product of `format-patch` is generated, and they are not passed to the underlying `range-diff` machinery used to generate the cover-letter material (this may change in the future)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:260
+#: en/git-format-patch.txt:261
#, no-wrap, priority:100
msgid "--creation-factor=<percent>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:265
+#: en/git-format-patch.txt:266
#, priority:100
msgid "Used with `--range-diff`, tweak the heuristic which matches up commits between the previous and current series of patches by adjusting the creation/deletion cost fudge factor. See linkgit:git-range-diff[1]) for details."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:266
+#: en/git-format-patch.txt:267
#, no-wrap, priority:100
msgid "--notes[=<ref>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:267 en/pretty-options.txt:81
+#: en/git-format-patch.txt:268 en/pretty-options.txt:81
#, ignore-same, no-wrap, priority:260
msgid "--no-notes"
msgstr "--no-notes"
#. type: Plain text
-#: en/git-format-patch.txt:270
+#: en/git-format-patch.txt:271
#, priority:100
msgid "Append the notes (see linkgit:git-notes[1]) for the commit after the three-dash line."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:278
+#: en/git-format-patch.txt:279
#, priority:100
msgid "The expected use case of this is to write supporting explanation for the commit that does not belong to the commit log message proper, and include it with the patch submission. While one can simply write these explanations after `format-patch` has run but before sending, keeping them as Git notes allows them to be maintained between versions of the patch series (but see the discussion of the `notes.rewrite` configuration options in linkgit:git-notes[1] to use this workflow)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:281
+#: en/git-format-patch.txt:282
#, priority:100
msgid "The default is `--no-notes`, unless the `format.notes` configuration is set."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:282
+#: en/git-format-patch.txt:283
#, no-wrap, priority:100
msgid "--[no-]signature=<signature>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:287
+#: en/git-format-patch.txt:288
#, priority:100
msgid "Add a signature to each message produced. Per RFC 3676 the signature is separated from the body by a line with '-- ' on it. If the signature option is omitted the signature defaults to the Git version number."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:288
+#: en/git-format-patch.txt:289
#, no-wrap, priority:100
msgid "--signature-file=<file>"
msgstr "--signature-file=<fichier>"
#. type: Plain text
-#: en/git-format-patch.txt:290
+#: en/git-format-patch.txt:291
#, priority:100
msgid "Works just like --signature except the signature is read from a file."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:291
+#: en/git-format-patch.txt:292
#, no-wrap, priority:100
msgid "--suffix=.<sfx>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:296
+#: en/git-format-patch.txt:297
#, priority:100
msgid "Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is `--suffix=.txt`. Leaving this empty will remove the `.patch` suffix."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:299
+#: en/git-format-patch.txt:300
#, priority:100
msgid "Note that the leading character does not have to be a dot; for example, you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:303
+#: en/git-format-patch.txt:304
#, priority:100
msgid "Do not print the names of the generated files to standard output."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:304
+#: en/git-format-patch.txt:305
#, ignore-same, no-wrap, priority:100
msgid "--no-binary"
msgstr "--no-binary"
#. type: Plain text
-#: en/git-format-patch.txt:309
+#: en/git-format-patch.txt:310
#, priority:100
msgid "Do not output contents of changes in binary files, instead display a notice that those files changed. Patches generated using this option cannot be applied properly, but they are still useful for code review."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:310
+#: en/git-format-patch.txt:311
#, ignore-same, no-wrap, priority:100
msgid "--zero-commit"
msgstr "--zero-commit"
#. type: Plain text
-#: en/git-format-patch.txt:313
+#: en/git-format-patch.txt:314
#, priority:100
msgid "Output an all-zero hash in each patch's From header instead of the hash of the commit."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:314
+#: en/git-format-patch.txt:315
#, no-wrap, priority:100
msgid "--base=<commit>"
msgstr "--base=<commit>"
#. type: Plain text
-#: en/git-format-patch.txt:318
+#: en/git-format-patch.txt:320
#, priority:100
-msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details."
+msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details. If <commit> is \"auto\", a base commit is automatically chosen."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:325
+#: en/git-format-patch.txt:327
#, priority:100
msgid "Treat the revision argument as a <revision range>, even if it is just a single commit (that would normally be treated as a <since>). Note that root commits included in the specified range are always formatted as creation patches, independently of this flag."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:328
+#: en/git-format-patch.txt:330
#, priority:100
msgid "Show progress reports on stderr as patches are generated."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:335
+#: en/git-format-patch.txt:338
#, priority:100
-msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To\" or \"Cc:\" headers, configure attachments, and sign off patches with configuration variables."
+msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To:\" or \"Cc:\" headers, configure attachments, change the patch output directory, and sign off patches with configuration variables."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:347
+#: en/git-format-patch.txt:351
#, no-wrap, priority:100
msgid ""
"[format]\n"
@@ -25085,17 +25365,18 @@ msgid ""
"\tcc = <email>\n"
"\tattach [ = mime-boundary-string ]\n"
"\tsignOff = true\n"
-"\tcoverletter = auto\n"
+"\toutputDirectory = <directory>\n"
+"\tcoverLetter = auto\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:356
+#: en/git-format-patch.txt:360
#, priority:100
msgid "The patch produced by 'git format-patch' is in UNIX mailbox format, with a fixed \"magic\" time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:366
+#: en/git-format-patch.txt:370
#, no-wrap, priority:100
msgid ""
"From 8f72bad1baf19a53459661343e21d6491c3908d3 Mon Sep 17 00:00:00 2001\n"
@@ -25109,7 +25390,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:369
+#: en/git-format-patch.txt:373
#, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -25117,7 +25398,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:372
+#: en/git-format-patch.txt:376
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"Do the same for ia64 so we can have sleek & trim looking\n"
@@ -25125,19 +25406,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:380
+#: en/git-format-patch.txt:384
#, ignore-ellipsis, priority:100
msgid "Typically it will be placed in a MUA's drafts folder, edited to add timely commentary that should not go in the changelog after the three dashes, and then sent as a message whose body, in our example, starts with \"arch/arm config files were...\". On the receiving end, readers can save interesting patches in a UNIX mailbox and apply them with linkgit:git-am[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:386
+#: en/git-format-patch.txt:390
#, priority:100
msgid "When a patch is part of an ongoing discussion, the patch generated by 'git format-patch' can be tweaked to take advantage of the 'git am --scissors' feature. After your response to the discussion comes a line that consists solely of \"`-- >8 --`\" (scissors and perforation), followed by the patch with unnecessary header fields removed:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:390
+#: en/git-format-patch.txt:394
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"...\n"
@@ -25145,13 +25426,13 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:392
+#: en/git-format-patch.txt:396
#, no-wrap, priority:100
msgid "Makes sense to me. How about this patch?\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:395
+#: en/git-format-patch.txt:399
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
@@ -25159,7 +25440,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:398
+#: en/git-format-patch.txt:402
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -25167,61 +25448,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:406
+#: en/git-format-patch.txt:410
#, priority:100
msgid "When sending a patch this way, most often you are sending your own patch, so in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit `From:` and `Date:` lines from the patch file. The patch title is likely to be different from the subject of the discussion the patch is in response to, so it is likely that you would want to keep the Subject: line, like the example above."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:408
+#: en/git-format-patch.txt:412
#, no-wrap, priority:100
msgid "Checking for patch corruption"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:411
+#: en/git-format-patch.txt:415
#, priority:100
msgid "Many mailers if not set up properly will corrupt whitespace. Here are two common types of corruption:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:413
+#: en/git-format-patch.txt:417
#, priority:100
msgid "Empty context lines that do not have _any_ whitespace."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:416
+#: en/git-format-patch.txt:420
#, priority:100
msgid "Non-empty context lines that have one extra whitespace at the beginning."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:418
+#: en/git-format-patch.txt:422
#, priority:100
msgid "One way to test if your MUA is set up correctly is:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:422
+#: en/git-format-patch.txt:426
#, priority:100
msgid "Send the patch to yourself, exactly the way you would, except with To: and Cc: lines that do not contain the list and maintainer address."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:425
+#: en/git-format-patch.txt:429
#, priority:100
msgid "Save that patch to a file in UNIX mailbox format. Call it a.patch, say."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:427
+#: en/git-format-patch.txt:431
#, priority:100
msgid "Apply it:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:432
+#: en/git-format-patch.txt:436
#, no-wrap, priority:100
msgid ""
"$ git fetch <project> master:test-apply\n"
@@ -25231,175 +25512,175 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:434
+#: en/git-format-patch.txt:438
#, priority:100
msgid "If it does not apply correctly, there can be various reasons."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:439
+#: en/git-format-patch.txt:443
#, priority:100
msgid "The patch itself does not apply cleanly. That is _bad_ but does not have much to do with your MUA. You might want to rebase the patch with linkgit:git-rebase[1] before regenerating it in this case."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:444
+#: en/git-format-patch.txt:448
#, priority:100
msgid "The MUA corrupted your patch; \"am\" would complain that the patch does not apply. Look in the .git/rebase-apply/ subdirectory and see what 'patch' file contains and check for the common corruption patterns mentioned above."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:452
+#: en/git-format-patch.txt:456
#, priority:100
msgid "While at it, check the 'info' and 'final-commit' files as well. If what is in 'final-commit' is not exactly what you would want to see in the commit log message, it is very likely that the receiver would end up hand editing the log message when applying your patch. Things like \"Hi, this is my first patch.\\n\" in the patch e-mail should come after the three-dash line that signals the end of the commit message."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:454
+#: en/git-format-patch.txt:458
#, no-wrap, priority:100
msgid "MUA-SPECIFIC HINTS"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:457
+#: en/git-format-patch.txt:461
#, priority:100
msgid "Here are some hints on how to successfully submit patches inline using various mailers."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:459
+#: en/git-format-patch.txt:463
#, no-wrap, priority:100
msgid "GMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:465
+#: en/git-format-patch.txt:469
#, priority:100
msgid "GMail does not have any way to turn off line wrapping in the web interface, so it will mangle any emails that you send. You can however use \"git send-email\" and send your patches through the GMail SMTP server, or use any IMAP email client to connect to the google IMAP server and forward the emails through that."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:468
+#: en/git-format-patch.txt:472
#, priority:100
msgid "For hints on using 'git send-email' to send your patches through the GMail SMTP server, see the EXAMPLE section of linkgit:git-send-email[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:471
+#: en/git-format-patch.txt:475
#, priority:100
msgid "For hints on submission using the IMAP interface, see the EXAMPLE section of linkgit:git-imap-send[1]."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:473
+#: en/git-format-patch.txt:477
#, no-wrap, priority:100
msgid "Thunderbird"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:477
+#: en/git-format-patch.txt:481
#, priority:100
msgid "By default, Thunderbird will both wrap emails as well as flag them as being 'format=flowed', both of which will make the resulting email unusable by Git."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:481
+#: en/git-format-patch.txt:485
#, priority:100
msgid "There are three different approaches: use an add-on to turn off line wraps, configure Thunderbird to not mangle patches, or use an external editor to keep Thunderbird from mangling the patches."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:483
+#: en/git-format-patch.txt:487
#, no-wrap, priority:100
msgid "Approach #1 (add-on)"
msgstr "Approche n째1 (add-on)"
#. type: Plain text
-#: en/git-format-patch.txt:491
+#: en/git-format-patch.txt:495
#, priority:100
msgid "Install the Toggle Word Wrap add-on that is available from https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you can tick off. Now you can compose the message as you otherwise do (cut + paste, 'git format-patch' | 'git imap-send', etc), but you have to insert line breaks manually in any text that you type."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:493
+#: en/git-format-patch.txt:497
#, no-wrap, priority:100
msgid "Approach #2 (configuration)"
msgstr "Approche n째2 (configuration)"
#. type: Plain text
-#: en/git-format-patch.txt:495
+#: en/git-format-patch.txt:499
#, priority:100
msgid "Three steps:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:499
+#: en/git-format-patch.txt:503
#, ignore-ellipsis, priority:100
msgid "Configure your mail server composition as plain text: Edit...Account Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:501
+#: en/git-format-patch.txt:505
#, priority:100
msgid "Configure your general composition window to not wrap."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:504
+#: en/git-format-patch.txt:508
#, priority:100
msgid "In Thunderbird 2: Edit..Preferences..Composition, wrap plain text messages at 0"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:510
+#: en/git-format-patch.txt:514
#, priority:100
msgid "In Thunderbird 3: Edit..Preferences..Advanced..Config Editor. Search for \"mail.wrap_long_lines\". Toggle it to make sure it is set to `false`. Also, search for \"mailnews.wraplength\" and set the value to 0."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:515
+#: en/git-format-patch.txt:519
#, priority:100
msgid "Disable the use of format=flowed: Edit..Preferences..Advanced..Config Editor. Search for \"mailnews.send_plaintext_flowed\". Toggle it to make sure it is set to `false`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:519
+#: en/git-format-patch.txt:523
#, priority:100
msgid "After that is done, you should be able to compose email as you otherwise would (cut + paste, 'git format-patch' | 'git imap-send', etc), and the patches will not be mangled."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:521
+#: en/git-format-patch.txt:525
#, no-wrap, priority:100
msgid "Approach #3 (external editor)"
msgstr "Approche n째3 (챕diteur externe)"
#. type: Plain text
-#: en/git-format-patch.txt:526
+#: en/git-format-patch.txt:530
#, priority:100
msgid "The following Thunderbird extensions are needed: AboutConfig from http://aboutconfig.mozdev.org/ and External Editor from http://globs.org/articles.php?lng=en&pg=8"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:528
+#: en/git-format-patch.txt:532
#, priority:100
msgid "Prepare the patch as a text file using your method of choice."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:533
+#: en/git-format-patch.txt:537
#, priority:100
msgid "Before opening a compose window, use Edit->Account Settings to uncheck the \"Compose messages in HTML format\" setting in the \"Composition & Addressing\" panel of the account to be used to send the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:537
+#: en/git-format-patch.txt:541
#, priority:100
msgid "In the main Thunderbird window, 'before' you open the compose window for the patch, use Tools->about:config to set the following to the indicated values:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:541
+#: en/git-format-patch.txt:545
#, no-wrap, priority:100
msgid ""
"\tmailnews.send_plaintext_flowed => false\n"
@@ -25407,25 +25688,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:544
+#: en/git-format-patch.txt:548
#, priority:100
msgid "Open a compose window and click the external editor icon."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:547
+#: en/git-format-patch.txt:551
#, priority:100
msgid "In the external editor window, read in the patch file and exit the editor normally."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:550
+#: en/git-format-patch.txt:554
#, priority:100
msgid "Side note: it may be possible to do step 2 with about:config and the following settings but no one's tried yet."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:555
+#: en/git-format-patch.txt:559
#, no-wrap, priority:100
msgid ""
"\tmail.html_compose => false\n"
@@ -25434,91 +25715,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:560
+#: en/git-format-patch.txt:564
#, priority:100
msgid "There is a script in contrib/thunderbird-patch-inline which can help you include patches with Thunderbird in an easy way. To use it, do the steps above and then use the script as the external editor."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:562
+#: en/git-format-patch.txt:566
#, no-wrap, priority:100
msgid "KMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:564
+#: en/git-format-patch.txt:568
#, priority:100
msgid "This should help you to submit patches inline using KMail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:566
+#: en/git-format-patch.txt:570
#, priority:100
msgid "Prepare the patch as a text file."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:568
+#: en/git-format-patch.txt:572
#, priority:100
msgid "Click on New Mail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:571
+#: en/git-format-patch.txt:575
#, priority:100
msgid "Go under \"Options\" in the Composer window and be sure that \"Word wrap\" is not set."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:573
+#: en/git-format-patch.txt:577
#, ignore-ellipsis, priority:100
msgid "Use Message -> Insert file... and insert the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:576
+#: en/git-format-patch.txt:580
#, priority:100
msgid "Back in the compose window: add whatever other text you wish to the message, complete the addressing and subject fields, and press send."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:578
+#: en/git-format-patch.txt:582
#, no-wrap, priority:100
msgid "BASE TREE INFORMATION"
msgstr "INFORMATION D'ARBRE DE BASE"
#. type: Plain text
-#: en/git-format-patch.txt:587
+#: en/git-format-patch.txt:591
#, priority:100
msgid "The base tree information block is used for maintainers or third party testers to know the exact state the patch series applies to. It consists of the 'base commit', which is a well-known commit that is part of the stable part of the project history everybody else works off of, and zero or more 'prerequisite patches', which are well-known patches in flight that is not yet part of the 'base commit' that need to be applied on top of 'base commit' in topological order before the patches can be applied."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:593
+#: en/git-format-patch.txt:597
#, priority:100
msgid "The 'base commit' is shown as \"base-commit: \" followed by the 40-hex of the commit object name. A 'prerequisite patch' is shown as \"prerequisite-patch-id: \" followed by the 40-hex 'patch id', which can be obtained by passing the patch through the `git patch-id --stable` command."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:597
+#: en/git-format-patch.txt:601
#, priority:100
msgid "Imagine that on top of the public commit P, you applied well-known patches X, Y and Z from somebody else, and then built your three-patch series A, B, C, the history would be like:"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:600
+#: en/git-format-patch.txt:604
#, no-wrap, priority:100
msgid "---P---X---Y---Z---A---B---C\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:607
+#: en/git-format-patch.txt:611
#, priority:100
msgid "With `git format-patch --base=P -3 C` (or variants thereof, e.g. with `--cover-letter` or using `Z..C` instead of `-3 C` to specify the range), the base tree information block is shown at the end of the first message the command outputs (either the first patch, or the cover letter), like this:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:613
+#: en/git-format-patch.txt:617
#, no-wrap, priority:100
msgid ""
"base-commit: P\n"
@@ -25528,13 +25809,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:616
+#: en/git-format-patch.txt:620
#, priority:100
msgid "For non-linear topology, such as"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:621
+#: en/git-format-patch.txt:625
#, no-wrap, priority:100
msgid ""
"---P---X---A---M---C\n"
@@ -25543,91 +25824,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:626
+#: en/git-format-patch.txt:630
#, priority:100
msgid "You can also use `git format-patch --base=P -3 C` to generate patches for A, B and C, and the identifiers for P, X, Y, Z are appended at the end of the first message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:632
+#: en/git-format-patch.txt:636
#, priority:100
msgid "If set `--base=auto` in cmdline, it will track base commit automatically, the base commit will be the merge base of tip commit of the remote-tracking branch and revision-range specified in cmdline. For a local branch, you need to track a remote branch by `git branch --set-upstream-to` before using this option."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:638
+#: en/git-format-patch.txt:642
#, priority:100
msgid "Extract commits between revisions R1 and R2, and apply them on top of the current branch using 'git am' to cherry-pick them:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:641
+#: en/git-format-patch.txt:645
#, no-wrap, priority:100
msgid "$ git format-patch -k --stdout R1..R2 | git am -3 -k\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:645
+#: en/git-format-patch.txt:649
#, priority:100
msgid "Extract all commits which are in the current branch but not in the origin branch:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:648
+#: en/git-format-patch.txt:652
#, no-wrap, priority:100
msgid "$ git format-patch origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:651
+#: en/git-format-patch.txt:655
#, priority:100
msgid "For each commit a separate file is created in the current directory."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:654
+#: en/git-format-patch.txt:658
#, priority:100
msgid "Extract all commits that lead to 'origin' since the inception of the project:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:657
+#: en/git-format-patch.txt:661
#, no-wrap, priority:100
msgid "$ git format-patch --root origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:660
+#: en/git-format-patch.txt:664
#, priority:100
msgid "The same as the previous one:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:663
+#: en/git-format-patch.txt:667
#, no-wrap, priority:100
msgid "$ git format-patch -M -B origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:670
+#: en/git-format-patch.txt:674
#, priority:100
msgid "Additionally, it detects and handles renames and complete rewrites intelligently to produce a renaming patch. A renaming patch reduces the amount of text output, and generally makes it easier to review. Note that non-Git \"patch\" programs won't understand renaming patches, so use it only when you know the recipient uses Git to apply your patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:673
+#: en/git-format-patch.txt:677
#, priority:100
msgid "Extract three topmost commits from the current branch and format them as e-mailable patches:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:676
+#: en/git-format-patch.txt:680
#, no-wrap, priority:100
msgid "$ git format-patch -3\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:681
+#: en/git-format-patch.txt:685
#, ignore-same, priority:100
msgid "linkgit:git-am[1], linkgit:git-send-email[1]"
msgstr "linkgit:git-am[1], linkgit:git-send-email[1]"
@@ -26127,43 +26408,43 @@ msgid "The below documentation is the same as what's found in linkgit:git-config
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:127
+#: en/git-gc.txt:126
#, priority:100
-msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, refs saved by 'git filter-branch' in refs/original/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
+msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, notes saved by 'git notes' under refs/notes/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:134
+#: en/git-gc.txt:133
#, priority:100
msgid "On the other hand, when 'git gc' runs concurrently with another process, there is a risk of it deleting an object that the other process is using but hasn't created a reference to. This may just cause the other process to fail or may corrupt the repository if the other process later adds a reference to the deleted object. Git has two features that significantly mitigate this problem:"
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:137
+#: en/git-gc.txt:136
#, priority:100
msgid "Any object with modification time newer than the `--prune` date is kept, along with everything reachable from it."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:141
+#: en/git-gc.txt:140
#, priority:100
msgid "Most operations that add an object to the database update the modification time of the object if it is already present so that #1 applies."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:145
+#: en/git-gc.txt:144
#, priority:100
msgid "However, these features fall short of a complete solution, so users who run commands concurrently have to live with some risk of corruption (which seems to be low in practice)."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:151
+#: en/git-gc.txt:150
#, priority:100
msgid "The 'git gc --auto' command will run the 'pre-auto-gc' hook. See linkgit:githooks[5] for more information."
msgstr "La commande 'git gc --auto' peut lancer le crochet `pre-auto-gc`. Voir linkgit:githooks[5] pour de plus amples informations."
#. type: Plain text
-#: en/git-gc.txt:159
+#: en/git-gc.txt:158
#, ignore-same, priority:100
msgid "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
msgstr "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
@@ -26429,7 +26710,7 @@ msgid "For each <pathspec> given on command line, descend at most <depth> levels
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:399
+#: en/git-grep.txt:128 en/git-submodule.txt:400
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
@@ -26645,7 +26926,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:951
+#: en/git-grep.txt:217 en/rev-list-options.txt:967
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -26795,127 +27076,151 @@ msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:280
+#: en/git-grep.txt:277
+#, priority:100
+msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:282
+#, priority:100
+msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:287
+#, priority:100
+msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:291
+#, priority:100
+msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:297
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:281
+#: en/git-grep.txt:298
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:282
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:283 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:284
+#: en/git-grep.txt:301
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:289
+#: en/git-grep.txt:306
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:290 en/rev-list-options.txt:65
+#: en/git-grep.txt:307 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:294
+#: en/git-grep.txt:311
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:299
+#: en/git-grep.txt:316
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:300
+#: en/git-grep.txt:317
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:303
+#: en/git-grep.txt:320
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr "Au lieu de rechercher les fichiers suivis dans l'arbre de travail, rechercher les blobs enregistr챕s dans les arbres fournis."
#. type: Plain text
-#: en/git-grep.txt:307
+#: en/git-grep.txt:324
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:328
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:318
+#: en/git-grep.txt:335
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:321
+#: en/git-grep.txt:338
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr "Recherche `time_t` dans tous les fichiers suivis `.c` et `.h` dans le r챕pertoire de travail et ses sous-r챕pertoires."
#. type: Labeled list
-#: en/git-grep.txt:322
+#: en/git-grep.txt:339
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:325
+#: en/git-grep.txt:342
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:326
+#: en/git-grep.txt:343
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:329
+#: en/git-grep.txt:346
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:330
+#: en/git-grep.txt:347
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr "`git grep solution -- :^Documentation`"
#. type: Plain text
-#: en/git-grep.txt:332
+#: en/git-grep.txt:349
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
@@ -27133,25 +27438,13 @@ msgstr ""
#. type: Plain text
#: en/git-gui.txt:116
#, priority:100
-msgid "A 'git gui' development repository can be obtained from:"
+msgid "The official repository of the 'git gui' project can be found at:"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:118
#, no-wrap, priority:100
-msgid " git clone git://repo.or.cz/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:122
-#, no-wrap, priority:100
-msgid " git clone http://repo.or.cz/r/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:124
-#, priority:100
-msgid "or browsed online at http://repo.or.cz/w/git-gui.git/[]."
+msgid " https://github.com/prati0100/git-gui.git/\n"
msgstr ""
#. type: Title =
@@ -30774,29 +31067,29 @@ msgstr ""
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
-#. type: Plain text
-#: en/git-ls-remote.txt:110
+#. type: delimited block -
+#: en/git-ls-remote.txt:111
#, no-wrap, priority:100
msgid ""
-"\t$ git ls-remote --tags ./.\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"\t$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
-"\t5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"\tc781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
-"\t$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
-"\t$ git ls-remote --tags korg v\\*\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"$ git ls-remote --tags ./.\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
+"$ git ls-remote --tags korg v\\*\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:114
+#: en/git-ls-remote.txt:116
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -31304,7 +31597,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:358
+#: en/git-merge-base.txt:60 en/git-rebase.txt:376
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -31333,235 +31626,264 @@ msgstr ""
msgid "For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:86
+#. type: delimited block .
+#: en/git-merge-base.txt:87
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---B\n"
-"\t /\n"
-"\t---o---1---o---o---o---A\n"
+"\t o---o---o---B\n"
+"\t/\n"
+"---o---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:88
+#: en/git-merge-base.txt:90
#, priority:100
msgid "the merge base between 'A' and 'B' is '1'."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:92
+#: en/git-merge-base.txt:94
#, priority:100
msgid "Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the merge base between 'A' and a hypothetical commit 'M', which is a merge between 'B' and 'C'. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:98
-#, no-wrap, priority:100
-msgid ""
-"\t o---o---o---o---C\n"
-"\t /\n"
-"\t / o---o---o---B\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+#. type: delimited block .
+#: en/git-merge-base.txt:101
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "\t D---E-------F\n"
+#| "\t / \\ \\\n"
+#| "\t B---C---G---H---I---J\n"
+#| "\t / \\\n"
+#| "\tA-------K---------------L--M\n"
+msgid ""
+" o---o---o---o---C\n"
+" /\n"
+" / o---o---o---B\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
+"\t D---E-------F\n"
+"\t / \\ \\\n"
+"\t B---C---G---H---I---J\n"
+"\t / \\\n"
+"\tA-------K---------------L--M\n"
#. type: Plain text
-#: en/git-merge-base.txt:101
+#: en/git-merge-base.txt:105
#, priority:100
msgid "the result of `git merge-base A B C` is '1'. This is because the equivalent topology with a merge commit 'M' between 'B' and 'C' is:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:108
-#, no-wrap, priority:100
-msgid ""
-"\t o---o---o---o---o\n"
-"\t / \\\n"
-"\t / o---o---o---o---M\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+#. type: delimited block .
+#: en/git-merge-base.txt:113
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "\t .-A---M---N---O---P---Q\n"
+#| "\t / / / / /\n"
+#| "\tI B / D /\n"
+#| "\t \\ / / / /\n"
+#| "\t `-------------'\n"
+msgid ""
+" o---o---o---o---o\n"
+" / \\\n"
+" / o---o---o---o---M\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
+"\t .-A---M---N---O---P---Q\n"
+"\t / / / / /\n"
+"\tI B / D /\n"
+"\t \\ / / / /\n"
+"\t `-------------'\n"
#. type: Plain text
-#: en/git-merge-base.txt:112
+#: en/git-merge-base.txt:118
#, priority:100
msgid "and the result of `git merge-base A M` is '1'. Commit '2' is also a common ancestor between 'A' and 'M', but '1' is a better common ancestor, because '2' is an ancestor of '1'. Hence, '2' is not a merge base."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:115
+#: en/git-merge-base.txt:121
#, priority:100
msgid "The result of `git merge-base --octopus A B C` is '2', because '2' is the best common ancestor of all commits."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:118
+#: en/git-merge-base.txt:124
#, priority:100
msgid "When the history involves criss-cross merges, there can be more than one 'best' common ancestor for two commits. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:124
-#, no-wrap, priority:100
+#. type: delimited block .
+#: en/git-merge-base.txt:131
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "\t .-A---N---O\n"
+#| "\t / / /\n"
+#| "\tI---------D\n"
msgid ""
-"\t---1---o---A\n"
-"\t \\ /\n"
-"\t X\n"
-"\t / \\\n"
-"\t---2---o---o---B\n"
+"---1---o---A\n"
+" \\ /\n"
+" X\n"
+" / \\\n"
+"---2---o---o---B\n"
msgstr ""
+"\t .-A---N---O\n"
+"\t / / /\n"
+"\tI---------D\n"
#. type: Plain text
-#: en/git-merge-base.txt:128
+#: en/git-merge-base.txt:136
#, priority:100
msgid "both '1' and '2' are merge-bases of A and B. Neither one is better than the other (both are 'best' merge bases). When the `--all` option is not given, it is unspecified which best one is output."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:133
+#: en/git-merge-base.txt:141
#, priority:100
msgid "A common idiom to check \"fast-forward-ness\" between two commits A and B is (or at least used to be) to compute the merge base between A and B, and check if it is the same as A, in which case, A is an ancestor of B. You will see this idiom used often in older scripts."
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:139
+#. type: delimited block .
+#: en/git-merge-base.txt:148
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tA=$(git rev-parse --verify A)\n"
-"\tif test \"$A\" = \"$(git merge-base A B)\"\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"A=$(git rev-parse --verify A)\n"
+"if test \"$A\" = \"$(git merge-base A B)\"\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:141
+#: en/git-merge-base.txt:151
#, priority:100
msgid "In modern git, you can say this in a more direct way:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:146
+#. type: delimited block .
+#: en/git-merge-base.txt:157
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tif git merge-base --is-ancestor A B\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"if git merge-base --is-ancestor A B\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:148
+#: en/git-merge-base.txt:160
#, priority:100
msgid "instead."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:150
+#: en/git-merge-base.txt:162
#, no-wrap, priority:100
msgid "Discussion on fork-point mode"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:156
+#: en/git-merge-base.txt:168
#, priority:100
msgid "After working on the `topic` branch created with `git switch -c topic origin/master`, the history of remote-tracking branch `origin/master` may have been rewound and rebuilt, leading to a history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:164
+#. type: delimited block .
+#: en/git-merge-base.txt:177
#, no-wrap, priority:100
msgid ""
-"\t o---B2\n"
-"\t /\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t \\\n"
-"\t B0\n"
-"\t \\\n"
-"\t D0---D1---D (topic)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\\n"
+"\t B0\n"
+"\t \\\n"
+"\t D0---D1---D (topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:170
+#: en/git-merge-base.txt:184
#, priority:100
msgid "where `origin/master` used to point at commits B0, B1, B2 and now it points at B, and your `topic` branch was started on top of it back when `origin/master` was at B0, and you built three commits, D0, D1, and D, on top of it. Imagine that you now want to rebase the work you did on the topic on top of the updated origin/master."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:176
+#: en/git-merge-base.txt:190
#, priority:100
msgid "In such a case, `git merge-base origin/master topic` would return the parent of B0 in the above picture, but B0^..D is *not* the range of commits you would want to replay on top of B (it includes B0, which is not what you wrote; it is a commit the other side discarded when it moved its tip from B0 to B1)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:184
+#: en/git-merge-base.txt:198
#, priority:100
msgid "`git merge-base --fork-point origin/master topic` is designed to help in such a case. It takes not only B but also B0, B1, and B2 (i.e. old tips of the remote-tracking branches your repository's reflog knows about) into account to see on which commit your topic branch was built and finds B0, allowing you to replay only the commits on your topic, excluding the commits the other side later discarded."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:186
+#: en/git-merge-base.txt:200
#, priority:100
msgid "Hence"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:188
+#: en/git-merge-base.txt:202
#, no-wrap, priority:100
msgid " $ fork_point=$(git merge-base --fork-point origin/master topic)\n"
msgstr " $ fork_point=$(git merge-base --fork-point origin/master topic)\n"
#. type: Plain text
-#: en/git-merge-base.txt:190
+#: en/git-merge-base.txt:204
#, priority:100
msgid "will find B0, and"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:192
+#: en/git-merge-base.txt:206
#, no-wrap, priority:100
msgid " $ git rebase --onto origin/master $fork_point topic\n"
msgstr " $ git rebase --onto origin/master $fork_point topic\n"
#. type: Plain text
-#: en/git-merge-base.txt:195
+#: en/git-merge-base.txt:209
#, priority:100
msgid "will replay D0, D1 and D on top of B to create a new history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:203
+#. type: delimited block .
+#: en/git-merge-base.txt:218
#, no-wrap, priority:100
msgid ""
-"\t\t\t o---B2\n"
-"\t\t\t/\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t\t\\ \\\n"
-"\t\t B0 D0'--D1'--D' (topic - updated)\n"
-"\t\t \\\n"
-"\t\t D0---D1---D (topic - old)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\ \\\n"
+"\t B0 D0'--D1'--D' (topic - updated)\n"
+"\t \\\n"
+"\t D0---D1---D (topic - old)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:210
+#: en/git-merge-base.txt:226
#, priority:100
msgid "A caveat is that older reflog entries in your repository may be expired by `git gc`. If B0 no longer appears in the reflog of the remote-tracking branch `origin/master`, the `--fork-point` mode obviously cannot find it and fails, avoiding to give a random and useless result (such as the parent of B0, like the same command without the `--fork-point` option gives)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:221
+#: en/git-merge-base.txt:237
#, priority:100
msgid "Also, the remote-tracking branch you use the `--fork-point` mode with must be the one your topic forked from its tip. If you forked from an older commit than the tip, this mode would not find the fork point (imagine in the above sample history B0 did not exist, origin/master started at B1, moved to B2 and then B, and you forked your topic at origin/master^ when origin/master was B1; the shape of the history would be the same as above, without B0, and the parent of B1 is what `git merge-base origin/master topic` correctly finds, but the `--fork-point` mode will not, because it is not one of the commits that used to be at the tip of origin/master)."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:224
+#: en/git-merge-base.txt:240
#, no-wrap, priority:100
msgid "See also"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:228
+#: en/git-merge-base.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
msgstr "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
@@ -31772,31 +32094,31 @@ msgstr ""
msgid "Examples:"
msgstr "Exemple혻:"
-#. type: Plain text
-#: en/git-merge-index.txt:62
+#. type: delimited block -
+#: en/git-merge-index.txt:63
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
-" This is MM from the original tree.\t\t\t# original\n"
-" This is modified MM in the branch A.\t\t\t# merge1\n"
-" This is modified MM in the branch B.\t\t\t# merge2\n"
-" This is modified MM in the branch B.\t\t\t# current contents\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
+"This is MM from the original tree.\t\t# original\n"
+"This is modified MM in the branch A.\t\t# merge1\n"
+"This is modified MM in the branch B.\t\t# merge2\n"
+"This is modified MM in the branch B.\t\t# current contents\n"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:71
+#. type: delimited block -
+#: en/git-merge-index.txt:74
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
-" cat: : No such file or directory\n"
-" This is added AA in the branch A.\n"
-" This is added AA in the branch B.\n"
-" This is added AA in the branch B.\n"
-" fatal: merge program failed\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
+"cat: : No such file or directory\n"
+"This is added AA in the branch A.\n"
+"This is added AA in the branch B.\n"
+"This is added AA in the branch B.\n"
+"fatal: merge program failed\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-index.txt:76
+#: en/git-merge-index.txt:80
#, priority:100
msgid "where the latter example shows how 'git merge-index' will stop trying to merge once anything has returned an error (i.e., `cat` returned an error for the AA file, because it didn't exist in the original, and thus 'git merge-index' didn't even try to merge the MM thing)."
msgstr ""
@@ -32094,7 +32416,7 @@ msgstr "Fusionner deux ou plusieurs historiques de d챕veloppement ensemble"
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n"
-"\t[-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
+"\t[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
"\t[--[no-]allow-unrelated-histories]\n"
"\t[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]\n"
"'git merge' (--continue | --abort | --quit)\n"
@@ -33177,7 +33499,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:281 en/merge-options.txt:108
+#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -34157,7 +34479,7 @@ msgid "Conflicts can occur when applying a commit to p4. When this happens, the
msgstr ""
#. type: Labeled list
-#: en/git-p4.txt:359 en/git-submodule.txt:270
+#: en/git-p4.txt:359 en/git-submodule.txt:271
#, no-wrap, priority:220
msgid "--branch <branch>"
msgstr "--branch <branche>"
@@ -35293,7 +35615,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:263 en/rev-list-options.txt:760
+#: en/git-pack-objects.txt:263 en/rev-list-options.txt:776
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -35305,13 +35627,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:266 en/rev-list-options.txt:767
+#: en/git-pack-objects.txt:266 en/rev-list-options.txt:783
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr "--missing=<action-manquante>"
#. type: Plain text
-#: en/git-pack-objects.txt:269 en/rev-list-options.txt:770
+#: en/git-pack-objects.txt:269 en/rev-list-options.txt:786
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr "Une option de d챕bogage pour aider au d챕veloppement futur de \"clones partiels\". Cette option sp챕cifie comment les objets manquants sont trait챕s."
@@ -35323,7 +35645,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:276 en/rev-list-options.txt:777
+#: en/git-pack-objects.txt:276 en/rev-list-options.txt:793
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr "La forme '--missing=allow-any' permet de continuer le parcours d'objet si un objet manquant est rencontr챕. Les objets manquants seront silencieusement omis des r챕sultats."
@@ -35335,7 +35657,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:281 en/rev-list-options.txt:785
+#: en/git-pack-objects.txt:281 en/rev-list-options.txt:801
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -36094,13 +36416,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:502
+#: en/git-pull.txt:136 en/git-rebase.txt:524
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:503
+#: en/git-pull.txt:137 en/git-rebase.txt:525
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -37895,8 +38217,8 @@ msgstr "R챕application des commits sur le sommet de l'autre base"
#: en/git-rebase.txt:16
#, no-wrap, priority:100
msgid ""
-"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
-"\t[<upstream> [<branch>]]\n"
+"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>]\n"
+"\t[--onto <newbase> | --keep-base] [<upstream> [<branch>]]\n"
"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
"\t--root [<branch>]\n"
"'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch)\n"
@@ -38215,512 +38537,542 @@ msgstr ""
msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD."
msgstr "Autre cas sp챕cial suppl챕mentaire, vous pouvez utiliser 짬혻A...B혻쨩 comme raccourci pour la base de fusion de `A` et `B` s'il y a exactement une seule base de fusion. Vous pouvez ne pas sp챕cifier `A` ou `B`, auquel cas ce sera `HEAD` par d챕faut."
+#. type: Labeled list
+#: en/git-rebase.txt:220
+#, ignore-same, no-wrap, priority:100
+msgid "--keep-base"
+msgstr "--keep-base"
+
+#. type: Plain text
+#: en/git-rebase.txt:225
+#, ignore-ellipsis, priority:100
+msgid "Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running 'git rebase --keep-base <upstream> <branch>' is equivalent to running 'git rebase --onto <upstream>... <upstream>'."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:230
+#, priority:100
+msgid "This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:235
+#, priority:100
+msgid "Although both this option and --fork-point find the merge base between <upstream> and <branch>, this option uses the merge base as the _starting point_ on which new commits will be created, whereas --fork-point uses the merge base to determine the _set of commits_ which will be rebased."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#, priority:100
+msgid "See also INCOMPATIBLE OPTIONS below."
+msgstr ""
+
#. type: Plain text
-#: en/git-rebase.txt:224
+#: en/git-rebase.txt:242
#, priority:100
msgid "Upstream branch to compare against. May be any valid commit, not just an existing branch name. Defaults to the configured upstream for the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:230
+#: en/git-rebase.txt:248
#, priority:100
msgid "Restart the rebasing process after having resolved a merge conflict."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237
+#: en/git-rebase.txt:255
#, priority:100
msgid "Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:242
+#: en/git-rebase.txt:260
#, priority:100
msgid "Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:243 en/git-rebase.txt:538
+#: en/git-rebase.txt:261 en/git-rebase.txt:560
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:246
+#: en/git-rebase.txt:264
#, priority:100
msgid "Keep the commits that do not change anything from its parents in the result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:248 en/git-rebase.txt:255 en/git-rebase.txt:280 en/git-rebase.txt:293 en/git-rebase.txt:302 en/git-rebase.txt:344 en/git-rebase.txt:379 en/git-rebase.txt:386 en/git-rebase.txt:393 en/git-rebase.txt:405 en/git-rebase.txt:445 en/git-rebase.txt:470 en/git-rebase.txt:482 en/git-rebase.txt:501
-#, priority:100
-msgid "See also INCOMPATIBLE OPTIONS below."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rebase.txt:253
+#: en/git-rebase.txt:271
#, priority:100
msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:258
+#: en/git-rebase.txt:276
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:259 en/git-rebase.txt:539
+#: en/git-rebase.txt:277 en/git-rebase.txt:561
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:261
+#: en/git-rebase.txt:279
#, fuzzy, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr "챕diter la liste 횪 faire lors d'un rebasage interactif"
#. type: Plain text
-#: en/git-rebase.txt:266
+#: en/git-rebase.txt:284
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:272
+#: en/git-rebase.txt:290
#, priority:100
msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:278
+#: en/git-rebase.txt:296
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:286
+#: en/git-rebase.txt:304
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:291
+#: en/git-rebase.txt:309
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:294
+#: en/git-rebase.txt:312
#, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr "-X <option-de-strategie>"
#. type: Labeled list
-#: en/git-rebase.txt:295
+#: en/git-rebase.txt:313
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:300
+#: en/git-rebase.txt:318
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:317
+#: en/git-rebase.txt:335
#, fuzzy, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr "챗tre silencieux. implique --no-stat"
#. type: Plain text
-#: en/git-rebase.txt:321
+#: en/git-rebase.txt:339
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr "Mode bavard. Implique --stat."
#. type: Plain text
-#: en/git-rebase.txt:325
+#: en/git-rebase.txt:343
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:329
+#: en/git-rebase.txt:347
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:332
+#: en/git-rebase.txt:350
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr "Cette option court-circuite le crochet pre-rebase. Voir aussi linkgit:githooks[5]."
#. type: Labeled list
-#: en/git-rebase.txt:333 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:336
+#: en/git-rebase.txt:354
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:345 en/merge-options.txt:47
+#: en/git-rebase.txt:363 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:346
+#: en/git-rebase.txt:364
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:351
+#: en/git-rebase.txt:369
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:357
+#: en/git-rebase.txt:375
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:359
+#: en/git-rebase.txt:377
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:363
+#: en/git-rebase.txt:381
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:387
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:372
+#: en/git-rebase.txt:390
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:394
+#, priority:100
+msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:399
#, priority:100
msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:384
+#: en/git-rebase.txt:406
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:391
+#: en/git-rebase.txt:413
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:421
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:403
+#: en/git-rebase.txt:425
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:407
+#: en/git-rebase.txt:429
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:415
+#: en/git-rebase.txt:437
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:422
+#: en/git-rebase.txt:444
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:426
+#: en/git-rebase.txt:448
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges`, but in contrast to that option works well in interactive rebases: commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:430
+#: en/git-rebase.txt:452
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:432
+#: en/git-rebase.txt:454
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:434 en/git-rebase.txt:535 en/git-svn.txt:680
+#: en/git-rebase.txt:456 en/git-rebase.txt:557 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:439
+#: en/git-rebase.txt:461
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:443
+#: en/git-rebase.txt:465
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:446
+#: en/git-rebase.txt:468
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:447
+#: en/git-rebase.txt:469
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:474
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:455
+#: en/git-rebase.txt:477
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:457
+#: en/git-rebase.txt:479
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:459
+#: en/git-rebase.txt:481
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:483
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:487
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:490
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:480
+#: en/git-rebase.txt:502
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:505
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:484
+#: en/git-rebase.txt:506
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:495
+#: en/git-rebase.txt:517
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:499
+#: en/git-rebase.txt:521
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:509
+#: en/git-rebase.txt:531
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:510
+#: en/git-rebase.txt:532
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:511
+#: en/git-rebase.txt:533
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:514
+#: en/git-rebase.txt:536
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:516
+#: en/git-rebase.txt:538
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr "OPTIONS INCOMPATIBLES"
#. type: Plain text
-#: en/git-rebase.txt:519
+#: en/git-rebase.txt:541
#, priority:100
msgid "The following options:"
msgstr "Les options suivantes혻:"
#. type: Plain text
-#: en/git-rebase.txt:523
+#: en/git-rebase.txt:545
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:527
+#: en/git-rebase.txt:549
#, priority:100
msgid "are incompatible with the following options:"
msgstr "sont incompatibles avec les options suivantes혻:"
#. type: Plain text
-#: en/git-rebase.txt:530
+#: en/git-rebase.txt:552
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:553
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:555
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Plain text
-#: en/git-rebase.txt:534
+#: en/git-rebase.txt:556
#, ignore-same, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:537
+#: en/git-rebase.txt:559
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:540
+#: en/git-rebase.txt:562
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:542
+#: en/git-rebase.txt:564
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:544
+#: en/git-rebase.txt:566
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr "--preserve-merges et --interactive"
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:567
#, fuzzy, priority:100
msgid "--preserve-merges and --signoff"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:546
+#: en/git-rebase.txt:568
#, fuzzy, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:547
+#: en/git-rebase.txt:569
#, priority:100
-msgid "--rebase-merges and --strategy"
+msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:548
+#: en/git-rebase.txt:570
#, priority:100
-msgid "--rebase-merges and --strategy-option"
+msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:550
+#: en/git-rebase.txt:572
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:575
#, no-wrap, priority:100
msgid "There are some subtle differences how the backends behave.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:556
+#: en/git-rebase.txt:578
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38728,7 +39080,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:561
+#: en/git-rebase.txt:583
#, no-wrap, priority:100
msgid ""
"The am backend drops any \"empty\" commits, regardless of whether the\n"
@@ -38738,7 +39090,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:588
#, no-wrap, priority:100
msgid ""
"The interactive backend drops commits by default that\n"
@@ -38748,7 +39100,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:591
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38756,7 +39108,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:573
+#: en/git-rebase.txt:595
#, no-wrap, priority:100
msgid ""
"Directory rename heuristics are enabled in the merge and interactive\n"
@@ -38765,145 +39117,145 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:597
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:577
+#: en/git-rebase.txt:599
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:582
+#: en/git-rebase.txt:604
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr "Vous devriez comprendre les implications de l'utilisation de 'git rebase' sur un d챕p척t partag챕. Voir la section 짬혻RATTRAPER UN REBASAGE AMONT혻쨩 ci-dessous."
#. type: Plain text
-#: en/git-rebase.txt:587
+#: en/git-rebase.txt:609
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:589
+#: en/git-rebase.txt:611
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:596
+#: en/git-rebase.txt:618
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:598
+#: en/git-rebase.txt:620
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:600
+#: en/git-rebase.txt:622
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:601
+#: en/git-rebase.txt:623
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:602
+#: en/git-rebase.txt:624
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:603
+#: en/git-rebase.txt:625
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:605
+#: en/git-rebase.txt:627
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:607
+#: en/git-rebase.txt:629
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:631
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:610
+#: en/git-rebase.txt:632
#, priority:100
msgid "commit"
msgstr "valider"
#. type: Plain text
-#: en/git-rebase.txt:612
+#: en/git-rebase.txt:634
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:614
+#: en/git-rebase.txt:636
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:615
+#: en/git-rebase.txt:637
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:616
+#: en/git-rebase.txt:638
#, priority:100
msgid "commit it"
msgstr "le valider"
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:644
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:646
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:626
+#: en/git-rebase.txt:648
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:653
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:658
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -38912,73 +39264,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:641
+#: en/git-rebase.txt:663
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:668
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:649
+#: en/git-rebase.txt:671
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:652
+#: en/git-rebase.txt:674
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:655
+#: en/git-rebase.txt:677
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:685
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:667
+#: en/git-rebase.txt:689
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:693
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:696
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:699
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:680
+#: en/git-rebase.txt:702
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:687
+#: en/git-rebase.txt:709
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -38989,25 +39341,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:691
+#: en/git-rebase.txt:713
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:694
+#: en/git-rebase.txt:716
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:701
+#: en/git-rebase.txt:723
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:710
+#: en/git-rebase.txt:732
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -39020,31 +39372,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:715
+#: en/git-rebase.txt:737
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:720
+#: en/git-rebase.txt:742
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:745
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:727
+#: en/git-rebase.txt:749
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:759
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -39058,85 +39410,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:740
+#: en/git-rebase.txt:762
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:746
+#: en/git-rebase.txt:768
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:750
+#: en/git-rebase.txt:772
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:752
+#: en/git-rebase.txt:774
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:756
+#: en/git-rebase.txt:778
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:760
+#: en/git-rebase.txt:782
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:763
+#: en/git-rebase.txt:785
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:765
+#: en/git-rebase.txt:787
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:767
+#: en/git-rebase.txt:789
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:794
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:775
+#: en/git-rebase.txt:797
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:804
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:809
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:816
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39147,13 +39499,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:819
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:826
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39164,13 +39516,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:808
+#: en/git-rebase.txt:830
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:815
+#: en/git-rebase.txt:837
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39181,73 +39533,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:822
+#: en/git-rebase.txt:844
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:824
+#: en/git-rebase.txt:846
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:825
+#: en/git-rebase.txt:847
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:829
+#: en/git-rebase.txt:851
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:836
+#: en/git-rebase.txt:859
#, priority:100
-msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or `filter-branch`."
+msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:839
+#: en/git-rebase.txt:862
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:867
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:848
+#: en/git-rebase.txt:871
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:850
+#: en/git-rebase.txt:873
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:875
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:858
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39258,19 +39610,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:885
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:866
+#: en/git-rebase.txt:889
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:894
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -39280,67 +39632,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:876
+#: en/git-rebase.txt:899
#, priority:100
-msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge-base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
+msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:880
+#: en/git-rebase.txt:903
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:883
+#: en/git-rebase.txt:906
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:886
+#: en/git-rebase.txt:909
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:888
+#: en/git-rebase.txt:911
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:893
+#: en/git-rebase.txt:916
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:895
+#: en/git-rebase.txt:918
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:926
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:907
+#: en/git-rebase.txt:930
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:912
+#: en/git-rebase.txt:935
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:922
+#: en/git-rebase.txt:945
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -39354,25 +39706,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:929
+#: en/git-rebase.txt:952
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:932
+#: en/git-rebase.txt:955
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:935 en/git-rebase.txt:1012
+#: en/git-rebase.txt:958 en/git-rebase.txt:1035
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:941
+#: en/git-rebase.txt:964
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39383,7 +39735,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:946
+#: en/git-rebase.txt:969
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39393,7 +39745,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:950
+#: en/git-rebase.txt:973
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39402,55 +39754,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:954
+#: en/git-rebase.txt:977
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:962
+#: en/git-rebase.txt:985
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:992
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:975
+#: en/git-rebase.txt:998
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:978
+#: en/git-rebase.txt:1001
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1008
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:989
+#: en/git-rebase.txt:1012
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:996
+#: en/git-rebase.txt:1019
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1003
+#: en/git-rebase.txt:1026
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39461,13 +39813,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1009
+#: en/git-rebase.txt:1032
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1015
+#: en/git-rebase.txt:1038
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39475,7 +39827,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1022
+#: en/git-rebase.txt:1045
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39487,7 +39839,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1049
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39496,37 +39848,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1035
+#: en/git-rebase.txt:1058
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1037
+#: en/git-rebase.txt:1060
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1039
+#: en/git-rebase.txt:1062
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1043
+#: en/git-rebase.txt:1066
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1068
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1072
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -39834,117 +40186,118 @@ msgstr ""
msgid "Using this hook, it is easy to generate mails describing the updates to the repository. This example script sends one mail message per ref listing the commits pushed to the repository, and logs the push certificates of signed pushes with good signatures to a logger service:"
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:191
+#. type: delimited block -
+#: en/git-receive-pack.txt:192
#, no-wrap, priority:100
msgid ""
-"\t#!/bin/sh\n"
-"\t# mail out commit update information.\n"
-"\twhile read oval nval ref\n"
-"\tdo\n"
-"\t\tif expr \"$oval\" : '0*$' >/dev/null\n"
-"\t\tthen\n"
-"\t\t\techo \"Created a new ref, with the following commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\"\n"
-"\t\telse\n"
-"\t\t\techo \"New commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
-"\t\tfi |\n"
-"\t\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
-"\tdone\n"
-"\t# log signed push certificate, if any\n"
-"\tif test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"#!/bin/sh\n"
+"# mail out commit update information.\n"
+"while read oval nval ref\n"
+"do\n"
+"\tif expr \"$oval\" : '0*$' >/dev/null\n"
"\tthen\n"
-"\t\t(\n"
-"\t\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
-"\t\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
-"\t\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
-"\tfi\n"
-"\texit 0\n"
+"\t\techo \"Created a new ref, with the following commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\"\n"
+"\telse\n"
+"\t\techo \"New commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
+"\tfi |\n"
+"\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
+"done\n"
+"# log signed push certificate, if any\n"
+"if test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"then\n"
+"\t(\n"
+"\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
+"\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
+"\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
+"fi\n"
+"exit 0\n"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:194
+#: en/git-receive-pack.txt:196
#, priority:100
msgid "The exit code from this hook invocation is ignored, however a non-zero exit code will generate an error message."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:200
+#: en/git-receive-pack.txt:202
#, priority:100
msgid "Note that it is possible for refname to not have sha1-new when this hook runs. This can easily occur if another user modifies the ref after it was updated by 'git-receive-pack', but before the hook was able to evaluate it. It is recommended that hooks rely on sha1-new rather than the current value of refname."
msgstr ""
#. type: Title -
-#: en/git-receive-pack.txt:202
+#: en/git-receive-pack.txt:204
#, no-wrap, priority:100
msgid "POST-UPDATE HOOK"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:207
+#: en/git-receive-pack.txt:209
#, priority:100
msgid "After all other processing, if at least one ref was updated, and if $GIT_DIR/hooks/post-update file exists and is executable, then post-update will be called with the list of refs that have been updated. This can be used to implement any repository wide cleanup tasks."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:211
+#: en/git-receive-pack.txt:213
#, priority:100
msgid "The exit code from this hook invocation is ignored; the only thing left for 'git-receive-pack' to do at that point is to exit itself anyway."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:214
+#: en/git-receive-pack.txt:216
#, priority:100
msgid "This hook can be used, for example, to run `git update-server-info` if the repository is packed and is served via a dumb transport."
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:217
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/git-receive-pack.txt:220
+#, fuzzy, no-wrap, priority:100
+#| msgid "git-update-server-info(1)"
msgid ""
-"\t#!/bin/sh\n"
-"\texec git update-server-info\n"
-msgstr ""
+"#!/bin/sh\n"
+"exec git update-server-info\n"
+msgstr "git-update-server-info(1)"
#. type: Title -
-#: en/git-receive-pack.txt:220
+#: en/git-receive-pack.txt:224
#, fuzzy, no-wrap, priority:100
msgid "QUARANTINE ENVIRONMENT"
msgstr "ENVIRONNEMENT ET VARIABLES DE CONFIGURATION"
#. type: Plain text
-#: en/git-receive-pack.txt:227
+#: en/git-receive-pack.txt:231
#, priority:100
msgid "When `receive-pack` takes in objects, they are placed into a temporary \"quarantine\" directory within the `$GIT_DIR/objects` directory and migrated into the main object store only after the `pre-receive` hook has completed. If the push fails before then, the temporary directory is removed entirely."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:229
+#: en/git-receive-pack.txt:233
#, priority:100
msgid "This has a few user-visible effects and caveats:"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:235
+#: en/git-receive-pack.txt:239
#, priority:100
msgid "Pushes which fail due to problems with the incoming pack, missing objects, or due to the `pre-receive` hook will not leave any on-disk data. This is usually helpful to prevent repeated failed pushes from filling up your disk, but can make debugging more challenging."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:238
+#: en/git-receive-pack.txt:242
#, priority:100
msgid "Any objects created by the `pre-receive` hook will be created in the quarantine directory (and migrated only if it succeeds)."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:244
+#: en/git-receive-pack.txt:248
#, priority:100
msgid "The `pre-receive` hook MUST NOT update any refs to point to quarantined objects. Other programs accessing the repository will not be able to see the objects (and if the pre-receive hook fails, those refs would become corrupted). For safety, any ref updates from within `pre-receive` are automatically rejected."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:249
+#: en/git-receive-pack.txt:253
#, ignore-same, priority:100
msgid "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
msgstr "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
@@ -41272,7 +41625,7 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:131
#, priority:100
-msgid "linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and linkgit:git-rebase[1], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
+msgid "linkgit:git-hash-object[1], linkgit:git-rebase[1], and https://github.com/newren/git-filter-repo[git-filter-repo], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
msgstr ""
#. type: Plain text
@@ -41295,8 +41648,9 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:158
-#, priority:100
-msgid "linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1]"
+#, fuzzy, priority:100
+#| msgid "linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1]"
+msgid "linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] https://github.com/newren/git-filter-repo[git-filter-repo]"
msgstr "linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1]"
#. type: Title =
@@ -42121,7 +42475,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr "Apr챔s inspection du r챕sultat de la fusion, vous pouvez trouver que cette modification dans l'autre branche n'est pas satisfaisante. Lancer `git reset --hard ORIG_HEAD` vous ram챔nera 횪 l'챕tat ant챕rieur, mais cela 챕liminera aussi vos modifications locales, ce que vous ne d챕sirez pas. `git reset --merge` conserve vos modifications locales."
#. type: Labeled list
-#: en/git-reset.txt:228 en/git-stash.txt:229
+#: en/git-reset.txt:228 en/git-stash.txt:230
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr "Interruption du flux de travail"
@@ -42956,102 +43310,50 @@ msgid "git-rev-list - Lists commit objects in reverse chronological order"
msgstr "Afficher les objets commit dans l'ordre chronologique inverse"
#. type: Plain text
-#: en/git-rev-list.txt:65
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"'git rev-list' [ --max-count=<number> ]\n"
-"\t [ --skip=<number> ]\n"
-"\t [ --max-age=<timestamp> ]\n"
-"\t [ --min-age=<timestamp> ]\n"
-"\t [ --sparse ]\n"
-"\t [ --merges ]\n"
-"\t [ --no-merges ]\n"
-"\t [ --min-parents=<number> ]\n"
-"\t [ --no-min-parents ]\n"
-"\t [ --max-parents=<number> ]\n"
-"\t [ --no-max-parents ]\n"
-"\t [ --first-parent ]\n"
-"\t [ --remove-empty ]\n"
-"\t [ --full-history ]\n"
-"\t [ --not ]\n"
-"\t [ --all ]\n"
-"\t [ --branches[=<pattern>] ]\n"
-"\t [ --tags[=<pattern>] ]\n"
-"\t [ --remotes[=<pattern>] ]\n"
-"\t [ --glob=<glob-pattern> ]\n"
-"\t [ --ignore-missing ]\n"
-"\t [ --stdin ]\n"
-"\t [ --quiet ]\n"
-"\t [ --topo-order ]\n"
-"\t [ --parents ]\n"
-"\t [ --timestamp ]\n"
-"\t [ --left-right ]\n"
-"\t [ --left-only ]\n"
-"\t [ --right-only ]\n"
-"\t [ --cherry-mark ]\n"
-"\t [ --cherry-pick ]\n"
-"\t [ --encoding=<encoding> ]\n"
-"\t [ --(author|committer|grep)=<pattern> ]\n"
-"\t [ --regexp-ignore-case | -i ]\n"
-"\t [ --extended-regexp | -E ]\n"
-"\t [ --fixed-strings | -F ]\n"
-"\t [ --date=<format>]\n"
-"\t [ [ --objects | --objects-edge | --objects-edge-aggressive ]\n"
-"\t [ --unpacked ]\n"
-"\t [ --object-names | --no-object-names ]\n"
-"\t [ --filter=<filter-spec> [ --filter-print-omitted ] ] ]\n"
-"\t [ --missing=<missing-action> ]\n"
-"\t [ --pretty | --header ]\n"
-"\t [ --bisect ]\n"
-"\t [ --bisect-vars ]\n"
-"\t [ --bisect-all ]\n"
-"\t [ --merge ]\n"
-"\t [ --reverse ]\n"
-"\t [ --walk-reflogs ]\n"
-"\t [ --no-walk ] [ --do-walk ]\n"
-"\t [ --count ]\n"
-"\t [ --use-bitmap-index ]\n"
-"\t <commit>... [ \\-- <paths>... ]\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:73
+#: en/git-rev-list.txt:13
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
+#| msgid "'git diff' [<options>] <commit> [--] [<path>...]"
+msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n"
+msgstr "'git diff' [<options>] <commit> [--] [<chemin>...]"
+
+#. type: Plain text
+#: en/git-rev-list.txt:21
#, priority:100
msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:80
+#: en/git-rev-list.txt:28
#, priority:100
msgid "You can think of this as a set operation. Commits given on the command line form a set of commits that are reachable from any of them, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:82
+#: en/git-rev-list.txt:30
#, priority:100
msgid "Thus, the following command:"
msgstr "Ainsi, la commande suivante혻:"
#. type: delimited block -
-#: en/git-rev-list.txt:85
+#: en/git-rev-list.txt:33
#, no-wrap, priority:100
msgid "\t$ git rev-list foo bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:89
+#: en/git-rev-list.txt:37
#, priority:100
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:93
+#: en/git-rev-list.txt:41
#, priority:100
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:97
+#: en/git-rev-list.txt:45
#, no-wrap, priority:100
msgid ""
"\t$ git rev-list origin..HEAD\n"
@@ -43059,13 +43361,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:102
+#: en/git-rev-list.txt:50
#, ignore-ellipsis, priority:100
msgid "Another special notation is \"'<commit1>'...'<commit2>'\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:106
+#: en/git-rev-list.txt:54
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git rev-list A B --not $(git merge-base --all A B)\n"
@@ -43073,7 +43375,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:113
+#: en/git-rev-list.txt:61
#, priority:100
msgid "'rev-list' is a very essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For this reason, it has a lot of different options that enables it to be used by commands as different as 'git bisect' and 'git repack'."
msgstr ""
@@ -45195,31 +45497,31 @@ msgstr ""
msgid "To use 'git send-email' to send your patches through the GMail SMTP server, edit ~/.gitconfig to specify your account settings:"
msgstr ""
-#. type: Plain text
-#: en/git-send-email.txt:494
+#. type: delimited block -
+#: en/git-send-email.txt:495
#, no-wrap, priority:100
msgid ""
-"\t[sendemail]\n"
-"\t\tsmtpEncryption = tls\n"
-"\t\tsmtpServer = smtp.gmail.com\n"
-"\t\tsmtpUser = yourname@gmail.com\n"
-"\t\tsmtpServerPort = 587\n"
+"[sendemail]\n"
+"\tsmtpEncryption = tls\n"
+"\tsmtpServer = smtp.gmail.com\n"
+"\tsmtpUser = yourname@gmail.com\n"
+"\tsmtpServerPort = 587\n"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:498
+#: en/git-send-email.txt:500
#, priority:100
msgid "If you have multifactor authentication setup on your gmail account, you will need to generate an app-specific password for use with 'git send-email'. Visit https://security.google.com/settings/security/apppasswords to create it."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:501
+#: en/git-send-email.txt:503
#, priority:100
msgid "Once your commits are ready to be sent to the mailing list, run the following commands:"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:505
+#: en/git-send-email.txt:507
#, no-wrap, priority:100
msgid ""
"\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -45228,19 +45530,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:510
+#: en/git-send-email.txt:512
#, priority:100
msgid "The first time you run it, you will be prompted for your credentials. Enter the app-specific or your regular password as appropriate. If you have credential helper configured (see linkgit:git-credential[1]), the password will be saved in the credential store so you won't have to type it the next time."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:518
#, priority:100
msgid "Note: the following core Perl modules that may be installed with your distribution of Perl are required: MIME::Base64, MIME::QuotedPrint, Net::Domain and Net::SMTP. These additional Perl modules are also required: Authen::SASL and Mail::Address."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:521
+#: en/git-send-email.txt:523
#, priority:100
msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
msgstr "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
@@ -46835,25 +47137,25 @@ msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--a
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:92
+#: en/git-stash.txt:93
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs, and any non-option arguments form the message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:93
+#: en/git-stash.txt:94
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:100
+#: en/git-stash.txt:101
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:104
+#: en/git-stash.txt:105
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46861,139 +47163,139 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:108
+#: en/git-stash.txt:109
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:109
+#: en/git-stash.txt:110
#, fuzzy, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr "git show [<options>] <objet>..."
#. type: Plain text
-#: en/git-stash.txt:119
+#: en/git-stash.txt:120
#, priority:240
msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:120
+#: en/git-stash.txt:121
#, fuzzy, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr "git stash pop [--index] [-q|--quiet] [<remise>]"
#. type: Plain text
-#: en/git-stash.txt:126
+#: en/git-stash.txt:127
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:130
+#: en/git-stash.txt:131
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:135
+#: en/git-stash.txt:136
#, priority:240
msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:138
+#: en/git-stash.txt:139
#, priority:240
msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:139
+#: en/git-stash.txt:140
#, fuzzy, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr "git stash apply [--index] [-q|--quiet] [<remise>]"
#. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:145
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:145
+#: en/git-stash.txt:146
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:153
+#: en/git-stash.txt:154
#, priority:240
msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:159
+#: en/git-stash.txt:160
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:160
+#: en/git-stash.txt:161
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:164
+#: en/git-stash.txt:165
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:165
+#: en/git-stash.txt:166
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:171
+#: en/git-stash.txt:172
#, priority:240
msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:172 en/git-update-ref.txt:100
+#: en/git-stash.txt:173 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:179
+#: en/git-stash.txt:180
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:180
+#: en/git-stash.txt:181
#, fuzzy, no-wrap, priority:240
msgid "store"
msgstr "score"
#. type: Plain text
-#: en/git-stash.txt:186
+#: en/git-stash.txt:187
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:195
+#: en/git-stash.txt:196
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:199
+#: en/git-stash.txt:200
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -47002,31 +47304,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:203
+#: en/git-stash.txt:204
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:208
+#: en/git-stash.txt:209
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:214
+#: en/git-stash.txt:215
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:219
+#: en/git-stash.txt:220
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:227
+#: en/git-stash.txt:228
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -47038,13 +47340,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:235
+#: en/git-stash.txt:236
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:246
+#: en/git-stash.txt:247
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47059,13 +47361,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:249
+#: en/git-stash.txt:250
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:257
+#: en/git-stash.txt:258
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47077,19 +47379,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:259
+#: en/git-stash.txt:260
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:264
+#: en/git-stash.txt:265
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:275
+#: en/git-stash.txt:276
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47104,19 +47406,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:277
+#: en/git-stash.txt:278
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:283
+#: en/git-stash.txt:284
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:288
+#: en/git-stash.txt:289
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -47125,7 +47427,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:298
+#: en/git-stash.txt:299
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -47203,61 +47505,61 @@ msgid "In addition to the names of files that have been changed, also show the t
msgstr "En plus des noms de fichiers qui ont 챕t챕 chang챕s, montrer aussi les changements textuels qui sont index챕s pour validation (c.-횪-d., comme la sortie de `git diff --cached`). Si `-v` est sp챕cifi챕 deux fois, alors montrer 챕galement les modifications dans l'arbre de travail qui n'ont pas encore 챕t챕 index챕es (c.-횪-d., comme la sortie de `git diff`)."
#. type: Plain text
-#: en/git-status.txt:65
+#: en/git-status.txt:66
#, priority:280
msgid "The mode parameter is used to specify the handling of untracked files. It is optional: it defaults to 'all', and if specified, it must be stuck to the option (e.g. `-uno`, but not `-u no`)."
msgstr "Le param챔tre mode est utilis챕 pour sp챕cifier le traitement des fichiers non-suivis. C'est optionnel혻: il vaut par d챕faut 'all', et si sp챕cifi챕, il doit 챗tre coll챕 횪 l'option (par exemple, `-uno`, mais pas `-u no`)."
#. type: Plain text
-#: en/git-status.txt:69
+#: en/git-status.txt:70
#, no-wrap, priority:280
msgid "'no' - Show no untracked files.\n"
msgstr "'no' - Ne montrer aucun fichier non-suivi.\n"
#. type: Plain text
-#: en/git-status.txt:70
+#: en/git-status.txt:71
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories.\n"
msgstr "'normal' - Montrer les fichiers non-suivis et les dossiers.\n"
#. type: Plain text
-#: en/git-status.txt:81
+#: en/git-status.txt:82
#, priority:280
msgid "When `-u` option is not used, untracked files and directories are shown (i.e. the same as specifying `normal`), to help you avoid forgetting to add newly created files. Because it takes extra work to find untracked files in the filesystem, this mode may take some time in a large working tree. Consider enabling untracked cache and split index if supported (see `git update-index --untracked-cache` and `git update-index --split-index`), Otherwise you can use `no` to have `git status` return more quickly without showing untracked files."
msgstr "Quand l'option `-u` n'est pas utilis챕e, les fichiers non-suivis et les dossiers sont montr챕s (c.-횪-d. comme en sp챕cifiant `normal`), pour vous aider 횪 챕viter d'oublier d'ajouter des fichiers nouvellement cr챕챕s. 횋tant donn챕 que la recherche de fichiers non-suivis dans le syst챔me de fichiers n챕cessite un travail suppl챕mentaire, ce mode peut prendre un certain temps dans un grand arbre de travail. Pensez 횪 activer le cache non suivi et l'index fractionn챕, le cas 챕ch챕ant (voyez `git update-index --untracked-cache` et `git update-index --split-index`), sinon vous pouvez utiliser `no` pour que `git status` revienne plus rapidement sans afficher les fichiers non-suivis."
#. type: Plain text
-#: en/git-status.txt:99
+#: en/git-status.txt:101
#, priority:280
msgid "Ignore changes to submodules when looking for changes. <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 before 1.7.0). Using \"all\" hides all changes to submodules (and suppresses the output of submodule summaries when the config option `status.submoduleSummary` is set)."
msgstr "Ignorer les modifications apport챕es aux sous-modules lors de la recherche de modifications. <quand> peut 챗tre \"none\", \"untracked\", \"dirty\" ou \"all\", qui est la valeur par d챕faut. Utiliser \"none\" consid챕rera le sous-module comme modifi챕 lorsqu'il contient des fichiers non suivis ou modifi챕s ou que sa HEAD diff챔re de la validation enregistr챕e dans le super-projet et peut 챗tre utilis챕 pour remplacer les param챔tres de l'option 'ignore' dans linkgit: git-config[1] ou linkgit: gitmodules[5]. Lorsque \"untracked\" est utilis챕, les sous-modules ne sont pas consid챕r챕s comme sales lorsqu'ils contiennent uniquement du contenu non suivi (mais ils sont toujours analys챕s pour rechercher le contenu modifi챕). L'utilisation de \"dirty\" ignore toutes les modifications apport챕es 횪 l'arborescence de travail des sous-modules혻; seules les modifications des validations stock챕es dans le super-projet sont affich챕es (il s'agissait du comportement avant la version 1.7.0). L'utilisation de \"all\" masque toutes les modifications apport챕es aux sous-modules (et supprime la sortie des r챕sum챕s de sous-modules lorsque l'option de configuration `status.submoduleSummary` est d챕finie)."
#. type: Labeled list
-#: en/git-status.txt:100
+#: en/git-status.txt:102
#, no-wrap, priority:280
msgid "--ignored[=<mode>]"
msgstr "--ignored[=<mode>]"
#. type: Plain text
-#: en/git-status.txt:102
+#: en/git-status.txt:104
#, priority:280
msgid "Show ignored files as well."
msgstr "Montrer aussi les fichiers ignor챕s."
#. type: Plain text
-#: en/git-status.txt:105
+#: en/git-status.txt:108
#, priority:280
msgid "The mode parameter is used to specify the handling of ignored files. It is optional: it defaults to 'traditional'."
msgstr "Le param챔tre mode est utilis챕 pour sp챕cifier le traitement des fichiers ignor챕s. Il est optionnel est vaut par d챕faut 'traditional'."
#. type: Plain text
-#: en/git-status.txt:109
+#: en/git-status.txt:112
#, priority:280
msgid "'traditional' - Shows ignored files and directories, unless"
msgstr "'traditional' - Montrer les fichiers non-suivis et les dossiers dont le contenu n'est pas suivi, 횪 moins que"
#. type: Plain text
-#: en/git-status.txt:112
+#: en/git-status.txt:115
#, no-wrap, priority:280
msgid ""
"--untracked-files=all is specified, in which case\n"
@@ -47269,109 +47571,109 @@ msgstr ""
"affich챕s.\n"
#. type: Plain text
-#: en/git-status.txt:113
+#: en/git-status.txt:116
#, no-wrap, priority:280
msgid "'no'\t - Show no ignored files.\n"
msgstr "'no'\t - Ne montrer aucun fichier ignor챕.\n"
#. type: Plain text
-#: en/git-status.txt:114
+#: en/git-status.txt:117
#, no-wrap, priority:280
msgid "'matching' - Shows ignored files and directories matching an\n"
msgstr "'matching' - Montre les fichiers et les dossiers ignor챕s correspondants 횪\n"
#. type: Plain text
-#: en/git-status.txt:115
+#: en/git-status.txt:118
#, no-wrap, priority:280
msgid "ignore pattern.\n"
msgstr "un motif 횪 ignorer.\n"
#. type: Plain text
-#: en/git-status.txt:121
+#: en/git-status.txt:124
#, priority:280
msgid "When 'matching' mode is specified, paths that explicitly match an ignored pattern are shown. If a directory matches an ignore pattern, then it is shown, but not paths contained in the ignored directory. If a directory does not match an ignore pattern, but all contents are ignored, then the directory is not shown, but all contents are shown."
msgstr "Quand le mode 'matching' est sp챕cifi챕, les chemins qui correspondent explicitement 횪 un motif 횪 ignorer sont affich챕s. Si un dossier correspond 횪 un motif 횪 ignorer, alors il est affich챕, mais pas les chemins contenus dans celui-ci. Si un dossier ne correspond pas 횪 un motif 횪 ignorer, mais que tout son contenu est ignor챕, alors le dossier n'est pas affich챕, mais tout son contenu est affich챕."
#. type: Plain text
-#: en/git-status.txt:125
+#: en/git-status.txt:129
#, priority:280
msgid "Terminate entries with NUL, instead of LF. This implies the `--porcelain=v1` output format if no other format is given."
msgstr "Terminer les entr챕es avec NUL au lieu de LF. Cela implique le format de sortie `--porcelain=v1` si aucun autre format n'est fourni."
#. type: Plain text
-#: en/git-status.txt:132
+#: en/git-status.txt:136
#, priority:280
msgid "Display untracked files in columns. See configuration variable column.status for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr "Afficher les fichiers non suivis en colonnes. Voir la variable de configuration column.status pour la syntaxe de l'option. `--column` et `--no-column` sans options sont 챕quivalents 횪 'always' et 'never' respectivement."
#. type: Labeled list
-#: en/git-status.txt:133
+#: en/git-status.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--ahead-behind"
msgstr "--ahead-behind"
#. type: Labeled list
-#: en/git-status.txt:134
+#: en/git-status.txt:138
#, ignore-same, no-wrap, priority:280
msgid "--no-ahead-behind"
msgstr "--no-ahead-behind"
#. type: Plain text
-#: en/git-status.txt:137
+#: en/git-status.txt:141
#, priority:280
msgid "Display or do not display detailed ahead/behind counts for the branch relative to its upstream branch. Defaults to true."
msgstr "Afficher ou ne pas afficher les comptes d챕taill챕s devant/derri챔re pour la branche par rapport 횪 sa branche amont. La valeur par d챕faut est true."
#. type: Labeled list
-#: en/git-status.txt:138
+#: en/git-status.txt:142
#, ignore-same, no-wrap, priority:280
msgid "--renames"
msgstr "--renames"
#. type: Plain text
-#: en/git-status.txt:142
+#: en/git-status.txt:146
#, priority:280
msgid "Turn on/off rename detection regardless of user configuration. See also linkgit:git-diff[1] `--no-renames`."
msgstr "Activer ou d챕sactiver la d챕tection de renommage sans tenir compte de la configuration utilisateur. Voir aussi linkgit:git-diff[1] `--no-renames`."
#. type: Plain text
-#: en/git-status.txt:147
+#: en/git-status.txt:151
#, priority:280
msgid "Turn on rename detection, optionally setting the similarity threshold. See also linkgit:git-diff[1] `--find-renames`."
msgstr "Activer la d챕tection de renommage, en d챕finissant de mani챔re optionnelle le seuil de similarit챕. Voir aussi linkgit:git-diff[1] `--find-renames`."
#. type: Plain text
-#: en/git-status.txt:150
+#: en/git-status.txt:154
#, priority:280
msgid "See the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr "Voir l'entr챕e 'sp챕cificateur de chemin' dans linkgit:gitglossary[7]."
#. type: Plain text
-#: en/git-status.txt:158
+#: en/git-status.txt:162
#, priority:280
msgid "The output from this command is designed to be used as a commit template comment. The default, long format, is designed to be human readable, verbose and descriptive. Its contents and format are subject to change at any time."
msgstr "La sortie de cette commande est con챌ue pour 챗tre utilis챕e comme mod챔le de message de validation. La valeur par d챕faut, format long, est con챌ue pour 챗tre lisible par un humain, comment챕e et descriptive. Son contenu et son format sont susceptibles de changer 횪 tout moment."
#. type: Plain text
-#: en/git-status.txt:163
+#: en/git-status.txt:167
#, priority:280
msgid "The paths mentioned in the output, unlike many other Git commands, are made relative to the current directory if you are working in a subdirectory (this is on purpose, to help cutting and pasting). See the status.relativePaths config option below."
msgstr "Contrairement au comportement de beaucoup d'autres commandes Git qui r챕f챕rencent la racine de l'arbre de travail, les chemins mentionn챕s dans la sortie sont relatifs au r챕pertoire courant (ceci est 횪 dessein, pour aider le couper-coller). Voir l'option de configuration status.relativePaths ci-dessous."
#. type: Title ~
-#: en/git-status.txt:165
+#: en/git-status.txt:169
#, no-wrap, priority:280
msgid "Short Format"
msgstr "Format court"
#. type: Plain text
-#: en/git-status.txt:169
+#: en/git-status.txt:173
#, priority:280
msgid "In the short-format, the status of each path is shown as one of these forms"
msgstr "Dans le format court, le statut de chaque chemin est affich챕 selon une de ces formes"
#. type: Plain text
-#: en/git-status.txt:172
+#: en/git-status.txt:176
#, no-wrap, priority:280
msgid ""
"\tXY PATH\n"
@@ -47381,73 +47683,73 @@ msgstr ""
"\tXY CHEMIN_ORIGINE -> CHEMIN\n"
#. type: Plain text
-#: en/git-status.txt:176
+#: en/git-status.txt:180
#, priority:280
msgid "where `ORIG_PATH` is where the renamed/copied contents came from. `ORIG_PATH` is only shown when the entry is renamed or copied. The `XY` is a two-letter status code."
msgstr "o첫 `CHEMIN_ORIGINE` est l'origine du contenu renomm챕/copi챕. `CHEMIN_ORIGINE` n'est montr챕 que lorsque l'entr챕e est renomm챕e ou copi챕e. Le `XY` est un code de statut 횪 deux lettres."
#. type: Plain text
-#: en/git-status.txt:182
+#: en/git-status.txt:186
#, priority:280
msgid "The fields (including the `->`) are separated from each other by a single space. If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash-escaped."
msgstr "Les champs (incluant le `->`) sont s챕par챕s les uns des autres par un seul espace. Si un nom de fichier contient des espaces ou d'autres caract챔res non imprimables, ce champ sera cit챕 횪 la mani챔re d'un litt챕ral de cha챤ne C혻: entour챕 par des caract챔res de guillemets ASCII (34), et avec les caract챔res sp챕ciaux 횪 l'int챕rieur 챕chapp챕s par la barre oblique invers챕e."
#. type: Plain text
-#: en/git-status.txt:188
+#: en/git-status.txt:192
#, priority:280
msgid "For paths with merge conflicts, `X` and `Y` show the modification states of each side of the merge. For paths that do not have merge conflicts, `X` shows the status of the index, and `Y` shows the status of the work tree. For untracked paths, `XY` are `??`. Other status codes can be interpreted as follows:"
msgstr "Pour les chemins avec des conflits de fusion, `X` et `Y` montrent les 챕tats de modification de chaque c척t챕 de la fusion. Pour les chemins qui n'ont pas de conflit de fusion, `X` montre le statut de l'index, et `Y` montre le statut de l'arbre de travail. Pour les chemins non suivis, `XY` sont `??`. Les autres codes de statut peuvent 챗tre interpr챕t챕s comme혻:"
#. type: Plain text
-#: en/git-status.txt:190
+#: en/git-status.txt:194
#, priority:280
msgid "' ' = unmodified"
msgstr "' ' = non modifi챕"
#. type: Plain text
-#: en/git-status.txt:191
+#: en/git-status.txt:195
#, priority:280
msgid "'M' = modified"
msgstr "'M' = modifi챕"
#. type: Plain text
-#: en/git-status.txt:192
+#: en/git-status.txt:196
#, priority:280
msgid "'A' = added"
msgstr "'A' = ajout챕"
#. type: Plain text
-#: en/git-status.txt:193
+#: en/git-status.txt:197
#, priority:280
msgid "'D' = deleted"
msgstr "'D' = supprim챕 ('Deleted')"
#. type: Plain text
-#: en/git-status.txt:194
+#: en/git-status.txt:198
#, priority:280
msgid "'R' = renamed"
msgstr "'R' = renomm챕"
#. type: Plain text
-#: en/git-status.txt:195
+#: en/git-status.txt:199
#, priority:280
msgid "'C' = copied"
msgstr "'C' = copi챕"
#. type: Plain text
-#: en/git-status.txt:196
+#: en/git-status.txt:200
#, priority:280
msgid "'U' = updated but unmerged"
msgstr "'U' = mis 횪 jour ('Updated') mais non fusionn챕"
#. type: Plain text
-#: en/git-status.txt:199
+#: en/git-status.txt:203
#, priority:280
msgid "Ignored files are not listed, unless `--ignored` option is in effect, in which case `XY` are `!!`."
msgstr "Les fichiers ignor챕s ne sont pas list챕s, 횪 moins que l'option `--ignored` soit effective, auquel cas `XY` sont `!!`."
#. type: delimited block .
-#: en/git-status.txt:226
+#: en/git-status.txt:230
#, no-wrap, priority:280
msgid ""
"X Y Meaning\n"
@@ -47503,7 +47805,7 @@ msgstr ""
"---------------------------------------------------------\n"
#. type: Plain text
-#: en/git-status.txt:235
+#: en/git-status.txt:239
#, no-wrap, priority:280
msgid ""
"Submodules have more state and instead report\n"
@@ -47523,91 +47825,91 @@ msgstr ""
"via `git add` dans le super-projet pour pr챕parer une validation.\n"
#. type: Plain text
-#: en/git-status.txt:238
+#: en/git-status.txt:242
#, priority:280
msgid "'m' and '?' are applied recursively. For example if a nested submodule in a submodule contains an untracked file, this is reported as '?' as well."
msgstr "'m' et '?' sont appliqu챕s r챕cursivement. Par exemple, si un sous-module nich챕 dans un sous-module contient un fichier non suivi, ceci sera aussi indiqu챕 par '?'."
#. type: Plain text
-#: en/git-status.txt:240
+#: en/git-status.txt:244
#, priority:280
msgid "If -b is used the short-format status is preceded by a line"
msgstr "Si -b est utilis챕, le statut en format court est pr챕c챕d챕 par une ligne"
#. type: Plain text
-#: en/git-status.txt:242
+#: en/git-status.txt:246
#, no-wrap, priority:280
msgid " ## branchname tracking info\n"
msgstr " ## information de suivi de branche\n"
#. type: Title ~
-#: en/git-status.txt:244
+#: en/git-status.txt:248
#, no-wrap, priority:280
msgid "Porcelain Format Version 1"
msgstr "Format de porcelaine version 1"
#. type: Plain text
-#: en/git-status.txt:251
+#: en/git-status.txt:255
#, priority:280
msgid "Version 1 porcelain format is similar to the short format, but is guaranteed not to change in a backwards-incompatible way between Git versions or based on user configuration. This makes it ideal for parsing by scripts. The description of the short format above also describes the porcelain format, with a few exceptions:"
msgstr "Le format de porcelaine de la version 1 est similaire au format court, mais le maintien de compatibilit챕 est garanti au fil des versions et ind챕pendamment de la configuration utilisateur. Cela le rend id챕al pour l'analyse par script. La description du format court ci-dessus d챕crit 챕galement le format porcelaine, avec quelques exceptions혻:"
#. type: Plain text
-#: en/git-status.txt:254
+#: en/git-status.txt:258
#, priority:280
msgid "The user's color.status configuration is not respected; color will always be off."
msgstr "La configuration color.status de l'utilisateur n'est pas respect챕e혻; la couleur sera toujours 챕teinte."
#. type: Plain text
-#: en/git-status.txt:257
+#: en/git-status.txt:261
#, priority:280
msgid "The user's status.relativePaths configuration is not respected; paths shown will always be relative to the repository root."
msgstr "La configuration status.relativePaths de l'utilisateur n'est pas respect챕e혻; les chemins affich챕s seront toujours relatifs 횪 la racine du d챕p척t."
#. type: Plain text
-#: en/git-status.txt:267
+#: en/git-status.txt:271
#, priority:280
msgid "There is also an alternate -z format recommended for machine parsing. In that format, the status field is the same, but some other things change. First, the '\\->' is omitted from rename entries and the field order is reversed (e.g 'from \\-> to' becomes 'to from'). Second, a NUL (ASCII 0) follows each filename, replacing space as a field separator and the terminating newline (but a space still separates the status field from the first filename). Third, filenames containing special characters are not specially formatted; no quoting or backslash-escaping is performed."
msgstr "Il y a aussi un format alternatif -z recommand챕 pour l'analyse par la machine. Dans ce format, le champ de statut est le m챗me, mais d'autres choses changent. Premi챔rement, le '\\->' est omis pour les entr챕es renomm챕es et l'ordre des champs est invers챕 (par exemple, 'de \\-> 횪' devient '횪 de'). Deuxi챔mement, un NUL (ASCII 0) suit chaque nom de fichier, rempla챌ant l'espace comme s챕parateur de champ et la nouvelle ligne de fin (mais un espace s챕pare toujours le champ de statut du premier nom de fichier). Troisi챔mement, les noms de fichier contenant des caract챔res sp챕ciaux ne sont pas sp챕cialement format챕s혻; aucune mise entre guillemets ni 챕chappement par barre oblique invers챕e n'est effectu챕."
#. type: Plain text
-#: en/git-status.txt:269
+#: en/git-status.txt:273
#, priority:280
msgid "Any submodule changes are reported as modified `M` instead of `m` or single `?`."
msgstr "N'importe quelle modification dans un sous-module est indiqu챕e comme modifi챕e par `M` au lieu de `m` ou un `?` seul."
#. type: Title ~
-#: en/git-status.txt:271
+#: en/git-status.txt:275
#, no-wrap, priority:280
msgid "Porcelain Format Version 2"
msgstr "Format de porcelaine version 2"
#. type: Plain text
-#: en/git-status.txt:276
+#: en/git-status.txt:280
#, priority:280
msgid "Version 2 format adds more detailed information about the state of the worktree and changed items. Version 2 also defines an extensible set of easy to parse optional headers."
msgstr "Le format version 2 ajoute des informations d챕taill챕es sur l'챕tat de l'arbre de travail et les 챕l챕ments modifi챕s. La version 2 d챕finit 챕galement un ensemble extensible d'en-t챗tes optionnels faciles 횪 analyser."
#. type: Plain text
-#: en/git-status.txt:280
+#: en/git-status.txt:284
#, priority:280
msgid "Header lines start with \"#\" and are added in response to specific command line arguments. Parsers should ignore headers they don't recognize."
msgstr "Les lignes d'en-t챗te commencent par \"#\" et sont ajout챕es en r챕ponse 횪 des arguments sp챕cifiques en ligne de commande. Les analyseurs syntaxiques doivent ignorer les en-t챗tes qu'ils ne reconnaissent pas."
#. type: Title ^
-#: en/git-status.txt:282
+#: en/git-status.txt:286
#, no-wrap, priority:280
msgid "Branch Headers"
msgstr "En-t챗tes de branche"
#. type: Plain text
-#: en/git-status.txt:286
+#: en/git-status.txt:290
#, priority:280
msgid "If `--branch` is given, a series of header lines are printed with information about the current branch."
msgstr "Si `--branch` est fourni, une s챕rie de lignes d'en-t챗te est affich챕e avec des informations sur la branche actuelle."
#. type: delimited block .
-#: en/git-status.txt:296
+#: en/git-status.txt:300
#, no-wrap, priority:280
msgid ""
"Line Notes\n"
@@ -47629,43 +47931,43 @@ msgstr ""
"------------------------------------------------------------\n"
#. type: Title ^
-#: en/git-status.txt:299
+#: en/git-status.txt:303
#, no-wrap, priority:280
msgid "Changed Tracked Entries"
msgstr "Entr챕es suivies modifi챕es"
#. type: Plain text
-#: en/git-status.txt:306
+#: en/git-status.txt:310
#, priority:280
msgid "Following the headers, a series of lines are printed for tracked entries. One of three different line formats may be used to describe an entry depending on the type of change. Tracked entries are printed in an undefined order; parsers should allow for a mixture of the 3 line types in any order."
msgstr "Apr챔s les en-t챗tes, une s챕rie de lignes est affich챕e pour les entr챕es suivies. Un des trois diff챕rents formats de ligne peut 챗tre utilis챕 pour d챕crire une entr챕e en fonction du type de changement. Les entr챕es suivies sont affich챕es dans un ordre ind챕fini혻; les analyseurs syntaxiques doivent autoriser un m챕lange des 3 types de lignes dans n'importe quel ordre."
#. type: Plain text
-#: en/git-status.txt:308
+#: en/git-status.txt:312
#, priority:280
msgid "Ordinary changed entries have the following format:"
msgstr "Les entr챕es modifi챕es normales ont le format suivant혻:"
#. type: Plain text
-#: en/git-status.txt:310
+#: en/git-status.txt:314
#, no-wrap, priority:280
msgid " 1 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <path>\n"
msgstr " 1 <XY> <sous> <mH> <mI> <mW> <hH> <hI> <chemin>\n"
#. type: Plain text
-#: en/git-status.txt:312
+#: en/git-status.txt:316
#, priority:280
msgid "Renamed or copied entries have the following format:"
msgstr "Les entr챕es renomm챕es ou copi챕es ont le format suivant혻:"
#. type: Plain text
-#: en/git-status.txt:314
+#: en/git-status.txt:318
#, no-wrap, priority:280
msgid " 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>\n"
msgstr " 2 <XY> <sous> <mH> <mI> <mW> <hH> <hI> <X><score> <chemin><sep><cheminOrig>\n"
#. type: delimited block .
-#: en/git-status.txt:345
+#: en/git-status.txt:349
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47729,19 +48031,19 @@ msgstr ""
"--------------------------------------------------------\n"
#. type: Plain text
-#: en/git-status.txt:349
+#: en/git-status.txt:353
#, priority:280
msgid "Unmerged entries have the following format; the first character is a \"u\" to distinguish from ordinary changed entries."
msgstr "Les entr챕es non fusionn챕es ont le format suivant혻; le premier caract챔re est un \"u\" pour les diff챕rencier des entr챕es ordinaires modifi챕es."
#. type: Plain text
-#: en/git-status.txt:351
+#: en/git-status.txt:355
#, no-wrap, priority:280
msgid " u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>\n"
msgstr " u <xy> <sous> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <chemin>\n"
#. type: delimited block .
-#: en/git-status.txt:368
+#: en/git-status.txt:372
#, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47777,85 +48079,85 @@ msgstr ""
"--------------------------------------------------------\n"
#. type: Title ^
-#: en/git-status.txt:371
+#: en/git-status.txt:375
#, no-wrap, priority:280
msgid "Other Items"
msgstr "Autres 챕l챕ments"
#. type: Plain text
-#: en/git-status.txt:376
+#: en/git-status.txt:380
#, priority:280
msgid "Following the tracked entries (and if requested), a series of lines will be printed for untracked and then ignored items found in the worktree."
msgstr "Apr챔s les entr챕es suivies (et si demand챕), une s챕rie de lignes sera affich챕e pour les 챕l챕ments non suivis, puis ignor챕s, trouv챕s dans l'arbre de travail."
#. type: Plain text
-#: en/git-status.txt:378
+#: en/git-status.txt:382
#, priority:280
msgid "Untracked items have the following format:"
msgstr "Les entr챕es non-suivies ont le format suivant혻:"
#. type: Plain text
-#: en/git-status.txt:380
+#: en/git-status.txt:384
#, no-wrap, priority:280
msgid " ? <path>\n"
msgstr " ? <chemin>\n"
#. type: Plain text
-#: en/git-status.txt:382
+#: en/git-status.txt:386
#, priority:280
msgid "Ignored items have the following format:"
msgstr "Les entr챕es ignor챕es ont le format suivant혻:"
#. type: Plain text
-#: en/git-status.txt:384
+#: en/git-status.txt:388
#, no-wrap, priority:280
msgid " ! <path>\n"
msgstr " ! <chemin>\n"
#. type: Title ^
-#: en/git-status.txt:386
+#: en/git-status.txt:390
#, no-wrap, priority:280
msgid "Pathname Format Notes and -z"
msgstr "Notes de format du nom de chemin et -z"
#. type: Plain text
-#: en/git-status.txt:391
+#: en/git-status.txt:395
#, priority:280
msgid "When the `-z` option is given, pathnames are printed as is and without any quoting and lines are terminated with a NUL (ASCII 0x00) byte."
msgstr "Quand l'option `-z` est fournie, les noms de chemin sont affich챕s tels quels et sans guillemets et les lignes sont termin챕es par un octet NUL (ASCII 0x00)."
#. type: Plain text
-#: en/git-status.txt:395
+#: en/git-status.txt:399
#, 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])."
msgstr "Sans l'option `-z`, les noms de chemin avec des caract챔res 짬혻inhabituels혻쨩 sont cit챕s comme expliqu챕 pour la variable de configuration `core.quotePath` (voir linkgit:git-config[1])."
#. type: Plain text
-#: en/git-status.txt:404
+#: en/git-status.txt:408
#, priority:280
msgid "The command honors `color.status` (or `status.color` -- they mean the same thing and the latter is kept for backward compatibility) and `color.status.<slot>` configuration variables to colorize its output."
msgstr "La commande honore les variables de configuration `color.status` (ou `status.color` -- elles signifient la m챗me chose et la derni챔re est conserv챕e pour la compatibilit챕 ascendante) et `color.status.<slot>` pour colorer sa sortie."
#. type: Plain text
-#: en/git-status.txt:408
+#: en/git-status.txt:412
#, priority:280
msgid "If the config variable `status.relativePaths` is set to false, then all paths shown are relative to the repository root, not to the current directory."
msgstr "Si la variable de configuration `status.relativePaths` est d챕finie 횪 'false', alors tous les chemins affich챕s sont relatifs 횪 la racine du d챕p척t, et non pas au r챕pertoire courant."
#. type: Plain text
-#: en/git-status.txt:419
+#: en/git-status.txt:423
#, priority:280
msgid "If `status.submoduleSummary` is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). Please note that the summary output from the status command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings."
msgstr "Si `status.submoduleSummary` est d챕fini sur un nombre non nul ou vrai (identique 횪 -1 ou 횪 un nombre illimit챕), le r챕sum챕 du sous-module sera activ챕 pour le format long et un r챕sum챕 des validations pour les sous-modules modifi챕s sera affich챕 (voir l'option --summary-limit de linkgit:git-submodule[1]). Veuillez noter que la sortie r챕capitulative de la commande status sera supprim챕e pour tous les sous-modules lorsque `diff.ignoreSubmodules` est r챕gl챕 sur 'all' ou uniquement pour les sous-modules o첫 `submodule.<Name>.ignore = all`. Pour afficher 챕galement le r챕sum챕 des sous-modules ignor챕s, vous pouvez utiliser l'option de ligne de commande --ignore-submodules=dirty ou la commande 'git submodule summary', qui affiche une sortie similaire mais ne respecte pas ces param챔tres."
#. type: Title -
-#: en/git-status.txt:421
+#: en/git-status.txt:425
#, no-wrap, priority:280
msgid "BACKGROUND REFRESH"
msgstr "RAFRA횓CHISSEMENT EN T횂CHE DE FOND"
#. type: Plain text
-#: en/git-status.txt:432
+#: en/git-status.txt:436
#, priority:280
msgid "By default, `git status` will automatically refresh the index, updating the cached stat information from the working tree and writing out the result. Writing out the updated index is an optimization that isn't strictly necessary (`status` computes the values for itself, but writing them out is just to save subsequent programs from repeating our computation). When `status` is run in the background, the lock held during the write may conflict with other simultaneous processes, causing them to fail. Scripts running `status` in the background should consider using `git --no-optional-locks status` (see linkgit:git[1] for details)."
msgstr "Par d챕faut, `git status` actualisera automatiquement l'index, mettant 횪 jour les informations statistiques mises en cache 횪 partir de l'arbre de travail et 챕crivant le r챕sultat. 횋crire l'index mis 횪 jour est une optimisation qui n'est pas strictement n챕cessaire (`status` calcule les valeurs pour lui-m챗me, mais les 챕crire ne sert qu'횪 챕pargner les programmes suivants de r챕p챕ter nos calculs). Lorsque `status` est ex챕cut챕 en arri챔re-plan, le verrou maintenu pendant l'챕criture peut entrer en conflit avec d'autres processus simultan챕s, entra챤nant leur 챕chec. Les scripts ex챕cutant `status` en arri챔re-plan doivent envisager d'utiliser `git --no-optional-locks status` (voir linkgit:git[1] pour plus de d챕tails)."
@@ -48299,282 +48601,288 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:176
#, no-wrap, priority:220
-msgid "set-branch ((-d|--default)|(-b|--branch <branch>)) [--] <path>"
+msgid "set-branch (-b|--branch) <branch> [--] <path>"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-submodule.txt:177
+#, no-wrap, priority:220
+msgid "set-branch (-d|--default) [--] <path>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:181
+#: en/git-submodule.txt:182
#, priority:220
msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:182
+#: en/git-submodule.txt:183
#, ignore-ellipsis, no-wrap, priority:220
msgid "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:191
+#: en/git-submodule.txt:192
#, priority:220
msgid "Show commit summary between the given commit (defaults to HEAD) and working tree/index. For a submodule in question, a series of commits in the submodule between the given super project commit and the index or working tree (switched by `--cached`) are shown. If the option `--files` is given, show the series of commits in the submodule between the index of the super project and the working tree of the submodule (this option doesn't allow to use the `--cached` option or to provide an explicit commit)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:194
+#: en/git-submodule.txt:195
#, priority:220
msgid "Using the `--submodule=log` option with linkgit:git-diff[1] will provide that information too."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:195
+#: en/git-submodule.txt:196
#, no-wrap, priority:220
msgid "foreach [--recursive] <command>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:216
+#: en/git-submodule.txt:217
#, priority:220
msgid "Evaluates an arbitrary shell command in each checked out submodule. The command has access to the variables $name, $sm_path, $displaypath, $sha1 and $toplevel: $name is the name of the relevant submodule section in `.gitmodules`, $sm_path is the path of the submodule as recorded in the immediate superproject, $displaypath contains the relative path from the current working directory to the submodules root directory, $sha1 is the commit as recorded in the immediate superproject, and $toplevel is the absolute path to the top-level of the immediate superproject. Note that to avoid conflicts with '$PATH' on Windows, the '$path' variable is now a deprecated synonym of '$sm_path' variable. Any submodules defined in the superproject but not checked out are ignored by this command. Unless given `--quiet`, foreach prints the name of each submodule before evaluating the command. If `--recursive` is given, submodules are traversed recursively (i.e. the given shell command is evaluated in nested submodules as well). A non-zero return from the command in any submodule causes the processing to terminate. This can be overridden by adding '|| :' to the end of the command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:219
+#: en/git-submodule.txt:220
#, priority:220
msgid "As an example, the command below will show the path and currently checked out commit for each submodule:"
msgstr ""
#. type: delimited block -
-#: en/git-submodule.txt:222
+#: en/git-submodule.txt:223
#, no-wrap, priority:220
msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:224
+#: en/git-submodule.txt:225
#, ignore-ellipsis, no-wrap, priority:220
msgid "sync [--recursive] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:231
+#: en/git-submodule.txt:232
#, priority:220
msgid "Synchronizes submodules' remote URL configuration setting to the value specified in `.gitmodules`. It will only affect those submodules which already have a URL entry in .git/config (that is the case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:234
+#: en/git-submodule.txt:235
#, priority:220
msgid "`git submodule sync` synchronizes all submodules while `git submodule sync -- A` synchronizes submodule \"A\" only."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:237
+#: en/git-submodule.txt:238
#, priority:220
msgid "If `--recursive` is specified, this command will recurse into the registered submodules, and sync any nested submodules within."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:238
+#: en/git-submodule.txt:239
#, no-wrap, priority:220
msgid "absorbgitdirs"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:245
+#: en/git-submodule.txt:246
#, priority:220
msgid "If a git directory of a submodule is inside the submodule, move the git directory of the submodule into its superprojects `$GIT_DIR/modules` path and then connect the git directory and its working directory by setting the `core.worktree` and adding a .git file pointing to the git directory embedded in the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:249
+#: en/git-submodule.txt:250
#, priority:220
msgid "A repository that was cloned independently and later added as a submodule or old setups have the submodules git directory inside the submodule instead of embedded into the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:251
+#: en/git-submodule.txt:252
#, priority:220
msgid "This command is recursive by default."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:257
+#: en/git-submodule.txt:258
#, priority:220
msgid "Only print error messages."
msgstr "N'afficher que les messages d'erreur."
#. type: Plain text
-#: en/git-submodule.txt:264
+#: en/git-submodule.txt:265
#, fuzzy, priority:220
msgid "This option is only valid for add and update commands. Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr "L'챕tat d'avancement est affich챕 sur la sortie d'erreur standard quand elle est attach챕e 횪 un terminal, 횪 moins que -q soit sp챕cifi챕. Ce drapeau force l'챕tat d'avancement m챗me si le flux d'erreur standard n'est pas dirig챕 vers un terminal."
#. type: Plain text
-#: en/git-submodule.txt:268
+#: en/git-submodule.txt:269
#, priority:220
msgid "This option is only valid for the deinit command. Unregister all submodules in the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:269
+#: en/git-submodule.txt:270
#, fuzzy, no-wrap, priority:220
#| msgid "-b <new_branch>"
msgid "-b <branch>"
msgstr "-b <nouvelle_branche>"
#. type: Plain text
-#: en/git-submodule.txt:277
+#: en/git-submodule.txt:278
#, priority:220
msgid "Branch of repository to add as submodule. The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository. If the option is not specified, it defaults to 'master'."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:290
+#: en/git-submodule.txt:291
#, priority:220
msgid "This option is only valid for add, deinit and update commands. When running add, allow adding an otherwise ignored submodule path. When running deinit the submodule working trees will be removed even if they contain local changes. When running update (only effective with the checkout procedure), throw away local changes in submodules when switching to a different commit; and always run a checkout operation in the submodule, even if the commit listed in the index of the containing repository matches the commit checked out in the submodule."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:295
+#: en/git-submodule.txt:296
#, priority:220
msgid "This option is only valid for status and summary commands. These commands typically use the commit found in the submodule HEAD, but with this option, the commit stored in the index is used instead."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:296
+#: en/git-submodule.txt:297
#, ignore-same, no-wrap, priority:220
msgid "--files"
msgstr "--files"
#. type: Plain text
-#: en/git-submodule.txt:300
+#: en/git-submodule.txt:301
#, priority:220
msgid "This option is only valid for the summary command. This command compares the commit in the index with that in the submodule HEAD when this option is used."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:302
+#: en/git-submodule.txt:303
#, ignore-same, no-wrap, priority:220
msgid "--summary-limit"
msgstr "--summary-limit"
#. type: Plain text
-#: en/git-submodule.txt:308
+#: en/git-submodule.txt:309
#, priority:220
msgid "This option is only valid for the summary command. Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:309
+#: en/git-submodule.txt:310
#, ignore-same, no-wrap, priority:220
msgid "--remote"
msgstr "--remote"
#. type: Plain text
-#: en/git-submodule.txt:318
+#: en/git-submodule.txt:319
#, priority:220
msgid "This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:324
+#: en/git-submodule.txt:325
#, priority:220
msgid "This works for any of the supported update procedures (`--checkout`, `--rebase`, etc.). The only change is the source of the target SHA-1. For example, `submodule update --remote --merge` will merge upstream submodule changes into the submodules, while `submodule update --merge` will merge superproject gitlink changes into the submodules."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:329
+#: en/git-submodule.txt:330
#, priority:220
msgid "In order to ensure a current tracking branch state, `update --remote` fetches the submodule's remote repository before calculating the SHA-1. If you don't want to fetch, you should use `submodule update --remote --no-fetch`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:339
+#: en/git-submodule.txt:340
#, priority:220
msgid "Use this option to integrate changes from the upstream subproject with your submodule's current HEAD. Alternatively, you can run `git pull` from the submodule, which is equivalent except for the remote branch name: `update --remote` uses the default upstream repository and `submodule.<name>.branch`, while `git pull` uses the submodule's `branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want to distribute the default upstream branch with the superproject and `branch.<name>.merge` if you want a more native feel while working in the submodule itself."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:341
+#: en/git-submodule.txt:342
#, ignore-same, no-wrap, priority:220
msgid "--no-fetch"
msgstr "--no-fetch"
#. type: Plain text
-#: en/git-submodule.txt:344
+#: en/git-submodule.txt:345
#, priority:220
msgid "This option is only valid for the update command. Don't fetch new objects from the remote site."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:345
+#: en/git-submodule.txt:346
#, ignore-same, no-wrap, priority:220
msgid "--checkout"
msgstr "--checkout"
#. type: Plain text
-#: en/git-submodule.txt:353
+#: en/git-submodule.txt:354
#, priority:220
msgid "This option is only valid for the update command. Checkout the commit recorded in the superproject on a detached HEAD in the submodule. This is the default behavior, the main use of this option is to override `submodule.$name.update` when set to a value other than `checkout`. If the key `submodule.$name.update` is either not explicitly set or set to `checkout`, this option is implicit."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:363
+#: en/git-submodule.txt:364
#, priority:220
msgid "This option is only valid for the update command. Merge the commit recorded in the superproject into the current branch of the submodule. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve the resulting conflicts within the submodule with the usual conflict resolution tools. If the key `submodule.$name.update` is set to `merge`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:364
+#: en/git-submodule.txt:365
#, ignore-same, no-wrap, priority:220
msgid "--rebase"
msgstr "--rebase"
#. type: Plain text
-#: en/git-submodule.txt:372
+#: en/git-submodule.txt:373
#, priority:220
msgid "This option is only valid for the update command. Rebase the current branch onto the commit recorded in the superproject. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve these failures with linkgit:git-rebase[1]. If the key `submodule.$name.update` is set to `rebase`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:373
+#: en/git-submodule.txt:374
#, ignore-same, no-wrap, priority:220
msgid "--init"
msgstr "--init"
#. type: Plain text
-#: en/git-submodule.txt:377
+#: en/git-submodule.txt:378
#, priority:220
msgid "This option is only valid for the update command. Initialize all submodules for which \"git submodule init\" has not been called so far before updating."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:378
+#: en/git-submodule.txt:379
#, ignore-same, no-wrap, priority:220
msgid "--name"
msgstr "--name"
#. type: Plain text
-#: en/git-submodule.txt:382
+#: en/git-submodule.txt:383
#, priority:220
msgid "This option is only valid for the add command. It sets the submodule's name to the given string instead of defaulting to its path. The name must be valid as a directory name and may not end with a '/'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:383
+#: en/git-submodule.txt:384
#, fuzzy, no-wrap, priority:220
msgid "--reference <repository>"
msgstr "d챕p척t de r챕f챕rence"
#. type: Plain text
-#: en/git-submodule.txt:387 en/git-submodule.txt:396
+#: en/git-submodule.txt:388 en/git-submodule.txt:397
#, priority:220
msgid "This option is only valid for add and update commands. These commands sometimes need to clone a remote repository. In this case, this option will be passed to the linkgit:git-clone[1] command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:391
+#: en/git-submodule.txt:392
#, no-wrap, priority:220
msgid ""
"*NOTE*: Do *not* use this option unless you have read the note\n"
@@ -48583,61 +48891,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:398
+#: en/git-submodule.txt:399
#, no-wrap, priority:220
msgid "*NOTE*: see the NOTE for the `--reference` option.\n"
msgstr "*NOTE* : voir NOTE pour l'option `--reference`.\n"
#. type: Plain text
-#: en/git-submodule.txt:404
+#: en/git-submodule.txt:405
#, priority:220
msgid "This option is only valid for foreach, update, status and sync commands. Traverse submodules recursively. The operation is performed not only in the submodules of the current repo, but also in any nested submodules inside those submodules (and so on)."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:405
+#: en/git-submodule.txt:406
#, ignore-same, no-wrap, priority:220
msgid "--depth"
msgstr "--depth"
#. type: Plain text
-#: en/git-submodule.txt:409
+#: en/git-submodule.txt:410
#, priority:220
msgid "This option is valid for add and update commands. Create a 'shallow' clone with a history truncated to the specified number of revisions. See linkgit:git-clone[1]"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:410
+#: en/git-submodule.txt:411
#, ignore-same, no-wrap, priority:220
msgid "--[no-]recommend-shallow"
msgstr "--[no-]recommend-shallow"
#. type: Plain text
-#: en/git-submodule.txt:415
+#: en/git-submodule.txt:416
#, priority:220
msgid "This option is only valid for the update command. The initial clone of a submodule will use the recommended `submodule.<name>.shallow` as provided by the `.gitmodules` file by default. To ignore the suggestions use `--no-recommend-shallow`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:421
+#: en/git-submodule.txt:422
#, priority:220
msgid "This option is only valid for the update command. Clone new submodules in parallel with as many jobs. Defaults to the `submodule.fetchJobs` option."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:426
+#: en/git-submodule.txt:427
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:434
+#: en/git-submodule.txt:435
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:438
+#: en/git-submodule.txt:439
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -49269,7 +49577,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:889
+#: en/git-svn.txt:346 en/rev-list-options.txt:905
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -50082,7 +50390,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:777
#, priority:100
-msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider linkgit:git-filter-branch[1] instead. filter-branch also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
+msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports, and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider https://github.com/newren/git-filter-repo[git-filter-repo] instead. filter-repo also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
msgstr ""
#. type: Labeled list
@@ -52050,16 +52358,6 @@ msgid ""
"#\n"
msgstr ""
-#. type: delimited block -
-#: en/git.txt:310
-#, 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/git.txt:315
#, no-wrap, priority:100
@@ -56123,170 +56421,183 @@ msgstr ""
msgid "This option determines how the merge message will be cleaned up before commiting. See linkgit:git-commit[1] for more details. In addition, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on to the commit machinery in the case of a merge conflict."
msgstr ""
+#. type: Labeled list
+#: en/merge-options.txt:44
+#, ignore-same, no-wrap, priority:240
+msgid "--ff-only"
+msgstr "--ff-only"
+
#. type: Plain text
-#: en/merge-options.txt:46
+#: en/merge-options.txt:50
#, priority:240
-msgid "When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. This is the default behavior."
+msgid "Specifies how a merge is handled when the merged-in history is already a descendant of the current history. `--ff` is the default unless merging an annotated (and possibly signed) tag that is not stored in its natural place in the `refs/tags/` hierarchy, in which case `--no-ff` is assumed."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:52
+#: en/merge-options.txt:55
#, priority:240
-msgid "Create a merge commit even when the merge resolves as a fast-forward. This is the default behaviour when merging an annotated (and possibly signed) tag that is not stored in its natural place in 'refs/tags/' hierarchy."
+msgid "With `--ff`, when possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit."
msgstr ""
-#. type: Labeled list
-#: en/merge-options.txt:53
-#, ignore-same, no-wrap, priority:240
-msgid "--ff-only"
-msgstr "--ff-only"
+#. type: Plain text
+#: en/merge-options.txt:58
+#, priority:240
+msgid "With `--no-ff`, create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward."
+msgstr ""
#. type: Plain text
-#: en/merge-options.txt:57
+#: en/merge-options.txt:61
#, priority:240
-msgid "Refuse to merge and exit with a non-zero status unless the current `HEAD` is already up to date or the merge can be resolved as a fast-forward."
+msgid "With `--ff-only`, resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:63
+#: en/merge-options.txt:67
#, priority:240
msgid "GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr "Signer le commit r챕sultant de la fusion avec GPG. L'argument `idcl챕` est optionnel avec par d챕faut l'identit챕 du validateur혻; si sp챕cifi챕e, elle doit 챗tre coll챕e 횪 l'option sans aucun espace."
#. type: Plain text
-#: en/merge-options.txt:69
+#: en/merge-options.txt:73
#, priority:240
msgid "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also linkgit:git-fmt-merge-msg[1]."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:72
+#: en/merge-options.txt:76
#, priority:240
msgid "With --no-log do not list one-line descriptions from the actual commits being merged."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:74
+#: en/merge-options.txt:78
#, ignore-same, no-wrap, priority:240
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
-#: en/merge-options.txt:83
+#: en/merge-options.txt:87
#, priority:240
msgid "With --no-signoff do not add a Signed-off-by line."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:89
+#: en/merge-options.txt:93
#, priority:240
msgid "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:92
+#: en/merge-options.txt:96
#, priority:240
msgid "With -n or --no-stat do not show a diffstat at the end of the merge."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:93
+#: en/merge-options.txt:97
#, ignore-same, no-wrap, priority:240
msgid "--squash"
msgstr "--squash"
#. type: Labeled list
-#: en/merge-options.txt:94
+#: en/merge-options.txt:98
#, ignore-same, no-wrap, priority:240
msgid "--no-squash"
msgstr "--no-squash"
#. type: Plain text
-#: en/merge-options.txt:102
+#: en/merge-options.txt:106
#, priority:240
msgid "Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:105
+#: en/merge-options.txt:109
#, priority:240
msgid "With --no-squash perform the merge and commit the result. This option can be used to override --squash."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:107
+#: en/merge-options.txt:111
#, priority:240
msgid "With --squash, --commit is not allowed, and will fail."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:115
+#, fuzzy, priority:240
+#| msgid "This option bypasses the pre-commit and commit-msg hooks. See also linkgit:githooks[5]."
+msgid "This option bypasses the pre-merge and commit-msg hooks. See also linkgit:githooks[5]."
+msgstr "Cette option court-circuite les crochets pre-commit et commit-msg. Voir aussi linkgit:githooks[5]."
+
+#. type: Plain text
+#: en/merge-options.txt:123
#, priority:240
msgid "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise)."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:116
+#: en/merge-options.txt:124
#, no-wrap, priority:240
msgid "-X <option>"
msgstr "-X <option>"
#. type: Plain text
-#: en/merge-options.txt:120
+#: en/merge-options.txt:128
#, priority:240
msgid "Pass merge strategy specific option through to the merge strategy."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:121
+#: en/merge-options.txt:129
#, ignore-same, no-wrap, priority:240
msgid "--verify-signatures"
msgstr "--verify-signatures"
#. type: Labeled list
-#: en/merge-options.txt:122
+#: en/merge-options.txt:130
#, ignore-same, no-wrap, priority:240
msgid "--no-verify-signatures"
msgstr "--no-verify-signatures"
#. type: Plain text
-#: en/merge-options.txt:128
+#: en/merge-options.txt:136
#, priority:240
msgid "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:130
+#: en/merge-options.txt:138
#, ignore-same, no-wrap, priority:240
msgid "--no-summary"
msgstr "--no-summary"
#. type: Plain text
-#: en/merge-options.txt:133
+#: en/merge-options.txt:141
#, priority:240
msgid "Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:138
+#: en/merge-options.txt:146
#, priority:240
msgid "Operate quietly. Implies --no-progress."
msgstr "Mode Silencieux. Implique --no-progress."
#. type: Plain text
-#: en/merge-options.txt:149
+#: en/merge-options.txt:157
#, priority:240
msgid "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:152
+#: en/merge-options.txt:160
#, ignore-same, no-wrap, priority:240
msgid "--allow-unrelated-histories"
msgstr "--allow-unrelated-histories"
#. type: Plain text
-#: en/merge-options.txt:158
+#: en/merge-options.txt:166
#, priority:240
msgid "By default, `git merge` command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added."
msgstr ""
@@ -57627,8 +57938,9 @@ msgstr "s챕lecteur de reflog, par exemple, `refs/stash@{1}`` ou `refs/stash@{2"
#. type: Plain text
#: en/pretty-formats.txt:215
-#, priority:260
-msgid "minutes ago`}; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+#, fuzzy, priority:260
+#| msgid "minutes ago`}; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr "minutes ago`} ; le format suit les r챔gles d챕crites pour l'option `-g'. La partie avant `@' est le refname tel qu'il est donn챕 sur la ligne de commande (donc `git log -g refs/heads/master` produirait `refs/heads/master@{0}`)."
#. type: Labeled list
@@ -60049,263 +60361,281 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:762
#, priority:260
+msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:771
+#, ignore-ellipsis, priority:260
+msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:775
+#, priority:260
+msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:778
+#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:779
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:766
+#: en/rev-list-options.txt:782
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:773
+#: en/rev-list-options.txt:789
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:781
+#: en/rev-list-options.txt:797
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:800
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:791
+#: en/rev-list-options.txt:807
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:793
+#: en/rev-list-options.txt:809
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:801
+#: en/rev-list-options.txt:817
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:802
+#: en/rev-list-options.txt:818
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:804
+#: en/rev-list-options.txt:820
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:822
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr "Formatage des commits"
#. type: Plain text
-#: en/rev-list-options.txt:812
+#: en/rev-list-options.txt:828
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:832
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:818
+#: en/rev-list-options.txt:834
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:819
+#: en/rev-list-options.txt:835
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr "--date=<format>"
#. type: Plain text
-#: en/rev-list-options.txt:826
+#: en/rev-list-options.txt:842
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:847
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:833
+#: en/rev-list-options.txt:849
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:852
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:838
+#: en/rev-list-options.txt:854
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:839
+#: en/rev-list-options.txt:855
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:840
+#: en/rev-list-options.txt:856
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:859
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:846
+#: en/rev-list-options.txt:862
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:864
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:873
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:864
+#: en/rev-list-options.txt:880
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:868
+#: en/rev-list-options.txt:884
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:875
+#: en/rev-list-options.txt:891
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:894
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:880
+#: en/rev-list-options.txt:896
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:882
+#: en/rev-list-options.txt:898
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:884
+#: en/rev-list-options.txt:900
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:887
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:892
+#: en/rev-list-options.txt:908
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:909
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:896
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:898
+#: en/rev-list-options.txt:914
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:902
+#: en/rev-list-options.txt:918
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:907
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:925
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:932
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -60316,19 +60646,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:919
+#: en/rev-list-options.txt:935
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:922
+#: en/rev-list-options.txt:938
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:929
+#: en/rev-list-options.txt:945
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -60340,85 +60670,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:931
+#: en/rev-list-options.txt:947
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:937
+#: en/rev-list-options.txt:953
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:939
+#: en/rev-list-options.txt:955
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:942
+#: en/rev-list-options.txt:958
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:943
+#: en/rev-list-options.txt:959
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:949
+#: en/rev-list-options.txt:965
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:959
+#: en/rev-list-options.txt:975
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:963
+#: en/rev-list-options.txt:979
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr "Formatage des diffs"
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:984
#, priority:260
msgid "Listed below are options that control the formatting of diff output. Some of them are specific to linkgit:git-rev-list[1], however other diff options may be given. See linkgit:git-diff-files[1] for more options."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:991
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:981
+#: en/rev-list-options.txt:997
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:1012
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1015
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1018
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.hu.po b/po/documentation.hu.po
index 7253a5a890aa765fcccfcb2d9f16ef06307209e5..e47c5e6b929e630ed1b77d71a98294ca53d3bf86 100644
--- a/po/documentation.hu.po
+++ b/po/documentation.hu.po
@@ -6,9 +6,9 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2019-08-27 18:53+0200\n"
+"POT-Creation-Date: 2019-12-08 16:35+0100\n"
"PO-Revision-Date: 2019-10-31 12:31+0100\n"
-"Last-Translator: Matthias A횩hauer <mha1993@live.de>\n"
+"Last-Translator: Matthias Ahauer <mha1993@live.de>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: hu\n"
"MIME-Version: 1.0\n"
@@ -23,12 +23,12 @@ msgstr "-b"
#. type: Plain text
#: en/blame-options.txt:4
-#, ignore-translated, priority:100
+#, priority:100
msgid "Show blank SHA-1 for boundary commits. This can also be controlled via the `blame.blankboundary` config option."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:319 en/git-fsck.txt:38 en/git-rebase.txt:471
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:321 en/git-fsck.txt:38 en/git-rebase.txt:493
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -88,7 +88,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1000
+#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1016
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -124,7 +124,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:433 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -466,7 +466,7 @@ msgid "Get and set repository or global options."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1505
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1528
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-export[1]"
msgstr "linkgit:git-fast-export[1]"
@@ -478,7 +478,7 @@ msgid "Git data exporter."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:243
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-import[1]"
msgstr "linkgit:git-fast-import[1]"
@@ -2259,95 +2259,95 @@ msgstr ""
msgid "Example"
msgstr ""
-#. type: Plain text
-#: en/config.txt:185
+#. type: delimited block -
+#: en/config.txt:186
#, no-wrap, priority:100
msgid ""
-"\t# Core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"# Core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:190
+#. type: delimited block -
+#: en/config.txt:191
#, no-wrap, priority:100
msgid ""
-"\t# Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"# Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:194
+#. type: delimited block -
+#: en/config.txt:195
#, no-wrap, priority:100
msgid ""
-"\t[branch \"devel\"]\n"
-"\t\tremote = origin\n"
-"\t\tmerge = refs/heads/devel\n"
+"[branch \"devel\"]\n"
+"\tremote = origin\n"
+"\tmerge = refs/heads/devel\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:199
+#. type: delimited block -
+#: en/config.txt:200
#, no-wrap, priority:100
msgid ""
-"\t# Proxy settings\n"
-"\t[core]\n"
-"\t\tgitProxy=\"ssh\" for \"kernel.org\"\n"
-"\t\tgitProxy=default-proxy ; for the rest\n"
+"# Proxy settings\n"
+"[core]\n"
+"\tgitProxy=\"ssh\" for \"kernel.org\"\n"
+"\tgitProxy=default-proxy ; for the rest\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:204
+#. type: delimited block -
+#: en/config.txt:205
#, no-wrap, priority:100
msgid ""
-"\t[include]\n"
-"\t\tpath = /path/to/foo.inc ; include by absolute path\n"
-"\t\tpath = foo.inc ; find \"foo.inc\" relative to the current file\n"
-"\t\tpath = ~/foo.inc ; find \"foo.inc\" in your `$HOME` directory\n"
+"[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: Plain text
-#: en/config.txt:208
+#. type: delimited block -
+#: en/config.txt:209
#, no-wrap, priority:100
msgid ""
-"\t; include if $GIT_DIR is /path/to/foo/.git\n"
-"\t[includeIf \"gitdir:/path/to/foo/.git\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; 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: Plain text
-#: en/config.txt:212
+#. type: delimited block -
+#: en/config.txt:213
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside /path/to/group\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside /path/to/group\n"
+"[includeIf \"gitdir:/path/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:216
+#. type: delimited block -
+#: en/config.txt:217
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside $HOME/to/group\n"
-"\t[includeIf \"gitdir:~/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside $HOME/to/group\n"
+"[includeIf \"gitdir:~/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:222
+#. type: delimited block -
+#: en/config.txt:223
#, no-wrap, priority:100
msgid ""
-"\t; relative paths are always relative to the including\n"
-"\t; file (if the condition is true); their location is not\n"
-"\t; affected by the condition\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = foo.inc\n"
+"; 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:227
+#: en/config.txt:229
#, no-wrap, priority:100
msgid ""
"\t; include only if we are in a worktree where foo-branch is\n"
@@ -2357,43 +2357,43 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/config.txt:229
+#: en/config.txt:231
#, no-wrap, priority:100
msgid "Values"
msgstr ""
#. type: Plain text
-#: en/config.txt:234
+#: 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:235
+#: en/config.txt:237
#, no-wrap, priority:100
msgid "boolean"
msgstr ""
#. type: Plain text
-#: en/config.txt:240
+#: 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:241
+#: en/config.txt:243
#, no-wrap, priority:100
msgid "true"
msgstr ""
#. type: Plain text
-#: en/config.txt:242
+#: en/config.txt:244
#, priority:100
msgid "Boolean true literals are `yes`, `on`, `true`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:244
+#: en/config.txt:246
#, no-wrap, priority:100
msgid ""
"and `1`. Also, a variable defined without `= <value>`\n"
@@ -2401,109 +2401,109 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/config.txt:245
+#: en/config.txt:247
#, no-wrap, priority:100
msgid "false"
msgstr ""
#. type: Plain text
-#: en/config.txt:246
+#: en/config.txt:248
#, priority:100
msgid "Boolean false literals are `no`, `off`, `false`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:247
+#: en/config.txt:249
#, no-wrap, priority:100
msgid "`0` and the empty string.\n"
msgstr ""
#. type: Plain text
-#: en/config.txt:251
+#: 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:252
+#: en/config.txt:254
#, no-wrap, priority:100
msgid "integer"
msgstr ""
#. type: Plain text
-#: en/config.txt:256
+#: 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:257 en/diff-options.txt:356 en/git-for-each-ref.txt:177
+#: 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:261
+#: 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:265
+#: en/config.txt:267
#, 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."
msgstr ""
#. type: Plain text
-#: en/config.txt:270
+#: en/config.txt:272
#, 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:277
+#: en/config.txt:279
#, 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:280
+#: en/config.txt:282
#, 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:289
+#: en/config.txt:291
#, 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:290
+#: en/config.txt:292
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:296
+#: en/config.txt:298
#, 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:299 en/git-imap-send.txt:58
+#: en/config.txt:301 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:304
+#: en/config.txt:306
#, 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:309
+#: en/config.txt:311
#, 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 ""
@@ -3241,53 +3241,53 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
#, no-wrap, priority:260
-msgid "Generating patches with -p"
+msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:10
+#: en/diff-generate-patch.txt:14
#, priority:260
-msgid "When \"git-diff-index\", \"git-diff-tree\", or \"git-diff-files\" are run with a `-p` option, \"git diff\" without the `--raw` option, or \"git log\" with the \"-p\" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
+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:13
+#: 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:15
+#: 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:17
+#: 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:21
+#: 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:25
+#: 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:27
+#: 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:39
+#: en/diff-generate-patch.txt:43
#, no-wrap, priority:260
msgid ""
"old mode <mode>\n"
@@ -3304,43 +3304,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:42
+#: 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:44
+#: 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:51
+#: 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:55
+#: en/diff-generate-patch.txt:59
#, priority:260
-msgid "The index line includes the SHA-1 checksum 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."
+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:59
+#: 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:64
+#: 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:71
+#: en/diff-generate-patch.txt:75
#, no-wrap, priority:260
msgid ""
"diff --git a/a b/b\n"
@@ -3352,25 +3352,25 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/diff-generate-patch.txt:74
+#: en/diff-generate-patch.txt:78
#, no-wrap, priority:260
-msgid "combined diff format"
+msgid "Combined diff format"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:82
+#: 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:84
+#: en/diff-generate-patch.txt:88
#, priority:260
-msgid "A 'combined diff' format looks like this:"
+msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:93
+#: en/diff-generate-patch.txt:97
#, no-wrap, priority:260
msgid ""
"diff --combined describe.c\n"
@@ -3383,7 +3383,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:103
+#: en/diff-generate-patch.txt:107
#, no-wrap, priority:260
msgid ""
"- static void describe(char *arg)\n"
@@ -3398,7 +3398,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:113
+#: en/diff-generate-patch.txt:117
#, no-wrap, priority:260
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
@@ -3413,37 +3413,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:117
+#: en/diff-generate-patch.txt:121
#, priority:260
-msgid "It is preceded with a \"git diff\" header, that looks like this (when `-c` option is used):"
+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:119
+#: en/diff-generate-patch.txt:123
#, no-wrap, priority:260
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:121
+#: en/diff-generate-patch.txt:125
#, priority:260
-msgid "or like this (when `--cc` option is used):"
+msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:123
+#: en/diff-generate-patch.txt:127
#, no-wrap, priority:260
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:126
+#: 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:131
+#: en/diff-generate-patch.txt:135
#, no-wrap, priority:260
msgid ""
"index <hash>,<hash>..<hash>\n"
@@ -3453,91 +3453,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:137
+#: 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:139
+#: 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:141 en/diff-generate-patch.txt:152 en/diff-generate-patch.txt:153 en/diff-generate-patch.txt:154
+#: 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:142 en/diff-generate-patch.txt:155
+#: 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:146
+#: 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:150
+#: 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:159
+#: 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:165
+#: 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 for apply. The change is similar to the change in the extended 'index' header:"
+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:167
+#: 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:170
+#: 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:179
+#: 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:185
+#: 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:191
+#: 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:197
+#: 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:327 en/merge-options.txt:86
+#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3549,7 +3549,7 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:186 en/git-add.txt:111 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/diff-options.txt:23 en/fetch-options.txt:198 en/git-add.txt:111 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
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
@@ -3573,7 +3573,7 @@ msgid "\tThis is the default.\n"
msgstr ""
#. 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:117 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
+#: 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:118 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"
@@ -3992,7 +3992,7 @@ msgid "Synonym for --dirstat=files,param1,param2..."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:129
+#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--summary"
msgstr "--summary"
@@ -4016,7 +4016,7 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:122 en/git-update-index.txt:168
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:168
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4425,7 +4425,7 @@ msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:402 en/git-status.txt:139
+#: en/diff-options.txt:402 en/git-status.txt:143
#, ignore-same, no-wrap, priority:280
msgid "--no-renames"
msgstr "--no-renames"
@@ -4529,7 +4529,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:463
#, priority:280
-msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
+msgid "It affects the way a change that amounts to a total rewrite of a file does not appear as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
msgstr ""
#. type: Plain text
@@ -4545,7 +4545,7 @@ msgid "-M[<n>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:473 en/git-status.txt:143
+#: en/diff-options.txt:473 en/git-status.txt:147
#, no-wrap, priority:280
msgid "--find-renames[=<n>]"
msgstr ""
@@ -4968,7 +4968,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:203 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:52 en/git-clone.txt:120 en/git-commit.txt:314 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:301 en/git-gc.txt:68 en/git-grep.txt:296 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:315 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:255 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:136 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:215 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:316 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:302 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:256 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5022,7 +5022,7 @@ msgid "Allow (or disallow) external text conversion filters to be run when compa
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:85
+#: en/diff-options.txt:722 en/git-status.txt:87
#, no-wrap, priority:280
msgid "--ignore-submodules[=<when>]"
msgstr ""
@@ -5100,7 +5100,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:265 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:266 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5232,7 +5232,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:48 en/git-commit.txt:317 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:50 en/git-commit.txt:319 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5244,13 +5244,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:34 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:195 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:347 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:278 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:279 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:35 en/git-fast-import.txt:37 en/git-filter-branch.txt:196 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:279 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:280 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5282,7 +5282,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:112 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:113 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5360,7 +5360,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:47 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:97 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:326 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:301 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:85
+#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:98 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:302 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5426,187 +5426,211 @@ msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:167
+#: en/fetch-options.txt:164
+#, priority:220
+msgid "Number of parallel children to be used for all forms of fetching."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:169
+#, priority:220
+msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:172
#, priority:220
-msgid "Number of parallel children to be used for fetching submodules. Each will fetch from different submodules, such that fetching many submodules will be faster. By default submodules will be fetched one at a time."
+msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:168 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:173 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:171
+#: en/fetch-options.txt:176
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:172
+#: en/fetch-options.txt:177 en/git-branch.txt:225 en/git-push.txt:349
+#, ignore-same, no-wrap, priority:240
+msgid "--set-upstream"
+msgstr "--set-upstream"
+
+#. type: Plain text
+#: en/fetch-options.txt:183
+#, priority:220
+msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:184
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:188
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177
+#: en/fetch-options.txt:189
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:184
+#: en/fetch-options.txt:196
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:199
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:194
+#: en/fetch-options.txt:206
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:195 en/git-clone.txt:182
+#: en/fetch-options.txt:207 en/git-clone.txt:182
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:212
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:202 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:51 en/git-clone.txt:119 en/git-commit.txt:313 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:300 en/git-grep.txt:295 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:314 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:254 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:135
+#: en/fetch-options.txt:214 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:315 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:301 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:255 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:207
+#: en/fetch-options.txt:219
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:208 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:298 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:318 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:139
+#: en/fetch-options.txt:220 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:300 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:209 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:299 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:319 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:140
+#: en/fetch-options.txt:221 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:301 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:211 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:142
+#: en/fetch-options.txt:223 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:213 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:326 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:258 en/git-switch.txt:144 en/merge-options.txt:143
+#: en/fetch-options.txt:225 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:328 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:259 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:218 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:230 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:219 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:231 en/git-ls-remote.txt:73 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:220 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:232 en/git-clone.txt:135 en/git-ls-remote.txt:74
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-clone.txt:142
+#: en/fetch-options.txt:239 en/git-clone.txt:142
#, priority:300
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:240
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:233
+#: en/fetch-options.txt:245
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:234
+#: en/fetch-options.txt:246
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:240
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:241 en/git-push.txt:398
+#: en/fetch-options.txt:253 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:242 en/git-push.txt:399
+#: en/fetch-options.txt:254 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:244 en/git-push.txt:401
+#: en/fetch-options.txt:256 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:245 en/git-push.txt:402
+#: en/fetch-options.txt:257 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:246 en/git-push.txt:403
+#: en/fetch-options.txt:258 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:247 en/git-push.txt:405
+#: en/fetch-options.txt:259 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5646,7 +5670,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:20 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:67 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
+#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr ""
@@ -5688,13 +5712,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr ""
#. type: Title -
-#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:83 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:85 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:115 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:253 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:86 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:254 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:52 en/git-grep.txt:308 en/git-status.txt:148
+#: en/git-add.txt:52 en/git-grep.txt:325 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
@@ -5706,7 +5730,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:67 en/git-grep.txt:314
+#: en/git-add.txt:67 en/git-grep.txt:331
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -5724,13 +5748,13 @@ msgid "Allow adding otherwise ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:42 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:394 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:43 en/git-rebase.txt:395 en/git-rebase.txt:536 en/git-svn.txt:297
+#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5754,7 +5778,7 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:275 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
@@ -5844,7 +5868,7 @@ msgid "This option is primarily to help users who are used to older versions of
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:146 en/git-format-patch.txt:101 en/git-submodule.txt:340
+#: en/git-add.txt:146 en/git-format-patch.txt:102 en/git-submodule.txt:341
#, no-wrap, priority:300
msgid "-N"
msgstr ""
@@ -5934,7 +5958,7 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:343 en/git-grep.txt:304 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
+#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:345 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr ""
@@ -5946,7 +5970,7 @@ msgid "This option can be used to separate command-line options from the list of
msgstr ""
#. type: Title -
-#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:357 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:153 en/git-fetch.txt:242 en/git-filter-branch.txt:234 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:634 en/git-grep.txt:316 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:206 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:359 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:638 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr ""
@@ -5988,7 +6012,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:221 en/git-rebase.txt:591
+#: en/git-add.txt:221 en/git-rebase.txt:613
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr ""
@@ -6000,7 +6024,7 @@ msgid "When the command enters the interactive mode, it shows the output of the
msgstr ""
#. type: Plain text
-#: en/git-add.txt:230 en/git-clean.txt:83
+#: en/git-add.txt:230 en/git-clean.txt:85
#, priority:300
msgid "The command loop shows the list of subcommands available, and gives a prompt \"What now> \". In general, when the prompt ends with a single '>', you can pick only one of the choices given and type return, like this:"
msgstr ""
@@ -6300,7 +6324,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:135 en/git-commit-tree.txt:118 en/git-commit.txt:487 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:241 en/git-fast-import.txt:1503 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:679 en/git-gc.txt:154 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:112 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:247 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:519 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:292 en/git-status.txt:434 en/git-submodule.txt:436 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
+#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:489 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1526 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:683 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:437 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
@@ -6312,13 +6336,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:139 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:495 en/git-config.txt:492 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:245 en/git-fast-import.txt:1507 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:480 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:683 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:334 en/git-gui.txt:126 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:116 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:230 en/git-merge-file.txt:94 en/git-merge-index.txt:78 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1052 en/git-receive-pack.txt:251 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:123 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:523 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:300 en/git-status.txt:438 en/git-stripspace.txt:93 en/git-submodule.txt:440 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
+#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:497 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1530 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:693 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:687 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:441 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
#, no-wrap, priority:300
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:140 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:496 en/git-config.txt:493 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:246 en/git-fast-import.txt:1508 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:481 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:684 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:335 en/git-gui.txt:127 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:117 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:231 en/git-merge-file.txt:95 en/git-merge-index.txt:79 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1053 en/git-receive-pack.txt:252 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:124 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:524 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:301 en/git-status.txt:439 en/git-stripspace.txt:94 en/git-submodule.txt:441 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
+#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:498 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1531 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:694 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:688 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:442 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6368,7 +6392,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:118 en/git-rebase.txt:387 en/git-revert.txt:98 en/merge-options.txt:73
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:119 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6410,7 +6434,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:969
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:985
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6440,7 +6464,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:267 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:989
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1005
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6532,37 +6556,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:303 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:304 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:307 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:373 en/git-rebase.txt:524
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:374
+#: en/git-am.txt:109 en/git-rebase.txt:396
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:337
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6622,7 +6646,7 @@ msgid "Run interactively."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:380 en/git-rebase.txt:521
+#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6634,7 +6658,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:381 en/git-rebase.txt:522
+#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6646,7 +6670,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:256 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6658,31 +6682,31 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:333 en/git-rebase.txt:308 en/git-revert.txt:91 en/merge-options.txt:58
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:335 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:334 en/git-rebase.txt:309 en/git-revert.txt:92 en/merge-options.txt:59
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:336 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:338 en/git-rebase.txt:313 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:340 en/git-rebase.txt:331 en/git-revert.txt:96
#, priority:280
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:228 en/sequencer.txt:1
+#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:246 en/sequencer.txt:1
#, ignore-same, no-wrap, priority:240
msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:406 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:997
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1013
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6712,7 +6736,7 @@ msgid "When a patch failure occurs, <msg> will be printed to the screen before e
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:231 en/sequencer.txt:15
+#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:249 en/sequencer.txt:15
#, ignore-same, no-wrap, priority:240
msgid "--abort"
msgstr "--abort"
@@ -6724,7 +6748,7 @@ msgid "Restore the original branch and abort the patching operation."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:238 en/sequencer.txt:10
+#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:256 en/sequencer.txt:10
#, ignore-same, no-wrap, priority:240
msgid "--quit"
msgstr "--quit"
@@ -6736,7 +6760,7 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:262
+#: en/git-am.txt:179 en/git-rebase.txt:280
#, ignore-same, no-wrap, priority:100
msgid "--show-current-patch"
msgstr "--show-current-patch"
@@ -6748,7 +6772,7 @@ msgid "Show the patch being applied when \"git am\" is stopped because of confli
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:451 en/git-format-patch.txt:351 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:188 en/git-tag.txt:231
+#: en/git-am.txt:184 en/git-commit.txt:453 en/git-format-patch.txt:355 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
@@ -6832,7 +6856,7 @@ msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the curren
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:471 en/git-gc.txt:147
+#: en/git-am.txt:234 en/git-commit.txt:473 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
@@ -6930,7 +6954,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:322 en/merge-options.txt:84
+#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -6972,7 +6996,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:291
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:292
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7044,7 +7068,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:342
+#: en/git-apply.txt:134 en/git-rebase.txt:360
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7260,7 +7284,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:330 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:398 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:332 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -9182,7 +9206,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:525
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9218,13 +9242,13 @@ msgid "Sorting and filtering branches are case insensitive."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:153 en/git-status.txt:126 en/git-tag.txt:134
+#: en/git-branch.txt:153 en/git-status.txt:130 en/git-tag.txt:134
#, no-wrap, priority:280
msgid "--column[=<options>]"
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:154 en/git-status.txt:127 en/git-tag.txt:135
+#: en/git-branch.txt:154 en/git-status.txt:131 en/git-tag.txt:135
#, ignore-same, no-wrap, priority:280
msgid "--no-column"
msgstr "--no-column"
@@ -9349,12 +9373,6 @@ msgstr "--no-track"
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
-#. type: Labeled list
-#: en/git-branch.txt:225 en/git-push.txt:349
-#, ignore-same, no-wrap, priority:240
-msgid "--set-upstream"
-msgstr "--set-upstream"
-
#. type: Plain text
#: en/git-branch.txt:228
#, priority:240
@@ -9624,7 +9642,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-filter-branch.txt:449 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10244,7 +10262,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:152 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10893,7 +10911,7 @@ msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will al
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:226
+#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
@@ -11090,7 +11108,7 @@ msgid "Only meaningful with `--stdin`; paths are separated with NUL character in
msgstr ""
#. type: Plain text
-#: en/git-checkout-index.txt:73 en/git-commit.txt:345 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
+#: en/git-checkout-index.txt:73 en/git-commit.txt:347 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
#, priority:280
msgid "Do not interpret any more arguments as options."
msgstr ""
@@ -11411,7 +11429,7 @@ msgid "Quiet, suppress feedback messages."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:144
+#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:152
#, ignore-same, no-wrap, priority:240
msgid "--no-progress"
msgstr "--no-progress"
@@ -11597,7 +11615,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:241 en/git-rebase.txt:268 en/git-rebase.txt:529 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:354 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
+#: en/git-checkout.txt:241 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:355 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11717,7 +11735,7 @@ msgid "In the default overlay mode, `git checkout` never removes files from the
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:312 en/git-rebase.txt:225 en/git-switch.txt:36
+#: en/git-checkout.txt:312 en/git-rebase.txt:243 en/git-switch.txt:36
#, no-wrap, priority:240
msgid "<branch>"
msgstr ""
@@ -12423,7 +12441,7 @@ msgid "This option determines how the commit message will be cleaned up before b
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:65 en/git-clean.txt:61
+#: en/git-cherry-pick.txt:65 en/git-clean.txt:63
#, ignore-same, no-wrap, priority:100
msgid "-x"
msgstr "-x"
@@ -12507,7 +12525,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:249 en/git-rebase.txt:532
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:267 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12531,7 +12549,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:282 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:109
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12549,7 +12567,7 @@ msgid "-X<option>"
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:125
#, no-wrap, priority:240
msgid "--strategy-option=<option>"
msgstr ""
@@ -12745,7 +12763,7 @@ msgid "Show the commit subjects next to the SHA1s."
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:32 en/git-rebase.txt:220
+#: en/git-cherry.txt:32 en/git-rebase.txt:238
#, no-wrap, priority:100
msgid "<upstream>"
msgstr ""
@@ -12763,7 +12781,7 @@ msgid "<head>"
msgstr ""
#. type: Plain text
-#: en/git-cherry.txt:38 en/git-rebase.txt:227
+#: en/git-cherry.txt:38 en/git-rebase.txt:245
#, priority:100
msgid "Working branch; defaults to HEAD."
msgstr ""
@@ -12976,85 +12994,85 @@ msgid "If any optional `<path>...` arguments are given, only those paths are aff
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:33
+#: en/git-clean.txt:35
#, priority:100
-msgid "Remove untracked directories in addition to untracked files. If an untracked directory is managed by a different Git repository, it is not removed by default. Use -f option twice if you really want to remove such a directory."
+msgid "Normally, when no <path> is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. If any paths are specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under `--force`) will be removed."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:41
+#: en/git-clean.txt:43
#, priority:100
-msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f, -n or -i. Git will refuse to delete directories with .git sub directory or file unless a second -f is given."
+msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f or -i. Git will refuse to modify untracked nested git repositories (directories with a .git subdirectory) unless a second -f is given."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:46
+#: en/git-clean.txt:48
#, priority:100
msgid "Show what would be done and clean files interactively. See ``Interactive mode'' for details."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:50
+#: en/git-clean.txt:52
#, priority:100
msgid "Don't actually remove anything, just show what would be done."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:55
+#: en/git-clean.txt:57
#, priority:100
msgid "Be quiet, only report errors, but not the files that are successfully removed."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:56
+#: en/git-clean.txt:58
#, no-wrap, priority:100
msgid "-e <pattern>"
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:57 en/git-ls-files.txt:85 en/git-name-rev.txt:33
+#: en/git-clean.txt:59 en/git-ls-files.txt:85 en/git-name-rev.txt:33
#, no-wrap, priority:100
msgid "--exclude=<pattern>"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:60
+#: en/git-clean.txt:62
#, priority:100
msgid "Use the given exclude pattern in addition to the standard ignore rules (see linkgit:gitignore[5])."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:68
+#: en/git-clean.txt:70
#, priority:100
msgid "Don't use the standard ignore rules (see linkgit:gitignore[5]), but still use the ignore rules given with `-e` options from the command line. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git restore' or 'git reset') to create a pristine working directory to test a clean build."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:69
+#: en/git-clean.txt:71
#, no-wrap, priority:100
msgid "-X"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:72
+#: en/git-clean.txt:74
#, priority:100
msgid "Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files."
msgstr ""
#. type: Title -
-#: en/git-clean.txt:74
+#: en/git-clean.txt:76
#, no-wrap, priority:100
msgid "Interactive mode"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:78
+#: en/git-clean.txt:80
#, priority:100
msgid "When the command enters the interactive mode, it shows the files and directories to be cleaned, and goes into its interactive command loop."
msgstr ""
#. type: delimited block -
-#: en/git-clean.txt:89
+#: en/git-clean.txt:91
#, no-wrap, priority:100
msgid ""
" *** Commands ***\n"
@@ -13064,91 +13082,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:92
+#: en/git-clean.txt:94
#, priority:100
msgid "You also could say `c` or `clean` above as long as the choice is unique."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:94
+#: en/git-clean.txt:96
#, priority:100
msgid "The main command loop has 6 subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:95
+#: en/git-clean.txt:97
#, no-wrap, priority:100
msgid "clean"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:98
+#: en/git-clean.txt:100
#, priority:100
msgid "Start cleaning files and directories, and then quit."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:99
+#: en/git-clean.txt:101
#, no-wrap, priority:100
msgid "filter by pattern"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:107
+#: en/git-clean.txt:109
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Input ignore patterns>>\" prompt. You can input space-separated patterns to exclude files and directories from deletion. E.g. \"*.c *.h\" will excludes files end with \".c\" and \".h\" from deletion. When you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:108
+#: en/git-clean.txt:110
#, no-wrap, priority:100
msgid "select by numbers"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:119
+#: en/git-clean.txt:121
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Select items to delete>>\" prompt. When the prompt ends with double '>>' like this, you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything. Also when you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:120
+#: en/git-clean.txt:122
#, no-wrap, priority:100
msgid "ask each"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:125
+#: en/git-clean.txt:127
#, priority:100
msgid "This will start to clean, and you must confirm one by one in order to delete items. Please note that this action is not as efficient as the above two actions."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:126
+#: en/git-clean.txt:128
#, no-wrap, priority:100
msgid "quit"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:129
+#: en/git-clean.txt:131
#, priority:100
msgid "This lets you quit without do cleaning."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:130
+#: en/git-clean.txt:132
#, no-wrap, priority:100
msgid "help"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:133
+#: en/git-clean.txt:135
#, priority:100
msgid "Show brief usage of interactive git-clean."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:137 en/git-status.txt:436
+#: en/git-clean.txt:139 en/git-status.txt:440
#, ignore-same, priority:280
msgid "linkgit:gitignore[5]"
msgstr "linkgit:gitignore[5]"
@@ -13287,7 +13305,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:108 en/git-submodule.txt:392
+#: en/git-clone.txt:108 en/git-submodule.txt:393
#, ignore-same, no-wrap, priority:300
msgid "--dissociate"
msgstr "--dissociate"
@@ -13517,7 +13535,7 @@ msgstr "--[no-]remote-submodules"
#. type: Plain text
#: en/git-clone.txt:269
#, priority:300
-msgid "All submodules which are cloned will use the status of the submodule�셲 remote-tracking branch to update the submodule, rather than the superproject�셲 recorded SHA-1. Equivalent to passing `--remote` to `git submodule update`."
+msgid "All submodules which are cloned will use the status of the submodules remote-tracking branch to update the submodule, rather than the superprojects recorded SHA-1. Equivalent to passing `--remote` to `git submodule update`."
msgstr ""
#. type: Labeled list
@@ -13533,13 +13551,13 @@ msgid "Instead of placing the cloned repository where it is supposed to be, plac
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:277 en/git-submodule.txt:416
+#: en/git-clone.txt:277 en/git-submodule.txt:417
#, no-wrap, priority:300
msgid "-j <n>"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:278 en/git-submodule.txt:417
+#: en/git-clone.txt:278 en/git-submodule.txt:418
#, no-wrap, priority:300
msgid "--jobs <n>"
msgstr ""
@@ -13897,7 +13915,7 @@ msgid "Read the commit log message from the given file. Use `-` to read from the
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:68 en/git-commit.txt:339
+#: en/git-commit-tree.txt:68 en/git-commit.txt:341
#, ignore-same, no-wrap, priority:280
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
@@ -13981,7 +13999,7 @@ msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:477 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:428 en/git-svn.txt:1156
+#: en/git-commit-tree.txt:114 en/git-commit.txt:479 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:429 en/git-svn.txt:1156
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
@@ -14287,13 +14305,13 @@ msgid "When editing the commit message, start the editor with the contents in th
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:173 en/merge-options.txt:81
+#: en/git-commit.txt:173 en/merge-options.txt:85
#, priority:280
msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:175 en/git-rebase.txt:330
+#: en/git-commit.txt:175 en/git-rebase.txt:348 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14500,115 +14518,115 @@ msgid "Show untracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:288
+#: en/git-commit.txt:289
#, priority:280
msgid "The mode parameter is optional (defaults to 'all'), and is used to specify the handling of untracked files; when -u is not used, the default is 'normal', i.e. show untracked files and directories."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:290 en/git-status.txt:67 en/git-status.txt:107
+#: en/git-commit.txt:291 en/git-status.txt:68 en/git-status.txt:110
#, priority:280
msgid "The possible options are:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:292
+#: en/git-commit.txt:293
#, no-wrap, priority:280
msgid "'no' - Show no untracked files\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:293
+#: en/git-commit.txt:294
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:294 en/git-status.txt:71
+#: en/git-commit.txt:295 en/git-status.txt:72
#, no-wrap, priority:280
msgid "'all' - Also shows individual files in untracked directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:297 en/git-status.txt:84
+#: en/git-commit.txt:298 en/git-status.txt:85
#, priority:280
msgid "The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:308
+#: en/git-commit.txt:310
#, priority:280
msgid "Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template to help the user describe the commit by reminding what changes the commit has. Note that this diff output doesn't have its lines prefixed with '#'. This diff will not be a part of the commit message. See the `commit.verbose` configuration variable in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:312
+#: en/git-commit.txt:314
#, priority:280
msgid "If specified twice, show in addition the unified diff between what would be committed and the worktree files, i.e. the unstaged changes to tracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:316
+#: en/git-commit.txt:318
#, priority:280
msgid "Suppress commit summary message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:321
+#: en/git-commit.txt:323
#, priority:280
msgid "Do not create a commit, but show a list of paths that are to be committed, paths with local changes that will be left uncommitted and paths that are untracked."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:322
+#: en/git-commit.txt:324
#, ignore-same, no-wrap, priority:280
msgid "--status"
msgstr "--status"
#. type: Plain text
-#: en/git-commit.txt:327
+#: en/git-commit.txt:329
#, priority:280
msgid "Include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the commit message. Defaults to on, but can be used to override configuration variable commit.status."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:328
+#: en/git-commit.txt:330
#, ignore-same, no-wrap, priority:280
msgid "--no-status"
msgstr "--no-status"
#. type: Plain text
-#: en/git-commit.txt:332
+#: en/git-commit.txt:334
#, priority:280
msgid "Do not include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the default commit message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:342
+#: en/git-commit.txt:344
#, priority:280
msgid "Countermand `commit.gpgSign` configuration variable that is set to force each and every commit to be signed."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:346 en/git-rm.txt:29
+#: en/git-commit.txt:348 en/git-rm.txt:29
#, ignore-ellipsis, no-wrap, priority:280
msgid "<file>..."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:352
+#: en/git-commit.txt:354
#, priority:280
msgid "When files are given on the command line, the command commits the contents of the named files, without recording the changes already staged. The contents of these files are also staged for the next commit on top of what have been staged before."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:369
+#: en/git-commit.txt:371
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:375
+#: en/git-commit.txt:377
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14618,13 +14636,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:383
+#: en/git-commit.txt:385
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:388
+#: en/git-commit.txt:390
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14633,19 +14651,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:393
+#: en/git-commit.txt:395
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:398
+#: en/git-commit.txt:400
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:404
+#: en/git-commit.txt:406
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14655,31 +14673,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:411
+#: en/git-commit.txt:413
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:414 en/git-commit.txt:440
+#: en/git-commit.txt:416 en/git-commit.txt:442
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:418
+#: en/git-commit.txt:420
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:426
+#: en/git-commit.txt:428
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:432
+#: en/git-commit.txt:434
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14689,55 +14707,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:437
+#: en/git-commit.txt:439
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:448
+#: en/git-commit.txt:450
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:460
+#: en/git-commit.txt:462
#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:464
+#: en/git-commit.txt:466
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:469
+#: en/git-commit.txt:471
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:475
+#: en/git-commit.txt:477
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:479
+#: en/git-commit.txt:481
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:485
+#: en/git-commit.txt:487
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:493
+#: en/git-commit.txt:495
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -15405,211 +15423,211 @@ msgstr ""
msgid "Given a .git/config like this:"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:347
+#. type: delimited block -
+#: en/git-config.txt:348
#, no-wrap, priority:100
msgid ""
-"\t#\n"
-"\t# This is the config file, and\n"
-"\t# a '#' or ';' character indicates\n"
-"\t# a comment\n"
-"\t#\n"
+"#\n"
+"# This is the config file, and\n"
+"# a '#' or ';' character indicates\n"
+"# a comment\n"
+"#\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:352
+#. type: delimited block -
+#: en/git-config.txt:353 en/git.txt:310
#, no-wrap, priority:100
msgid ""
-"\t; core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"; core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:357
+#. type: delimited block -
+#: en/git-config.txt:358
#, no-wrap, priority:100
msgid ""
-"\t; Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"; Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:362
+#. type: delimited block -
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
-"\t; Proxy settings\n"
-"\t[core]\n"
-"\t\tgitproxy=proxy-command for kernel.org\n"
-"\t\tgitproxy=default-proxy ; for all the rest\n"
+"; Proxy settings\n"
+"[core]\n"
+"\tgitproxy=proxy-command for kernel.org\n"
+"\tgitproxy=default-proxy ; for all the rest\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:369
+#. type: delimited block -
+#: en/git-config.txt:370
#, no-wrap, priority:100
msgid ""
-"\t; HTTP\n"
-"\t[http]\n"
-"\t\tsslVerify\n"
-"\t[http \"https://weak.example.com\"]\n"
-"\t\tsslVerify = false\n"
-"\t\tcookieFile = /tmp/cookie.txt\n"
+"; HTTP\n"
+"[http]\n"
+"\tsslVerify\n"
+"[http \"https://weak.example.com\"]\n"
+"\tsslVerify = false\n"
+"\tcookieFile = /tmp/cookie.txt\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:371
+#: en/git-config.txt:373
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:374
+#: en/git-config.txt:376
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:379
+#: en/git-config.txt:381
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:382
+#: en/git-config.txt:384
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:385
+#: en/git-config.txt:387
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:389
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:390
+#: en/git-config.txt:392
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:394
+#: en/git-config.txt:396
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:398
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:399
+#: en/git-config.txt:401
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:402 en/git-gui.txt:120 en/git-merge-index.txt:64
+#: en/git-config.txt:404 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:407
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:410
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:413
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:414
+#: en/git-config.txt:416
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:417
+#: en/git-config.txt:419
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:421
+#: en/git-config.txt:423
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:424
+#: en/git-config.txt:426
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:428
+#: en/git-config.txt:430
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:431
+#: en/git-config.txt:433
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:434
+#: en/git-config.txt:436
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:437
+#: en/git-config.txt:439
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:440
+#: en/git-config.txt:442
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:443
+#: en/git-config.txt:445
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:447
+#: en/git-config.txt:449
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:453
+#: en/git-config.txt:455
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15619,13 +15637,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:457
+#: en/git-config.txt:459
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:466
+#: en/git-config.txt:468
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15638,19 +15656,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:471 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1029 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
+#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:476
+#: en/git-config.txt:478
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:482
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15658,13 +15676,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:483
+#: en/git-config.txt:485
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:488
+#: en/git-config.txt:490
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -17027,7 +17045,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
msgstr ""
#. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:234
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
#, no-wrap, priority:100
msgid "LIMITATIONS"
msgstr ""
@@ -18532,7 +18550,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:976
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:992
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19084,7 +19102,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:422
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:423
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -19180,13 +19198,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:982
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:998
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:988
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1004
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -19541,9 +19559,9 @@ msgid "This program dumps the given revisions in a form suitable to be piped int
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:22
+#: en/git-fast-export.txt:23
#, priority:100
-msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a kind of an interactive 'git filter-branch'."
+msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
@@ -19630,146 +19648,158 @@ msgstr ""
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
+#. type: Labeled list
+#: en/git-fast-export.txt:79
+#, ignore-same, no-wrap, priority:100
+msgid "--mark-tags"
+msgstr "--mark-tags"
+
+#. type: Plain text
+#: en/git-fast-export.txt:87
+#, priority:100
+msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
+msgstr ""
+
#. type: Plain text
-#: en/git-fast-export.txt:83
+#: en/git-fast-export.txt:92
#, priority:100
-msgid "Any commits that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
+msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:84
+#: en/git-fast-export.txt:93
#, ignore-same, no-wrap, priority:100
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
-#: en/git-fast-export.txt:89
+#: en/git-fast-export.txt:98
#, priority:100
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:90
+#: en/git-fast-export.txt:99
#, ignore-same, no-wrap, priority:100
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
-#: en/git-fast-export.txt:93
+#: en/git-fast-export.txt:102
#, priority:100
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:94
+#: en/git-fast-export.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
-#: en/git-fast-export.txt:101
+#: en/git-fast-export.txt:110
#, priority:100
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
+#: en/git-fast-export.txt:111 en/git-ls-tree.txt:72
#, ignore-same, no-wrap, priority:100
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
-#: en/git-fast-export.txt:107
+#: en/git-fast-export.txt:116
#, priority:100
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:108
+#: en/git-fast-export.txt:117
#, ignore-same, no-wrap, priority:100
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
-#: en/git-fast-export.txt:112
+#: en/git-fast-export.txt:121
#, priority:100
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:113
+#: en/git-fast-export.txt:122
#, ignore-same, no-wrap, priority:100
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
-#: en/git-fast-export.txt:124
+#: en/git-fast-export.txt:133
#, priority:100
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:125
+#: en/git-fast-export.txt:134
#, ignore-same, no-wrap, priority:100
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
-#: en/git-fast-export.txt:131
+#: en/git-fast-export.txt:140
#, priority:100
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:132
+#: en/git-fast-export.txt:141
#, no-wrap, priority:100
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:138
+#: en/git-fast-export.txt:147
#, priority:100
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be reencoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:139
+#: en/git-fast-export.txt:148
#, ignore-same, no-wrap, priority:100
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
-#: en/git-fast-export.txt:142
+#: en/git-fast-export.txt:151
#, priority:100
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:143
+#: en/git-fast-export.txt:152
#, ignore-ellipsis, no-wrap, priority:100
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:160
#, priority:100
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:157
+#: en/git-fast-export.txt:166
#, no-wrap, priority:100
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:162
+#: en/git-fast-export.txt:171
#, priority:100
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:167
+#: en/git-fast-export.txt:176
#, no-wrap, priority:100
msgid ""
"$ git fast-export master~5..master |\n"
@@ -19778,55 +19808,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:180
#, priority:100
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:175
+#: en/git-fast-export.txt:184
#, priority:100
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
-#: en/git-fast-export.txt:178
+#: en/git-fast-export.txt:187
#, no-wrap, priority:100
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:186
+#: en/git-fast-export.txt:195
#, priority:100
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:198
+#: en/git-fast-export.txt:207
#, priority:100
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:201
+#: en/git-fast-export.txt:210
#, priority:100
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:204
+#: en/git-fast-export.txt:213
#, no-wrap, priority:100
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:209
+#: en/git-fast-export.txt:218
#, priority:100
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:215
+#: en/git-fast-export.txt:224
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git init anon-repo\n"
@@ -19836,25 +19866,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:222
+#: en/git-fast-export.txt:231
#, priority:100
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:225
+#: en/git-fast-export.txt:234
#, no-wrap, priority:100
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:240
#, priority:100
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:239
+#: en/git-fast-export.txt:248
#, priority:100
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
@@ -20088,7 +20118,7 @@ msgid "See linkgit:git-config[1]"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:144 en/git-p4.txt:507
+#: en/git-fast-import.txt:144 en/git-filter-branch.txt:463 en/git-p4.txt:507
#, no-wrap, priority:100
msgid "PERFORMANCE"
msgstr ""
@@ -20322,7 +20352,7 @@ msgid "fast-import accepts several commands to update the current repository and
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:319 en/git-fast-import.txt:381
+#: en/git-fast-import.txt:319 en/git-fast-import.txt:388
#, ignore-same, no-wrap, priority:100
msgid "`commit`"
msgstr "`commit`"
@@ -20334,7 +20364,7 @@ msgid "Creates a new branch or updates an existing branch by creating a new comm
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:324 en/git-fast-import.txt:771
+#: en/git-fast-import.txt:324 en/git-fast-import.txt:778
#, ignore-same, no-wrap, priority:100
msgid "`tag`"
msgstr "`tag`"
@@ -20346,7 +20376,7 @@ msgid "Creates an annotated tag object from an existing commit or branch. Light
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:330 en/git-fast-import.txt:815
+#: en/git-fast-import.txt:330 en/git-fast-import.txt:823
#, ignore-same, no-wrap, priority:100
msgid "`reset`"
msgstr "`reset`"
@@ -20358,7 +20388,7 @@ msgid "Reset an existing branch (or a new branch) to a specific revision. This
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:335 en/git-fast-import.txt:844
+#: en/git-fast-import.txt:335 en/git-fast-import.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`blob`"
msgstr "`blob`"
@@ -20370,109 +20400,121 @@ msgid "Convert raw file data into a blob, for future use in a `commit` command.
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:340 en/git-fast-import.txt:917
+#: en/git-fast-import.txt:340 en/git-fast-import.txt:925
+#, ignore-same, no-wrap, priority:100
+msgid "`alias`"
+msgstr "`alias`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:346
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
+msgstr ""
+
+#. type: Title ~
+#: en/git-fast-import.txt:347 en/git-fast-import.txt:940
#, ignore-same, no-wrap, priority:100
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
-#: en/git-fast-import.txt:345
+#: en/git-fast-import.txt:352
#, priority:100
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:346 en/git-fast-import.txt:945
+#: en/git-fast-import.txt:353 en/git-fast-import.txt:968
#, ignore-same, no-wrap, priority:100
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
-#: en/git-fast-import.txt:350
+#: en/git-fast-import.txt:357
#, priority:100
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:351 en/git-fast-import.txt:1152
+#: en/git-fast-import.txt:358 en/git-fast-import.txt:1175
#, ignore-same, no-wrap, priority:100
msgid "`done`"
msgstr "`done`"
#. type: Plain text
-#: en/git-fast-import.txt:355
+#: en/git-fast-import.txt:362
#, priority:100
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:356 en/git-fast-import.txt:970
+#: en/git-fast-import.txt:363 en/git-fast-import.txt:993
#, ignore-same, no-wrap, priority:100
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
-#: en/git-fast-import.txt:360
+#: en/git-fast-import.txt:367
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:361 en/git-fast-import.txt:985
+#: en/git-fast-import.txt:368 en/git-fast-import.txt:1008
#, ignore-same, no-wrap, priority:100
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
-#: en/git-fast-import.txt:365
+#: en/git-fast-import.txt:372
#, priority:100
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:366 en/git-fast-import.txt:1016
+#: en/git-fast-import.txt:373 en/git-fast-import.txt:1039
#, ignore-same, no-wrap, priority:100
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
-#: en/git-fast-import.txt:370
+#: en/git-fast-import.txt:377
#, priority:100
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:371 en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:378 en/git-fast-import.txt:1092
#, ignore-same, no-wrap, priority:100
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
#, priority:100
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:1124
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:1147
#, ignore-same, no-wrap, priority:100
msgid "`option`"
msgstr "`option`"
#. type: Plain text
-#: en/git-fast-import.txt:379
+#: en/git-fast-import.txt:386
#, priority:100
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:384
+#: en/git-fast-import.txt:391
#, priority:100
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
#, no-wrap, priority:100
msgid ""
"\t'commit' SP <ref> LF\n"
@@ -20483,247 +20525,247 @@ msgid ""
"\t('encoding' SP <encoding>)?\n"
"\tdata\n"
"\t('from' SP <commit-ish> LF)?\n"
-"\t('merge' SP <commit-ish> LF)?\n"
+"\t('merge' SP <commit-ish> LF)*\n"
"\t(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*\n"
"\tLF?\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:405
+#: en/git-fast-import.txt:412
#, priority:100
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:411
+#: en/git-fast-import.txt:418
#, priority:100
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:417
+#: en/git-fast-import.txt:424
#, priority:100
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:425
+#: en/git-fast-import.txt:432
#, priority:100
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:432
+#: en/git-fast-import.txt:439
#, priority:100
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:434
+#: en/git-fast-import.txt:441
#, ignore-same, no-wrap, priority:100
msgid "`author`"
msgstr "`author`"
#. type: Plain text
-#: en/git-fast-import.txt:440
+#: en/git-fast-import.txt:447
#, priority:100
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:442
+#: en/git-fast-import.txt:449
#, ignore-same, no-wrap, priority:100
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
-#: en/git-fast-import.txt:445
+#: en/git-fast-import.txt:452
#, priority:100
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
#, priority:100
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:458
+#: en/git-fast-import.txt:465
#, priority:100
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:460
+#: en/git-fast-import.txt:467
#, ignore-same, no-wrap, priority:100
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
-#: en/git-fast-import.txt:464
+#: en/git-fast-import.txt:471
#, priority:100
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:466
+#: en/git-fast-import.txt:473
#, ignore-same, no-wrap, priority:100
msgid "`from`"
msgstr "`from`"
#. type: Plain text
-#: en/git-fast-import.txt:472
+#: en/git-fast-import.txt:479
#, priority:100
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
#, priority:100
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:485
+#: en/git-fast-import.txt:492
#, priority:100
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
#, priority:100
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:491
+#: en/git-fast-import.txt:498
#, priority:100
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:493
+#: en/git-fast-import.txt:500
#, priority:100
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:499
+#: en/git-fast-import.txt:506
#, priority:100
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:501
+#: en/git-fast-import.txt:508
#, priority:100
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:503
+#: en/git-fast-import.txt:510
#, priority:100
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
#, priority:100
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:509
+#: en/git-fast-import.txt:516
#, priority:100
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:512
+#: en/git-fast-import.txt:519
#, priority:100
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
#, no-wrap, priority:100
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:521
+#: en/git-fast-import.txt:528
#, priority:100
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:523
+#: en/git-fast-import.txt:530
#, ignore-same, no-wrap, priority:100
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
-#: en/git-fast-import.txt:531
+#: en/git-fast-import.txt:538
#, priority:100
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:534
+#: en/git-fast-import.txt:541
#, priority:100
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:536
+#: en/git-fast-import.txt:543
#, ignore-same, no-wrap, priority:100
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:540
+#: en/git-fast-import.txt:547
#, priority:100
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:541 en/git-fast-import.txt:708
+#: en/git-fast-import.txt:548 en/git-fast-import.txt:715
#, no-wrap, priority:100
msgid "External data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:544
+#: en/git-fast-import.txt:551
#, priority:100
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:547
+#: en/git-fast-import.txt:554
#, no-wrap, priority:100
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
#, priority:100
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:555 en/git-fast-import.txt:721
+#: en/git-fast-import.txt:562 en/git-fast-import.txt:728
#, no-wrap, priority:100
msgid "Inline data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:559
+#: en/git-fast-import.txt:566
#, priority:100
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
#, no-wrap, priority:100
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -20731,259 +20773,259 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:566 en/git-fast-import.txt:732
+#: en/git-fast-import.txt:573 en/git-fast-import.txt:739
#, priority:100
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:569
+#: en/git-fast-import.txt:576
#, priority:100
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
#, priority:100
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:574
+#: en/git-fast-import.txt:581
#, priority:100
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:575
+#: en/git-fast-import.txt:582
#, priority:100
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
#, priority:100
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:580
+#: en/git-fast-import.txt:587
#, priority:100
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:583
+#: en/git-fast-import.txt:590
#, priority:100
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:587
+#: en/git-fast-import.txt:594
#, priority:100
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:594
+#: en/git-fast-import.txt:601
#, priority:100
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
#, priority:100
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:598
+#: en/git-fast-import.txt:605
#, priority:100
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:599
+#: en/git-fast-import.txt:606
#, priority:100
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:600
+#: en/git-fast-import.txt:607
#, priority:100
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:602
+#: en/git-fast-import.txt:609
#, priority:100
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:604
+#: en/git-fast-import.txt:611
#, priority:100
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:606
+#: en/git-fast-import.txt:613
#, priority:100
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:608
+#: en/git-fast-import.txt:615
#, ignore-same, no-wrap, priority:100
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
-#: en/git-fast-import.txt:614
+#: en/git-fast-import.txt:621
#, priority:100
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
#, no-wrap, priority:100
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
#, priority:100
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:624
+#: en/git-fast-import.txt:631
#, ignore-same, no-wrap, priority:100
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
#, priority:100
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:632
+#: en/git-fast-import.txt:639
#, no-wrap, priority:100
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:638 en/git-fast-import.txt:658
+#: en/git-fast-import.txt:645 en/git-fast-import.txt:665
#, priority:100
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:643
+#: en/git-fast-import.txt:650
#, priority:100
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:645
+#: en/git-fast-import.txt:652
#, ignore-same, no-wrap, priority:100
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
-#: en/git-fast-import.txt:649
+#: en/git-fast-import.txt:656
#, priority:100
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:652
+#: en/git-fast-import.txt:659
#, no-wrap, priority:100
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:663
+#: en/git-fast-import.txt:670
#, priority:100
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:672
+#: en/git-fast-import.txt:679
#, priority:100
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
-#: en/git-fast-import.txt:679
+#: en/git-fast-import.txt:686
#, priority:100
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:682
+#: en/git-fast-import.txt:689
#, no-wrap, priority:100
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:688
+#: en/git-fast-import.txt:695
#, priority:100
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:696
+#: en/git-fast-import.txt:703
#, priority:100
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:698
+#: en/git-fast-import.txt:705
#, ignore-same, no-wrap, priority:100
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:707
+#: en/git-fast-import.txt:714
#, priority:100
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:712
+#: en/git-fast-import.txt:719
#, priority:100
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:715
+#: en/git-fast-import.txt:722
#, no-wrap, priority:100
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:720
+#: en/git-fast-import.txt:727
#, priority:100
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:725
+#: en/git-fast-import.txt:732
#, priority:100
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:729
+#: en/git-fast-import.txt:736
#, no-wrap, priority:100
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -20991,76 +21033,77 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:735
+#: en/git-fast-import.txt:742
#, priority:100
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:737
+#: en/git-fast-import.txt:744
#, ignore-same, no-wrap, priority:100
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
-#: en/git-fast-import.txt:743
+#: en/git-fast-import.txt:750
#, priority:100
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:746
+#: en/git-fast-import.txt:753
#, no-wrap, priority:100
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:752
+#: en/git-fast-import.txt:759
#, priority:100
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:756
+#: en/git-fast-import.txt:763
#, priority:100
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:758
+#: en/git-fast-import.txt:765
#, ignore-same, no-wrap, priority:100
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
-#: en/git-fast-import.txt:763
+#: en/git-fast-import.txt:770
#, priority:100
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:766
+#: en/git-fast-import.txt:773
#, no-wrap, priority:100
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:769
+#: en/git-fast-import.txt:776
#, priority:100
msgid "where `<object-identifer>` is any string not containing LF."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:774
+#: en/git-fast-import.txt:781
#, priority:100
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:781
+#: en/git-fast-import.txt:789
#, no-wrap, priority:100
msgid ""
"\t'tag' SP <name> LF\n"
+"\tmark?\n"
"\t'from' SP <commit-ish> LF\n"
"\toriginal-oid?\n"
"\t'tagger' (SP <name>)? SP LT <email> GT SP <when> LF\n"
@@ -21068,55 +21111,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:784
+#: en/git-fast-import.txt:792
#, priority:100
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:789
+#: en/git-fast-import.txt:797
#, priority:100
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:793
+#: en/git-fast-import.txt:801
#, priority:100
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:796
+#: en/git-fast-import.txt:804
#, priority:100
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:799
+#: en/git-fast-import.txt:807
#, priority:100
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:813
#, priority:100
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:813
+#: en/git-fast-import.txt:821
#, priority:100
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:820
+#: en/git-fast-import.txt:828
#, priority:100
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:825
+#: en/git-fast-import.txt:833
#, no-wrap, priority:100
msgid ""
"\t'reset' SP <ref> LF\n"
@@ -21125,25 +21168,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:829
+#: en/git-fast-import.txt:837
#, priority:100
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:831 en/git-fast-import.txt:943
+#: en/git-fast-import.txt:839 en/git-fast-import.txt:966
#, priority:100
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:834
+#: en/git-fast-import.txt:842
#, priority:100
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:838
+#: en/git-fast-import.txt:846
#, no-wrap, priority:100
msgid ""
"\treset refs/tags/938\n"
@@ -21151,19 +21194,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:850
#, priority:100
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:849
+#: en/git-fast-import.txt:857
#, priority:100
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:855
+#: en/git-fast-import.txt:863
#, no-wrap, priority:100
msgid ""
"\t'blob' LF\n"
@@ -21173,43 +21216,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:861
+#: en/git-fast-import.txt:869
#, priority:100
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:871
#, ignore-same, no-wrap, priority:100
msgid "`data`"
msgstr "`data`"
#. type: Plain text
-#: en/git-fast-import.txt:870
+#: en/git-fast-import.txt:878
#, priority:100
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:875
+#: en/git-fast-import.txt:883
#, priority:100
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:876
+#: en/git-fast-import.txt:884
#, no-wrap, priority:100
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:878
+#: en/git-fast-import.txt:886
#, priority:100
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:882
+#: en/git-fast-import.txt:890
#, no-wrap, priority:100
msgid ""
"\t'data' SP <count> LF\n"
@@ -21217,31 +21260,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:888
+#: en/git-fast-import.txt:896
#, priority:100
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:893
+#: en/git-fast-import.txt:901
#, priority:100
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:894
+#: en/git-fast-import.txt:902
#, no-wrap, priority:100
msgid "Delimited format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:899
+#: en/git-fast-import.txt:907
#, priority:100
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:905
+#: en/git-fast-import.txt:913
#, no-wrap, priority:100
msgid ""
"\t'data' SP '<<' <delim> LF\n"
@@ -21251,25 +21294,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:921
#, priority:100
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:915
+#: en/git-fast-import.txt:923
#, priority:100
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:920
+#: en/git-fast-import.txt:928
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object."
+msgstr ""
+
+#. type: delimited block .
+#: en/git-fast-import.txt:934
+#, no-wrap, priority:100
+msgid ""
+"\t'alias' LF\n"
+"\tmark\n"
+"\t'to' SP <commit-ish> LF\n"
+"\tLF?\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:937
+#, priority:100
+msgid "For a detailed description of `<commit-ish>` see above under `from`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:943
#, priority:100
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:924
+#: en/git-fast-import.txt:947
#, no-wrap, priority:100
msgid ""
"\t'checkpoint' LF\n"
@@ -21277,31 +21342,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:930
+#: en/git-fast-import.txt:953
#, priority:100
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:935
+#: en/git-fast-import.txt:958
#, priority:100
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:941
+#: en/git-fast-import.txt:964
#, priority:100
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:950
+#: en/git-fast-import.txt:973
#, priority:100
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:954
+#: en/git-fast-import.txt:977
#, no-wrap, priority:100
msgid ""
"\t'progress' SP <any> LF\n"
@@ -21309,67 +21374,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:960
+#: en/git-fast-import.txt:983
#, priority:100
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:986
#, no-wrap, priority:100
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:968
+#: en/git-fast-import.txt:991
#, priority:100
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:976
+#: en/git-fast-import.txt:999
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:979
+#: en/git-fast-import.txt:1002
#, no-wrap, priority:100
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:983 en/git-fast-import.txt:1014 en/git-fast-import.txt:1067
+#: en/git-fast-import.txt:1006 en/git-fast-import.txt:1037 en/git-fast-import.txt:1090
#, priority:100
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:991
+#: en/git-fast-import.txt:1014
#, priority:100
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:994
+#: en/git-fast-import.txt:1017
#, no-wrap, priority:100
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1022
#, priority:100
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:1024
#, priority:100
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1005
+#: en/git-fast-import.txt:1028
#, no-wrap, priority:100
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21377,283 +21442,283 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1011
+#: en/git-fast-import.txt:1034
#, priority:100
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1022
+#: en/git-fast-import.txt:1045
#, priority:100
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1025
+#: en/git-fast-import.txt:1048
#, priority:100
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1049
#, no-wrap, priority:100
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1030
+#: en/git-fast-import.txt:1053
#, priority:100
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1033
+#: en/git-fast-import.txt:1056
#, no-wrap, priority:100
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1035
+#: en/git-fast-import.txt:1058
#, no-wrap, priority:100
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1041
+#: en/git-fast-import.txt:1064
#, priority:100
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1044
+#: en/git-fast-import.txt:1067
#, no-wrap, priority:100
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1047
+#: en/git-fast-import.txt:1070
#, priority:100
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1072
#, priority:100
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1075
#, no-wrap, priority:100
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1080
#, priority:100
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1060
+#: en/git-fast-import.txt:1083
#, priority:100
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1086
#, no-wrap, priority:100
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1072
+#: en/git-fast-import.txt:1095
#, priority:100
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1075
+#: en/git-fast-import.txt:1098
#, no-wrap, priority:100
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1078
+#: en/git-fast-import.txt:1101
#, priority:100
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1079 en/git-fast-import.txt:1146
+#: en/git-fast-import.txt:1102 en/git-fast-import.txt:1169
#, no-wrap, priority:100
msgid "date-format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1080 en/git-fast-import.txt:1148
+#: en/git-fast-import.txt:1103 en/git-fast-import.txt:1171
#, no-wrap, priority:100
msgid "export-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1081
+#: en/git-fast-import.txt:1104
#, no-wrap, priority:100
msgid "relative-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1082
+#: en/git-fast-import.txt:1105
#, no-wrap, priority:100
msgid "no-relative-marks"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1083 en/git-fast-import.txt:1150
+#: en/git-fast-import.txt:1106 en/git-fast-import.txt:1173
#, no-wrap, priority:100
msgid "force"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1087
+#: en/git-fast-import.txt:1110
#, priority:100
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1088 en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1111 en/git-fast-import.txt:1170
#, no-wrap, priority:100
msgid "import-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1089
+#: en/git-fast-import.txt:1112
#, no-wrap, priority:100
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1097
+#: en/git-fast-import.txt:1120
#, priority:100
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1098
+#: en/git-fast-import.txt:1121
#, no-wrap, priority:100
msgid "get-mark"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1122
#, no-wrap, priority:100
msgid "cat-blob"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1100
+#: en/git-fast-import.txt:1123
#, no-wrap, priority:100
msgid "ls"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1108
+#: en/git-fast-import.txt:1131
#, priority:100
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1109
+#: en/git-fast-import.txt:1132
#, no-wrap, priority:100
msgid "notes"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1114
+#: en/git-fast-import.txt:1137
#, priority:100
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1138
#, no-wrap, priority:100
msgid "done"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1122
+#: en/git-fast-import.txt:1145
#, priority:100
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1129
+#: en/git-fast-import.txt:1152
#, priority:100
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1132
+#: en/git-fast-import.txt:1155
#, no-wrap, priority:100
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1137
+#: en/git-fast-import.txt:1160
#, priority:100
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1141
+#: en/git-fast-import.txt:1164
#, priority:100
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1144
+#: en/git-fast-import.txt:1167
#, priority:100
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1149
+#: en/git-fast-import.txt:1172
#, priority:100
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1178
#, priority:100
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1159
+#: en/git-fast-import.txt:1182
#, priority:100
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1161
+#: en/git-fast-import.txt:1184
#, no-wrap, priority:100
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1168
+#: en/git-fast-import.txt:1191
#, priority:100
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1175
+#: en/git-fast-import.txt:1198
#, priority:100
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1203
#, no-wrap, priority:100
msgid ""
"\tmkfifo fast-import-output\n"
@@ -21662,49 +21727,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1184
+#: en/git-fast-import.txt:1207
#, priority:100
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1188
+#: en/git-fast-import.txt:1211
#, priority:100
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1213
#, no-wrap, priority:100
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1196
+#: en/git-fast-import.txt:1219
#, priority:100
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1203
+#: en/git-fast-import.txt:1226
#, priority:100
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1211
+#: en/git-fast-import.txt:1234
#, priority:100
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1236
#, priority:100
msgid "An example crash:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1229
+#: en/git-fast-import.txt:1252
#, no-wrap, priority:100
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
@@ -21724,7 +21789,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1256
#, no-wrap, priority:100
msgid ""
"\t$ git fast-import <in\n"
@@ -21733,7 +21798,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1239
+#: en/git-fast-import.txt:1262
#, no-wrap, priority:100
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
@@ -21744,13 +21809,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1241
+#: en/git-fast-import.txt:1264
#, no-wrap, priority:100
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1251
+#: en/git-fast-import.txt:1274
#, no-wrap, priority:100
msgid ""
"\tMost Recent Commands Before Crash\n"
@@ -21765,13 +21830,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1252
+#: en/git-fast-import.txt:1275
#, no-wrap, priority:100
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1255
+#: en/git-fast-import.txt:1278
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
@@ -21779,25 +21844,25 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1256
+#: en/git-fast-import.txt:1279
#, no-wrap, priority:100
msgid "active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1259
+#: en/git-fast-import.txt:1282
#, priority:100
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1260
+#: en/git-fast-import.txt:1283
#, priority:100
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1264
+#: en/git-fast-import.txt:1287
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
@@ -21806,7 +21871,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1270
+#: en/git-fast-import.txt:1293
#, no-wrap, priority:100
msgid ""
"status : active loaded dirty\n"
@@ -21818,307 +21883,307 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1274
+#: en/git-fast-import.txt:1297
#, priority:100
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1277
+#: en/git-fast-import.txt:1300
#, no-wrap, priority:100
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1280
+#: en/git-fast-import.txt:1303
#, priority:100
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1282
+#: en/git-fast-import.txt:1305
#, no-wrap, priority:100
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1290
+#: en/git-fast-import.txt:1313
#, priority:100
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1294
+#: en/git-fast-import.txt:1317
#, priority:100
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1296
+#: en/git-fast-import.txt:1319
#, no-wrap, priority:100
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1301
+#: en/git-fast-import.txt:1324
#, priority:100
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1305
+#: en/git-fast-import.txt:1328
#, priority:100
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1307
+#: en/git-fast-import.txt:1330
#, no-wrap, priority:100
msgid "Handling Renames"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1312
+#: en/git-fast-import.txt:1335
#, priority:100
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1337
#, no-wrap, priority:100
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1341
#, priority:100
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1325
+#: en/git-fast-import.txt:1348
#, priority:100
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1331
+#: en/git-fast-import.txt:1354
#, priority:100
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1337
+#: en/git-fast-import.txt:1360
#, priority:100
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1363
#, priority:100
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1342
+#: en/git-fast-import.txt:1365
#, no-wrap, priority:100
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1346
+#: en/git-fast-import.txt:1369
#, priority:100
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1353
+#: en/git-fast-import.txt:1376
#, priority:100
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1358
+#: en/git-fast-import.txt:1381
#, priority:100
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1360
+#: en/git-fast-import.txt:1383
#, no-wrap, priority:100
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1367
+#: en/git-fast-import.txt:1390
#, priority:100
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1369
+#: en/git-fast-import.txt:1392
#, no-wrap, priority:100
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1399
#, priority:100
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1379
+#: en/git-fast-import.txt:1402
#, no-wrap, priority:100
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1385
+#: en/git-fast-import.txt:1408
#, priority:100
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1393
+#: en/git-fast-import.txt:1416
#, priority:100
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1423
#, priority:100
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1407
+#: en/git-fast-import.txt:1430
#, priority:100
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1415
+#: en/git-fast-import.txt:1438
#, priority:100
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1417
+#: en/git-fast-import.txt:1440
#, no-wrap, priority:100
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1423
+#: en/git-fast-import.txt:1446
#, priority:100
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1448
#, no-wrap, priority:100
msgid "per object"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1432
+#: en/git-fast-import.txt:1455
#, priority:100
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1438
+#: en/git-fast-import.txt:1461
#, priority:100
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1440
+#: en/git-fast-import.txt:1463
#, no-wrap, priority:100
msgid "per mark"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1446
+#: en/git-fast-import.txt:1469
#, priority:100
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1448
+#: en/git-fast-import.txt:1471
#, no-wrap, priority:100
msgid "per branch"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1474
#, priority:100
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1457
+#: en/git-fast-import.txt:1480
#, priority:100
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1464
+#: en/git-fast-import.txt:1487
#, priority:100
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1468
+#: en/git-fast-import.txt:1491
#, priority:100
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1496
#, priority:100
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1498
#, no-wrap, priority:100
msgid "per active tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1480
+#: en/git-fast-import.txt:1503
#, priority:100
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1482
+#: en/git-fast-import.txt:1505
#, no-wrap, priority:100
msgid "per active file entry"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1488
+#: en/git-fast-import.txt:1511
#, priority:100
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1493
+#: en/git-fast-import.txt:1516
#, priority:100
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1495
+#: en/git-fast-import.txt:1518
#, no-wrap, priority:100
msgid "SIGNALS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1501
+#: en/git-fast-import.txt:1524
#, priority:100
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -22679,7 +22744,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1041
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -22795,20 +22860,32 @@ msgid ""
"\t[--state-branch <branch>] [--] [<rev-list options>...]\n"
msgstr ""
+#. type: Title -
+#: en/git-filter-branch.txt:20
+#, no-wrap, priority:100
+msgid "WARNING"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:31
+#, priority:100
+msgid "'git filter-branch' has a plethora of pitfalls that can produce non-obvious manglings of the intended history rewrite (and can leave you with little time to investigate such problems since it has such abysmal performance). These safety and performance issues cannot be backward compatibly fixed and as such, its use is not recommended. Please use an alternative history filtering tool such as https://github.com/newren/git-filter-repo/[git filter-repo]. If you still need to use 'git filter-branch', please carefully read <<SAFETY>> (and <<PERFORMANCE>>) to learn about the land mines of filter-branch, and then vigilantly avoid as many of the hazards listed there as reasonably possible."
+msgstr ""
+
#. type: Plain text
-#: en/git-filter-branch.txt:27
+#: en/git-filter-branch.txt:40
#, priority:100
msgid "Lets you rewrite Git revision history by rewriting the branches mentioned in the <rev-list options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge information) will be preserved."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:34
+#: en/git-filter-branch.txt:47
#, priority:100
msgid "The command will only rewrite the _positive_ refs mentioned in the command line (e.g. if you pass 'a..b', only 'b' will be rewritten). If you specify no filters, the commits will be recommitted without any changes, which would normally have no effect. Nevertheless, this may be useful in the future for compensating for some Git bugs or such, therefore such a usage is permitted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:39
+#: en/git-filter-branch.txt:52
#, no-wrap, priority:100
msgid ""
"*NOTE*: This command honors `.git/info/grafts` file and refs in\n"
@@ -22818,7 +22895,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:48
+#: en/git-filter-branch.txt:61
#, no-wrap, priority:100
msgid ""
"*WARNING*! The rewritten history will have different object names for all\n"
@@ -22832,337 +22909,337 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:52
+#: en/git-filter-branch.txt:65
#, priority:100
msgid "Always verify that the rewritten version is correct: The original refs, if different from the rewritten ones, will be stored in the namespace 'refs/original/'."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:56
+#: en/git-filter-branch.txt:69
#, priority:100
msgid "Note that since this operation is very I/O expensive, it might be a good idea to redirect the temporary directory off-disk with the `-d` option, e.g. on tmpfs. Reportedly the speedup is very noticeable."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:59
+#: en/git-filter-branch.txt:72
#, no-wrap, priority:100
msgid "Filters"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:71
+#: en/git-filter-branch.txt:84
#, priority:100
msgid "The filters are applied in the order as listed below. The <command> argument is always evaluated in the shell context using the 'eval' command (with the notable exception of the commit filter, for technical reasons). Prior to that, the `$GIT_COMMIT` environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, and GIT_COMMITTER_DATE are taken from the current commit and exported to the environment, in order to affect the author and committer identities of the replacement commit created by linkgit:git-commit-tree[1] after the filters have run."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:74
+#: en/git-filter-branch.txt:87
#, priority:100
msgid "If any evaluation of <command> returns a non-zero exit status, the whole operation will be aborted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:80
+#: en/git-filter-branch.txt:93
#, priority:100
msgid "A 'map' function is available that takes an \"original sha1 id\" argument and outputs a \"rewritten sha1 id\" if the commit has been already rewritten, and \"original sha1 id\" otherwise; the 'map' function can return several ids on separate lines if your commit filter emitted multiple commits."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:85
+#: en/git-filter-branch.txt:98
#, no-wrap, priority:100
msgid "--setup <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:91
+#: en/git-filter-branch.txt:104
#, priority:100
msgid "This is not a real filter executed for each commit but a one time setup just before the loop. Therefore no commit-specific variables are defined yet. Functions or variables defined here can be used or modified in the following filter steps except the commit filter, for technical reasons."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:92
+#: en/git-filter-branch.txt:105
#, no-wrap, priority:100
msgid "--subdirectory-filter <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:96
+#: en/git-filter-branch.txt:109
#, priority:100
msgid "Only look at the history which touches the given subdirectory. The result will contain that directory (and only that) as its project root. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:97
+#: en/git-filter-branch.txt:110
#, no-wrap, priority:100
msgid "--env-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:102
+#: en/git-filter-branch.txt:115
#, priority:100
msgid "This filter may be used if you only need to modify the environment in which the commit will be performed. Specifically, you might want to rewrite the author/committer name/email/time environment variables (see linkgit:git-commit-tree[1] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:103
+#: en/git-filter-branch.txt:116
#, no-wrap, priority:100
msgid "--tree-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:110
+#: en/git-filter-branch.txt:123
#, priority:100
msgid "This is the filter for rewriting the tree and its contents. The argument is evaluated in shell with the working directory set to the root of the checked out tree. The new tree is then used as-is (new files are auto-added, disappeared files are auto-removed - neither .gitignore files nor any other ignore rules *HAVE ANY EFFECT*!)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:111
+#: en/git-filter-branch.txt:124
#, no-wrap, priority:100
msgid "--index-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:117
+#: en/git-filter-branch.txt:130
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the index. It is similar to the tree filter but does not check out the tree, which makes it much faster. Frequently used with `git rm --cached --ignore-unmatch ...`, see EXAMPLES below. For hairy cases, see linkgit:git-update-index[1]."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:118
+#: en/git-filter-branch.txt:131
#, no-wrap, priority:100
msgid "--parent-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:125
+#: en/git-filter-branch.txt:138
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the commit's parent list. It will receive the parent string on stdin and shall output the new parent string on stdout. The parent string is in the format described in linkgit:git-commit-tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and \"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:126
+#: en/git-filter-branch.txt:139
#, no-wrap, priority:100
msgid "--msg-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:131
+#: en/git-filter-branch.txt:144
#, priority:100
msgid "This is the filter for rewriting the commit messages. The argument is evaluated in the shell with the original commit message on standard input; its standard output is used as the new commit message."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:132
+#: en/git-filter-branch.txt:145
#, no-wrap, priority:100
msgid "--commit-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:138
+#: en/git-filter-branch.txt:151
#, ignore-ellipsis, priority:100
msgid "This is the filter for performing the commit. If this filter is specified, it will be called instead of the 'git commit-tree' command, with arguments of the form \"<TREE_ID> [(-p <PARENT_COMMIT_ID>)...]\" and the log message on stdin. The commit id is expected on stdout."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:142
+#: en/git-filter-branch.txt:155
#, priority:100
msgid "As a special extension, the commit filter may emit multiple commit ids; in that case, the rewritten children of the original commit will have all of them as parents."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:147
+#: en/git-filter-branch.txt:160
#, priority:100
msgid "You can use the 'map' convenience function in this filter, and other convenience functions, too. For example, calling 'skip_commit \"$@\"' will leave out the current commit (but not its changes! If you want that, use 'git rebase' instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:151
+#: en/git-filter-branch.txt:164
#, priority:100
msgid "You can also use the `git_commit_non_empty_tree \"$@\"` instead of `git commit-tree \"$@\"` if you don't wish to keep commits with a single parent and that makes no change to the tree."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:152
+#: en/git-filter-branch.txt:165
#, no-wrap, priority:100
msgid "--tag-name-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:158
+#: en/git-filter-branch.txt:171
#, priority:100
msgid "This is the filter for rewriting tag names. When passed, it will be called for every tag ref that points to a rewritten object (or to a tag object which points to a rewritten object). The original tag name is passed via standard input, and the new tag name is expected on standard output."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:163
+#: en/git-filter-branch.txt:176
#, priority:100
msgid "The original tags are not deleted, but can be overwritten; use \"--tag-name-filter cat\" to simply update the tags. In this case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:174
+#: en/git-filter-branch.txt:187
#, priority:100
msgid "Nearly proper rewriting of tag objects is supported. If the tag has a message attached, a new tag object will be created with the same message, author, and timestamp. If the tag has a signature attached, the signature will be stripped. It is by definition impossible to preserve signatures. The reason this is \"nearly\" proper, is because ideally if the tag did not change (points to the same object, has the same name, etc.) it should retain any signature. That is not the case, signatures will always be removed, buyer beware. There is also no support for changing the author or timestamp (or the tag message for that matter). Tags which point to other tags will be rewritten to point to the underlying commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:175
+#: en/git-filter-branch.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--prune-empty"
msgstr "--prune-empty"
#. type: Plain text
-#: en/git-filter-branch.txt:182
+#: en/git-filter-branch.txt:195
#, priority:100
msgid "Some filters will generate empty commits that leave the tree untouched. This option instructs git-filter-branch to remove such commits if they have exactly one or zero non-pruned parents; merge commits will therefore remain intact. This option cannot be used together with `--commit-filter`, though the same effect can be achieved by using the provided `git_commit_non_empty_tree` function in a commit filter."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:183
+#: en/git-filter-branch.txt:196
#, no-wrap, priority:100
msgid "--original <namespace>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:186
+#: en/git-filter-branch.txt:199
#, priority:100
msgid "Use this option to set the namespace where the original commits will be stored. The default value is 'refs/original'."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:187
+#: en/git-filter-branch.txt:200
#, no-wrap, priority:100
msgid "-d <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:194
+#: en/git-filter-branch.txt:207
#, priority:100
msgid "Use this option to set the path to the temporary directory used for rewriting. When applying a tree filter, the command needs to temporarily check out the tree to some directory, which may consume considerable space in case of large projects. By default it does this in the `.git-rewrite/` directory but you can override that choice by this parameter."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:200
+#: en/git-filter-branch.txt:213
#, priority:100
msgid "'git filter-branch' refuses to start with an existing temporary directory or when there are already refs starting with 'refs/original/', unless forced."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:201
+#: en/git-filter-branch.txt:214
#, no-wrap, priority:100
msgid "--state-branch <branch>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:206
+#: en/git-filter-branch.txt:219
#, priority:100
msgid "This option will cause the mapping from old to new objects to be loaded from named branch upon startup and saved as a new commit to that branch upon exit, enabling incremental of large trees. If '<branch>' does not exist it will be created."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:207
+#: en/git-filter-branch.txt:220
#, ignore-ellipsis, no-wrap, priority:100
msgid "<rev-list options>..."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:212
+#: en/git-filter-branch.txt:225
#, priority:100
msgid "Arguments for 'git rev-list'. All positive refs included by these options are rewritten. You may also specify options such as `--all`, but you must use `--` to separate them from the 'git filter-branch' options. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:216
+#: en/git-filter-branch.txt:229
#, no-wrap, priority:100
msgid "Remap to ancestor"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:223
+#: en/git-filter-branch.txt:236
#, priority:100
msgid "By using linkgit:git-rev-list[1] arguments, e.g., path limiters, you can limit the set of revisions which get rewritten. However, positive refs on the command line are distinguished: we don't let them be excluded by such limiters. For this purpose, they are instead rewritten to point at the nearest ancestor that was not excluded."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:231
+#: en/git-filter-branch.txt:244
#, priority:100
msgid "On success, the exit status is `0`. If the filter can't find any commits to rewrite, the exit status is `2`. On any other error, the exit status may be any other non-zero value."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:238
+#: en/git-filter-branch.txt:251
#, priority:100
msgid "Suppose you want to remove a file (containing confidential information or copyright violation) from all commits:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:241
+#: en/git-filter-branch.txt:254
#, no-wrap, priority:100
msgid "git filter-branch --tree-filter 'rm filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:246
+#: en/git-filter-branch.txt:259
#, priority:100
msgid "However, if the file is absent from the tree of some commit, a simple `rm filename` will fail for that tree and commit. Thus you may instead want to use `rm -f filename` as the script."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:252
+#: en/git-filter-branch.txt:265
#, priority:100
msgid "Using `--index-filter` with 'git rm' yields a significantly faster version. Like with using `rm filename`, `git rm --cached filename` will fail if the file is absent from the tree of a commit. If you want to \"completely forget\" a file, it does not matter when it entered history, so we also add `--ignore-unmatch`:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:255
+#: en/git-filter-branch.txt:268
#, no-wrap, priority:100
msgid "git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:258
+#: en/git-filter-branch.txt:271
#, priority:100
msgid "Now, you will get the rewritten history saved in HEAD."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:261
+#: en/git-filter-branch.txt:274
#, priority:100
msgid "To rewrite the repository to look as if `foodir/` had been its project root, and discard all other history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:264
+#: en/git-filter-branch.txt:277
#, no-wrap, priority:100
msgid "git filter-branch --subdirectory-filter foodir -- --all\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:269
+#: en/git-filter-branch.txt:282
#, priority:100
msgid "Thus you can, e.g., turn a library subdirectory into a repository of its own. Note the `--` that separates 'filter-branch' options from revision options, and the `--all` to rewrite all branches and tags."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:273
+#: en/git-filter-branch.txt:286
#, priority:100
msgid "To set a commit (which typically is at the tip of another history) to be the parent of the current initial commit, in order to paste the other history behind the current history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:276
+#: en/git-filter-branch.txt:289
#, no-wrap, priority:100
msgid "git filter-branch --parent-filter 'sed \"s/^\\$/-p <graft-id>/\"' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:282
+#: en/git-filter-branch.txt:295
#, priority:100
msgid "(if the parent string is empty - which happens when we are dealing with the initial commit - add graftcommit as a parent). Note that this assumes history with a single root (that is, no merge without common ancestors happened). If this is not the case, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:286
+#: en/git-filter-branch.txt:299
#, no-wrap, priority:100
msgid ""
"git filter-branch --parent-filter \\\n"
@@ -23170,13 +23247,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:289
+#: en/git-filter-branch.txt:302
#, priority:100
msgid "or even simpler:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:293
+#: en/git-filter-branch.txt:306
#, no-wrap, priority:100
msgid ""
"git replace --graft $commit-id $graft-id\n"
@@ -23184,13 +23261,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:296
+#: en/git-filter-branch.txt:309
#, priority:100
msgid "To remove commits authored by \"Darl McBribe\" from the history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:305
+#: en/git-filter-branch.txt:318
#, no-wrap, priority:100
msgid ""
"git filter-branch --commit-filter '\n"
@@ -23203,13 +23280,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:308
+#: en/git-filter-branch.txt:321
#, priority:100
msgid "The function 'skip_commit' is defined as follows:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:320
+#: en/git-filter-branch.txt:333
#, no-wrap, priority:100
msgid ""
"skip_commit()\n"
@@ -23225,13 +23302,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:327
+#: en/git-filter-branch.txt:340
#, priority:100
msgid "The shift magic first throws away the tree id and then the -p parameters. Note that this handles merges properly! In case Darl committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 as their parents instead of the merge commit."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:332
+#: en/git-filter-branch.txt:345
#, no-wrap, priority:100
msgid ""
"*NOTE* the changes introduced by the commits, and which are not reverted\n"
@@ -23241,13 +23318,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:336
+#: en/git-filter-branch.txt:349
#, priority:100
msgid "You can rewrite the commit log messages using `--msg-filter`. For example, 'git svn-id' strings in a repository created by 'git svn' can be removed this way:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:341
+#: en/git-filter-branch.txt:354
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23256,13 +23333,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:345
+#: en/git-filter-branch.txt:358
#, priority:100
msgid "If you need to add 'Acked-by' lines to, say, the last 10 commits (none of which is a merge), use this command:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:351
+#: en/git-filter-branch.txt:364
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23272,13 +23349,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:357
+#: en/git-filter-branch.txt:370
#, priority:100
msgid "The `--env-filter` option can be used to modify committer and/or author identity. For example, if you found out that your commits have the wrong identity due to a misconfigured user.email, you can make a correction, before publishing the project, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:369
+#: en/git-filter-branch.txt:382
#, no-wrap, priority:100
msgid ""
"git filter-branch --env-filter '\n"
@@ -23294,19 +23371,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:375
+#: en/git-filter-branch.txt:388
#, priority:100
msgid "To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will point to the top-most revision that a 'git rev-list' of this range will print."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:377
+#: en/git-filter-branch.txt:390
#, priority:100
msgid "Consider this history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:382
+#: en/git-filter-branch.txt:395
#, no-wrap, priority:100
msgid ""
" D--E--F--G--H\n"
@@ -23315,25 +23392,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:385
+#: en/git-filter-branch.txt:398
#, priority:100
msgid "To rewrite only commits D,E,F,G,H, but leave A, B and C alone, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:388
+#: en/git-filter-branch.txt:401
#, ignore-ellipsis, no-wrap, priority:100
msgid "git filter-branch ... C..H\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:391
+#: en/git-filter-branch.txt:404
#, priority:100
msgid "To rewrite commits E,F,G,H, use one of these:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:395
+#: en/git-filter-branch.txt:408
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"git filter-branch ... C..H --not D\n"
@@ -23341,13 +23418,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:398
+#: en/git-filter-branch.txt:411
#, priority:100
msgid "To move the whole tree into a subdirectory, or remove it from there:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:405
+#: en/git-filter-branch.txt:418
#, no-wrap, priority:100
msgid ""
"git filter-branch --index-filter \\\n"
@@ -23358,87 +23435,279 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-filter-branch.txt:410
+#: en/git-filter-branch.txt:423
#, no-wrap, priority:100
msgid "CHECKLIST FOR SHRINKING A REPOSITORY"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:418
+#: en/git-filter-branch.txt:431
#, priority:100
msgid "git-filter-branch can be used to get rid of a subset of files, usually with some combination of `--index-filter` and `--subdirectory-filter`. People expect the resulting repository to be smaller than the original, but you need a few more steps to actually make it smaller, because Git tries hard not to lose your objects until you tell it to. First make sure that:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:422
+#: en/git-filter-branch.txt:435
#, priority:100
msgid "You really removed all variants of a filename, if a blob was moved over its lifetime. `git log --name-only --follow --all -- filename` can help you find renames."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:425
+#: en/git-filter-branch.txt:438
#, priority:100
msgid "You really filtered all refs: use `--tag-name-filter cat -- --all` when calling git-filter-branch."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:428
+#: en/git-filter-branch.txt:441
#, priority:100
msgid "Then there are two ways to get a smaller repository. A safer way is to clone, that keeps your original intact."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:432
+#: en/git-filter-branch.txt:445
#, priority:100
msgid "Clone it with `git clone file:///path/to/repo`. The clone will not have the removed objects. See linkgit:git-clone[1]. (Note that cloning with a plain path just hardlinks everything!)"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:437
+#: en/git-filter-branch.txt:450
#, priority:100
msgid "If you really don't want to clone it, for whatever reasons, check the following points instead (in this order). This is a very destructive approach, so *make a backup* or go back to cloning it. You have been warned."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:441
+#: en/git-filter-branch.txt:454
#, priority:100
msgid "Remove the original refs backed up by git-filter-branch: say `git for-each-ref --format=\"%(refname)\" refs/original/ | xargs -n 1 git update-ref -d`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:443
+#: en/git-filter-branch.txt:456
#, priority:100
msgid "Expire all reflogs with `git reflog expire --expire=now --all`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:447
+#: en/git-filter-branch.txt:460
#, priority:100
msgid "Garbage collect all unreferenced objects with `git gc --prune=now` (or if your git-gc is not new enough to support arguments to `--prune`, use `git repack -ad; git prune` instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:459
+#: en/git-filter-branch.txt:467
#, priority:100
-msgid "git-filter-branch allows you to make complex shell-scripted rewrites of your Git history, but you probably don't need this flexibility if you're simply _removing unwanted data_ like large files or passwords. For those operations you may want to consider http://rtyley.github.io/bfg-repo-cleaner/[The BFG Repo-Cleaner], a JVM-based alternative to git-filter-branch, typically at least 10-50x faster for those use-cases, and with quite different characteristics:"
+msgid "The performance of git-filter-branch is glacially slow; its design makes it impossible for a backward-compatible implementation to ever be fast:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:467
+#: en/git-filter-branch.txt:473
#, priority:100
-msgid "Any particular version of a file is cleaned exactly _once_. The BFG, unlike git-filter-branch, does not give you the opportunity to handle a file differently based on where or when it was committed within your history. This constraint gives the core performance benefit of The BFG, and is well-suited to the task of cleansing bad data - you don't care _where_ the bad data is, you just want it _gone_."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:473
+#: en/git-filter-branch.txt:476
+#, priority:100
+msgid "If you try and cheat and try to make git-filter-branch only work on files modified in a commit, then two things happen"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:482
+#, priority:100
+msgid "you run into problems with deletions whenever the user is simply trying to rename files (because attempting to delete files that don't exist looks like a no-op; it takes some chicanery to remap deletes across file renames when the renames happen via arbitrary user-provided shell)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:488
+#, priority:100
+msgid "even if you succeed at the map-deletes-for-renames chicanery, you still technically violate backward compatibility because users are allowed to filter files in ways that depend upon topology of commits instead of filtering solely based on file contents or names (though this has not been observed in the wild)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:494
+#, priority:100
+msgid "Even if you don't need to edit files but only want to e.g. rename or remove some and thus can avoid checking out each file (i.e. you can use --index-filter), you still are passing shell snippets for your filters. This means that for every commit, you have to have a prepared git repo where those filters can be run. That's a significant setup."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:505
+#, priority:100
+msgid "Further, several additional files are created or updated per commit by git-filter-branch. Some of these are for supporting the convenience functions provided by git-filter-branch (such as map()), while others are for keeping track of internal state (but could have also been accessed by user filters; one of git-filter-branch's regression tests does so). This essentially amounts to using the filesystem as an IPC mechanism between git-filter-branch and the user-provided filters. Disks tend to be a slow IPC mechanism, and writing these files also effectively represents a forced synchronization point between separate processes that we hit with every commit."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:511
+#, priority:100
+msgid "The user-provided shell commands will likely involve a pipeline of commands, resulting in the creation of many processes per commit. Creating and running another process takes a widely varying amount of time between operating systems, but on any platform it is very slow relative to invoking a function."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:517
+#, priority:100
+msgid "git-filter-branch itself is written in shell, which is kind of slow. This is the one performance issue that could be backward-compatibly fixed, but compared to the above problems that are intrinsic to the design of git-filter-branch, the language of the tool itself is a relatively minor issue."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:528
+#, priority:100
+msgid "Side note: Unfortunately, people tend to fixate on the written-in-shell aspect and periodically ask if git-filter-branch could be rewritten in another language to fix the performance issues. Not only does that ignore the bigger intrinsic problems with the design, it'd help less than you'd expect: if git-filter-branch itself were not shell, then the convenience functions (map(), skip_commit(), etc) and the `--setup` argument could no longer be executed once at the beginning of the program but would instead need to be prepended to every user filter (and thus re-executed with every commit)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:539
+#, priority:100
+msgid "The https://github.com/newren/git-filter-repo/[git filter-repo] tool is an alternative to git-filter-branch which does not suffer from these performance problems or the safety problems (mentioned below). For those with existing tooling which relies upon git-filter-branch, 'git repo-filter' also provides https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], a drop-in git-filter-branch replacement (with a few caveats). While filter-lamely suffers from all the same safety issues as git-filter-branch, it at least ameloriates the performance issues a little."
+msgstr ""
+
+#. type: Title -
+#: en/git-filter-branch.txt:542
+#, no-wrap, priority:100
+msgid "SAFETY"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:547
+#, priority:100
+msgid "git-filter-branch is riddled with gotchas resulting in various ways to easily corrupt repos or end up with a mess worse than what you started with:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:560
+#, priority:100
+msgid "Someone can have a set of \"working and tested filters\" which they document or provide to a coworker, who then runs them on a different OS where the same commands are not working/tested (some examples in the git-filter-branch manpage are also affected by this). BSD vs. GNU userland differences can really bite. If lucky, error messages are spewed. But just as likely, the commands either don't do the filtering requested, or silently corrupt by making some unwanted change. The unwanted change may only affect a few commits, so it's not necessarily obvious either. (The fact that problems won't necessarily be obvious means they are likely to go unnoticed until the rewritten history is in use for quite a while, at which point it's really hard to justify another flag-day for another rewrite.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:570
+#, priority:100
+msgid "Filenames with spaces are often mishandled by shell snippets since they cause problems for shell pipelines. Not everyone is familiar with find -print0, xargs -0, git-ls-files -z, etc. Even people who are familiar with these may assume such flags are not relevant because someone else renamed any such files in their repo back before the person doing the filtering joined the project. And often, even those familiar with handling arguments with spaces may not do so just because they aren't in the mindset of thinking about everything that could possibly go wrong."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:580
+#, priority:100
+msgid "Non-ascii filenames can be silently removed despite being in a desired directory. Keeping only wanted paths is often done using pipelines like `git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`. ls-files will only quote filenames if needed, so folks may not notice that one of the files didn't match the regex (at least not until it's much too late). Yes, someone who knows about core.quotePath can avoid this (unless they have other special characters like \\t, \\n, or \"), and people who use ls-files -z with something other than grep can avoid this, but that doesn't mean they will."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:586
+#, priority:100
+msgid "Similarly, when moving files around, one can find that filenames with non-ascii or special characters end up in a different directory, one that includes a double quote character. (This is technically the same issue as above with quoting, but perhaps an interesting different way that it can and has manifested as a problem.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:594
+#, priority:100
+msgid "It's far too easy to accidentally mix up old and new history. It's still possible with any tool, but git-filter-branch almost invites it. If lucky, the only downside is users getting frustrated that they don't know how to shrink their repo and remove the old stuff. If unlucky, they merge old and new history and end up with multiple \"copies\" of each commit, some of which have unwanted or sensitive files and others which don't. This comes about in multiple different ways:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:597
+#, priority:100
+msgid "the default to only doing a partial history rewrite ('--all' is not the default and few examples show it)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:599
+#, priority:100
+msgid "the fact that there's no automatic post-run cleanup"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:602
+#, priority:100
+msgid "the fact that --tag-name-filter (when used to rename tags) doesn't remove the old tags but just adds new ones with the new name"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:611
+#, priority:100
+msgid "the fact that little educational information is provided to inform users of the ramifications of a rewrite and how to avoid mixing old and new history. For example, this man page discusses how users need to understand that they need to rebase their changes for all their branches on top of new history (or delete and reclone), but that's only one of multiple concerns to consider. See the \"DISCUSSION\" section of the git filter-repo manual page for more details."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:614
+#, priority:100
+msgid "Annotated tags can be accidentally converted to lightweight tags, due to either of two issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:619
+#, priority:100
+msgid "Someone can do a history rewrite, realize they messed up, restore from the backups in refs/original/, and then redo their git-filter-branch command. (The backup in refs/original/ is not a real backup; it dereferences tags first.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:624
+#, priority:100
+msgid "Running git-filter-branch with either --tags or --all in your <rev-list options>. In order to retain annotated tags as annotated, you must use --tag-name-filter (and must not have restored from refs/original/ in a previously botched rewrite)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:629
#, priority:100
-msgid "By default The BFG takes full advantage of multi-core machines, cleansing commit file-trees in parallel. git-filter-branch cleans commits sequentially (i.e. in a single-threaded manner), though it _is_ possible to write filters that include their own parallelism, in the scripts executed against each commit."
+msgid "Any commit messages that specify an encoding will become corrupted by the rewrite; git-filter-branch ignores the encoding, takes the original bytes, and feeds it to commit-tree without telling it the proper encoding. (This happens whether or not --msg-filter is used.)"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:478
+#: en/git-filter-branch.txt:633
#, priority:100
-msgid "The http://rtyley.github.io/bfg-repo-cleaner/#examples[command options] are much more restrictive than git-filter branch, and dedicated just to the tasks of removing unwanted data- e.g: `--strip-blobs-bigger-than 1M`."
+msgid "Commit messages (even if they are all UTF-8) by default become corrupted due to not being updated -- any references to other commit hashes in commit messages will now refer to no-longer-extant commits."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:644
+#, priority:100
+msgid "There are no facilities for helping users find what unwanted crud they should delete, which means they are much more likely to have incomplete or partial cleanups that sometimes result in confusion and people wasting time trying to understand. (For example, folks tend to just look for big files to delete instead of big directories or extensions, and once they do so, then sometime later folks using the new repository who are going through history will notice a build artifact directory that has some files but not others, or a cache of dependencies (node_modules or similar) which couldn't have ever been functional since it's missing some files.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:647
+#, priority:100
+msgid "If --prune-empty isn't specified, then the filtering process can create hoards of confusing empty commits"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:651
+#, priority:100
+msgid "If --prune-empty is specified, then intentionally placed empty commits from before the filtering operation are also pruned instead of just pruning commits that became empty due to filtering rules."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:654
+#, ignore-ellipsis, priority:100
+msgid "If --prune empty is specified, sometimes empty commits are missed and left around anyway (a somewhat rare bug, but it happens...)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:658
+#, priority:100
+msgid "A minor issue, but users who have a goal to update all names and emails in a repository may be led to --env-filter which will only update authors and committers, missing taggers."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:664
+#, priority:100
+msgid "If the user provides a --tag-name-filter that maps multiple tags to the same name, no warning or error is provided; git-filter-branch simply overwrites each tag in some undocumented pre-defined order resulting in only one tag at the end. (A git-filter-branch regression test requires this surprising behavior.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:667
+#, priority:100
+msgid "Also, the poor performance of git-filter-branch often leads to safety issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:683
+#, priority:100
+msgid "Coming up with the correct shell snippet to do the filtering you want is sometimes difficult unless you're just doing a trivial modification such as deleting a couple files. Unfortunately, people often learn if the snippet is right or wrong by trying it out, but the rightness or wrongness can vary depending on special circumstances (spaces in filenames, non-ascii filenames, funny author names or emails, invalid timezones, presence of grafts or replace objects, etc.), meaning they may have to wait a long time, hit an error, then restart. The performance of git-filter-branch is so bad that this cycle is painful, reducing the time available to carefully re-check (to say nothing about what it does to the patience of the person doing the rewrite even if they do technically have more time available). This problem is extra compounded because errors from broken filters may not be shown for a long time and/or get lost in a sea of output. Even worse, broken filters often just result in silent incorrect rewrites."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:691
+#, priority:100
+msgid "To top it all off, even when users finally find working commands, they naturally want to share them. But they may be unaware that their repo didn't have some special cases that someone else's does. So, when someone else with a different repository runs the same commands, they get hit by the problems above. Or, the user just runs commands that really were vetted for special cases, but they run it on a different OS where it doesn't work, as noted above."
msgstr ""
#. type: Title =
@@ -23474,7 +23743,7 @@ msgid "This command is intended mostly for internal use by scripts automatically
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:64
+#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:68
#, no-wrap, priority:240
msgid "--log[=<n>]"
msgstr ""
@@ -23486,7 +23755,7 @@ msgid "In addition to branch names, populate the log message with one-line descr
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:65
+#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:69
#, ignore-same, no-wrap, priority:240
msgid "--no-log"
msgstr "--no-log"
@@ -24156,9 +24425,9 @@ msgid ""
"\t\t [--signature-file=<file>]\n"
"\t\t [-n | --numbered | -N | --no-numbered]\n"
"\t\t [--start-number <n>] [--numbered-files]\n"
-"\t\t [--in-reply-to=Message-Id] [--suffix=.<sfx>]\n"
+"\t\t [--in-reply-to=<message id>] [--suffix=.<sfx>]\n"
"\t\t [--ignore-if-in-upstream]\n"
-"\t\t [--rfc] [--subject-prefix=Subject-Prefix]\n"
+"\t\t [--rfc] [--subject-prefix=<subject prefix>]\n"
"\t\t [(--reroll-count|-v) <n>]\n"
"\t\t [--to=<email>] [--cc=<email>]\n"
"\t\t [--[no-]cover-letter] [--quiet]\n"
@@ -24207,523 +24476,524 @@ msgid "By default, each output file is numbered sequentially from 1, and uses th
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:70
+#: en/git-format-patch.txt:71
#, priority:100
-msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`."
+msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`. All directory components will be created."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:74
+#: en/git-format-patch.txt:75
#, priority:100
msgid "By default, the subject of a single patch is \"[PATCH] \" followed by the concatenation of lines from the commit message up to the first blank line (see the DISCUSSION section of linkgit:git-commit[1])."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:78
+#: en/git-format-patch.txt:79
#, priority:100
msgid "When multiple patches are output, the subject prefix will instead be \"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. To omit patch numbers from the subject, use `-N`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:83
+#: en/git-format-patch.txt:84
#, priority:100
msgid "If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a `Message-Id` header to reference."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:89
+#: en/git-format-patch.txt:90
#, no-wrap, priority:100
msgid "-<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:91
+#: en/git-format-patch.txt:92
#, priority:100
msgid "Prepare patches from the topmost <n> commits."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:92
+#: en/git-format-patch.txt:93
#, no-wrap, priority:100
msgid "-o <dir>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:93
+#: en/git-format-patch.txt:94
#, no-wrap, priority:100
msgid "--output-directory <dir>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:96
+#: en/git-format-patch.txt:97
#, priority:100
msgid "Use <dir> to store the resulting files, instead of the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:98 en/git-shortlog.txt:30
+#: en/git-format-patch.txt:99 en/git-shortlog.txt:30
#, ignore-same, no-wrap, priority:260
msgid "--numbered"
msgstr "--numbered"
#. type: Plain text
-#: en/git-format-patch.txt:100
+#: en/git-format-patch.txt:101
#, priority:100
msgid "Name output in '[PATCH n/m]' format, even with a single patch."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:102
+#: en/git-format-patch.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-numbered"
msgstr "--no-numbered"
#. type: Plain text
-#: en/git-format-patch.txt:104
+#: en/git-format-patch.txt:105
#, priority:100
msgid "Name output in '[PATCH]' format."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:105
+#: en/git-format-patch.txt:106
#, no-wrap, priority:100
msgid "--start-number <n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:107
+#: en/git-format-patch.txt:108
#, priority:100
msgid "Start numbering the patches at <n> instead of 1."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:108
+#: en/git-format-patch.txt:109
#, ignore-same, no-wrap, priority:100
msgid "--numbered-files"
msgstr "--numbered-files"
#. type: Plain text
-#: en/git-format-patch.txt:111
+#: en/git-format-patch.txt:112
#, priority:100
msgid "Output file names will be a simple number sequence without the default first line of the commit appended."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:113
+#: en/git-format-patch.txt:114
#, ignore-same, no-wrap, priority:100
msgid "--keep-subject"
msgstr "--keep-subject"
#. type: Plain text
-#: en/git-format-patch.txt:116
+#: en/git-format-patch.txt:117
#, priority:100
msgid "Do not strip/add '[PATCH]' from the first line of the commit log message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:122
+#: en/git-format-patch.txt:123
#, priority:100
msgid "Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:123 en/git-pack-objects.txt:59
+#: en/git-format-patch.txt:124 en/git-pack-objects.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--stdout"
msgstr "--stdout"
#. type: Plain text
-#: en/git-format-patch.txt:126
+#: en/git-format-patch.txt:127
#, priority:100
msgid "Print all commits to the standard output in mbox format, instead of creating a file for each one."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:127
+#: en/git-format-patch.txt:128
#, no-wrap, priority:100
msgid "--attach[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:131
+#: en/git-format-patch.txt:132
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: attachment`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:132
+#: en/git-format-patch.txt:133
#, ignore-same, no-wrap, priority:100
msgid "--no-attach"
msgstr "--no-attach"
#. type: Plain text
-#: en/git-format-patch.txt:135
+#: en/git-format-patch.txt:136
#, priority:100
msgid "Disable the creation of an attachment, overriding the configuration setting."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:136
+#: en/git-format-patch.txt:137
#, no-wrap, priority:100
msgid "--inline[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:140
+#: en/git-format-patch.txt:141
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: inline`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:141
+#: en/git-format-patch.txt:142
#, no-wrap, priority:100
msgid "--thread[=<style>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:142
+#: en/git-format-patch.txt:143
#, ignore-same, no-wrap, priority:100
msgid "--no-thread"
msgstr "--no-thread"
#. type: Plain text
-#: en/git-format-patch.txt:147
+#: en/git-format-patch.txt:148
#, priority:100
msgid "Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the first. Also controls generation of the `Message-Id` header to reference."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:153
+#: en/git-format-patch.txt:154
#, priority:100
msgid "The optional <style> argument can be either `shallow` or `deep`. 'shallow' threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order. 'deep' threading makes every mail a reply to the previous one."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:157
+#: en/git-format-patch.txt:158
#, priority:100
msgid "The default is `--no-thread`, unless the `format.thread` configuration is set. If `--thread` is specified without a style, it defaults to the style specified by `format.thread` if any, or else `shallow`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:161
+#: en/git-format-patch.txt:162
#, priority:100
msgid "Beware that the default for 'git send-email' is to thread emails itself. If you want `git format-patch` to take care of threading, you will want to ensure that threading is disabled for `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:162
-#, no-wrap, priority:100
-msgid "--in-reply-to=Message-Id"
-msgstr ""
+#: en/git-format-patch.txt:163
+#, fuzzy, no-wrap, priority:100
+#| msgid "--no-message-id"
+msgid "--in-reply-to=<message id>"
+msgstr "--no-message-id"
#. type: Plain text
-#: en/git-format-patch.txt:166
+#: en/git-format-patch.txt:167
#, priority:100
-msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given Message-Id, which avoids breaking threads to provide a new patch series."
+msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given <message id>, which avoids breaking threads to provide a new patch series."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:167
+#: en/git-format-patch.txt:168
#, ignore-same, no-wrap, priority:100
msgid "--ignore-if-in-upstream"
msgstr "--ignore-if-in-upstream"
#. type: Plain text
-#: en/git-format-patch.txt:173
+#: en/git-format-patch.txt:174
#, priority:100
msgid "Do not include a patch that matches a commit in <until>..<since>. This will examine all patches reachable from <since> but not from <until> and compare them with the patches being generated, and any patch that matches is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:174
+#: en/git-format-patch.txt:175
#, no-wrap, priority:100
-msgid "--subject-prefix=<Subject-Prefix>"
+msgid "--subject-prefix=<subject prefix>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:179
+#: en/git-format-patch.txt:180
#, priority:100
-msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<Subject-Prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
+msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<subject prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:180
+#: en/git-format-patch.txt:181
#, ignore-same, no-wrap, priority:100
msgid "--rfc"
msgstr "--rfc"
#. type: Plain text
-#: en/git-format-patch.txt:184
+#: en/git-format-patch.txt:185
#, priority:100
msgid "Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For Comments\"; use this when sending an experimental patch for discussion rather than application."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:185
+#: en/git-format-patch.txt:186
#, no-wrap, priority:100
msgid "-v <n>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:186
+#: en/git-format-patch.txt:187
#, no-wrap, priority:100
msgid "--reroll-count=<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:193
+#: en/git-format-patch.txt:194
#, priority:100
msgid "Mark the series as the <n>-th iteration of the topic. The output filenames have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default, but configurable via the `--subject-prefix` option) has ` v<n>` appended to it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:194
+#: en/git-format-patch.txt:195
#, no-wrap, priority:100
msgid "--to=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:199
+#: en/git-format-patch.txt:200
#, priority:100
msgid "Add a `To:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-to` discards all `To:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:200
+#: en/git-format-patch.txt:201
#, no-wrap, priority:100
msgid "--cc=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:205
+#: en/git-format-patch.txt:206
#, priority:100
msgid "Add a `Cc:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-cc` discards all `Cc:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:206
+#: en/git-format-patch.txt:207
#, ignore-same, no-wrap, priority:100
msgid "--from"
msgstr "--from"
#. type: Labeled list
-#: en/git-format-patch.txt:207
+#: en/git-format-patch.txt:208
#, no-wrap, priority:100
msgid "--from=<ident>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:213
+#: en/git-format-patch.txt:214
#, priority:100
msgid "Use `ident` in the `From:` header of each commit email. If the author ident of the commit is not textually identical to the provided `ident`, place a `From:` header in the body of the message with the original author. If no `ident` is given, use the committer ident."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:220
+#: en/git-format-patch.txt:221
#, priority:100
msgid "Note that this option is only useful if you are actually sending the emails and want to identify yourself as the sender, but retain the original author (and `git am` will correctly pick up the in-body header). Note also that `git send-email` already handles this transformation for you, and this option should not be used if you are feeding the result to `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:221
+#: en/git-format-patch.txt:222
#, no-wrap, priority:100
msgid "--add-header=<header>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:228
+#: en/git-format-patch.txt:229
#, priority:100
msgid "Add an arbitrary header to the email headers. This is in addition to any configured headers, and may be used multiple times. For example, `--add-header=\"Organization: git-foo\"`. The negated form `--no-add-header` discards *all* (`To:`, `Cc:`, and custom) headers added so far from config or command line."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:229
+#: en/git-format-patch.txt:230
#, ignore-same, no-wrap, priority:100
msgid "--[no-]cover-letter"
msgstr "--[no-]cover-letter"
#. type: Plain text
-#: en/git-format-patch.txt:233
+#: en/git-format-patch.txt:234
#, priority:100
msgid "In addition to the patches, generate a cover letter file containing the branch description, shortlog and the overall diffstat. You can fill in a description in the file before sending it out."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:234
+#: en/git-format-patch.txt:235
#, no-wrap, priority:100
msgid "--interdiff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:242
+#: en/git-format-patch.txt:243
#, priority:100
msgid "As a reviewer aid, insert an interdiff into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` is a single revision naming the tip of the previous series which shares a common base with the series being formatted (for example `git format-patch --cover-letter --interdiff=feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:243
+#: en/git-format-patch.txt:244
#, no-wrap, priority:100
msgid "--range-diff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:254
+#: en/git-format-patch.txt:255
#, priority:100
msgid "As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1]) into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` can be a single revision naming the tip of the previous series if it shares a common base with the series being formatted (for example `git format-patch --cover-letter --range-diff=feature/v1 -3 feature/v2`), or a revision range if the two versions of the series are disjoint (for example `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:259
+#: en/git-format-patch.txt:260
#, priority:100
msgid "Note that diff options passed to the command affect how the primary product of `format-patch` is generated, and they are not passed to the underlying `range-diff` machinery used to generate the cover-letter material (this may change in the future)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:260
+#: en/git-format-patch.txt:261
#, no-wrap, priority:100
msgid "--creation-factor=<percent>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:265
+#: en/git-format-patch.txt:266
#, priority:100
msgid "Used with `--range-diff`, tweak the heuristic which matches up commits between the previous and current series of patches by adjusting the creation/deletion cost fudge factor. See linkgit:git-range-diff[1]) for details."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:266
+#: en/git-format-patch.txt:267
#, no-wrap, priority:100
msgid "--notes[=<ref>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:267 en/pretty-options.txt:81
+#: en/git-format-patch.txt:268 en/pretty-options.txt:81
#, ignore-same, no-wrap, priority:260
msgid "--no-notes"
msgstr "--no-notes"
#. type: Plain text
-#: en/git-format-patch.txt:270
+#: en/git-format-patch.txt:271
#, priority:100
msgid "Append the notes (see linkgit:git-notes[1]) for the commit after the three-dash line."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:278
+#: en/git-format-patch.txt:279
#, priority:100
msgid "The expected use case of this is to write supporting explanation for the commit that does not belong to the commit log message proper, and include it with the patch submission. While one can simply write these explanations after `format-patch` has run but before sending, keeping them as Git notes allows them to be maintained between versions of the patch series (but see the discussion of the `notes.rewrite` configuration options in linkgit:git-notes[1] to use this workflow)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:281
+#: en/git-format-patch.txt:282
#, priority:100
msgid "The default is `--no-notes`, unless the `format.notes` configuration is set."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:282
+#: en/git-format-patch.txt:283
#, no-wrap, priority:100
msgid "--[no-]signature=<signature>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:287
+#: en/git-format-patch.txt:288
#, priority:100
msgid "Add a signature to each message produced. Per RFC 3676 the signature is separated from the body by a line with '-- ' on it. If the signature option is omitted the signature defaults to the Git version number."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:288
+#: en/git-format-patch.txt:289
#, no-wrap, priority:100
msgid "--signature-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:290
+#: en/git-format-patch.txt:291
#, priority:100
msgid "Works just like --signature except the signature is read from a file."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:291
+#: en/git-format-patch.txt:292
#, no-wrap, priority:100
msgid "--suffix=.<sfx>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:296
+#: en/git-format-patch.txt:297
#, priority:100
msgid "Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is `--suffix=.txt`. Leaving this empty will remove the `.patch` suffix."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:299
+#: en/git-format-patch.txt:300
#, priority:100
msgid "Note that the leading character does not have to be a dot; for example, you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:303
+#: en/git-format-patch.txt:304
#, priority:100
msgid "Do not print the names of the generated files to standard output."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:304
+#: en/git-format-patch.txt:305
#, ignore-same, no-wrap, priority:100
msgid "--no-binary"
msgstr "--no-binary"
#. type: Plain text
-#: en/git-format-patch.txt:309
+#: en/git-format-patch.txt:310
#, priority:100
msgid "Do not output contents of changes in binary files, instead display a notice that those files changed. Patches generated using this option cannot be applied properly, but they are still useful for code review."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:310
+#: en/git-format-patch.txt:311
#, ignore-same, no-wrap, priority:100
msgid "--zero-commit"
msgstr "--zero-commit"
#. type: Plain text
-#: en/git-format-patch.txt:313
+#: en/git-format-patch.txt:314
#, priority:100
msgid "Output an all-zero hash in each patch's From header instead of the hash of the commit."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:314
+#: en/git-format-patch.txt:315
#, no-wrap, priority:100
msgid "--base=<commit>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:318
+#: en/git-format-patch.txt:320
#, priority:100
-msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details."
+msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details. If <commit> is \"auto\", a base commit is automatically chosen."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:325
+#: en/git-format-patch.txt:327
#, priority:100
msgid "Treat the revision argument as a <revision range>, even if it is just a single commit (that would normally be treated as a <since>). Note that root commits included in the specified range are always formatted as creation patches, independently of this flag."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:328
+#: en/git-format-patch.txt:330
#, priority:100
msgid "Show progress reports on stderr as patches are generated."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:335
+#: en/git-format-patch.txt:338
#, priority:100
-msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To\" or \"Cc:\" headers, configure attachments, and sign off patches with configuration variables."
+msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To:\" or \"Cc:\" headers, configure attachments, change the patch output directory, and sign off patches with configuration variables."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:347
+#: en/git-format-patch.txt:351
#, no-wrap, priority:100
msgid ""
"[format]\n"
@@ -24735,17 +25005,18 @@ msgid ""
"\tcc = <email>\n"
"\tattach [ = mime-boundary-string ]\n"
"\tsignOff = true\n"
-"\tcoverletter = auto\n"
+"\toutputDirectory = <directory>\n"
+"\tcoverLetter = auto\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:356
+#: en/git-format-patch.txt:360
#, priority:100
msgid "The patch produced by 'git format-patch' is in UNIX mailbox format, with a fixed \"magic\" time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:366
+#: en/git-format-patch.txt:370
#, no-wrap, priority:100
msgid ""
"From 8f72bad1baf19a53459661343e21d6491c3908d3 Mon Sep 17 00:00:00 2001\n"
@@ -24759,7 +25030,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:369
+#: en/git-format-patch.txt:373
#, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -24767,7 +25038,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:372
+#: en/git-format-patch.txt:376
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"Do the same for ia64 so we can have sleek & trim looking\n"
@@ -24775,19 +25046,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:380
+#: en/git-format-patch.txt:384
#, ignore-ellipsis, priority:100
msgid "Typically it will be placed in a MUA's drafts folder, edited to add timely commentary that should not go in the changelog after the three dashes, and then sent as a message whose body, in our example, starts with \"arch/arm config files were...\". On the receiving end, readers can save interesting patches in a UNIX mailbox and apply them with linkgit:git-am[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:386
+#: en/git-format-patch.txt:390
#, priority:100
msgid "When a patch is part of an ongoing discussion, the patch generated by 'git format-patch' can be tweaked to take advantage of the 'git am --scissors' feature. After your response to the discussion comes a line that consists solely of \"`-- >8 --`\" (scissors and perforation), followed by the patch with unnecessary header fields removed:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:390
+#: en/git-format-patch.txt:394
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"...\n"
@@ -24795,21 +25066,21 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:392
+#: en/git-format-patch.txt:396
#, no-wrap, priority:100
msgid "Makes sense to me. How about this patch?\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:395
+#: en/git-format-patch.txt:399
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-Knig diet\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:398
+#: en/git-format-patch.txt:402
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -24817,61 +25088,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:406
+#: en/git-format-patch.txt:410
#, priority:100
msgid "When sending a patch this way, most often you are sending your own patch, so in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit `From:` and `Date:` lines from the patch file. The patch title is likely to be different from the subject of the discussion the patch is in response to, so it is likely that you would want to keep the Subject: line, like the example above."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:408
+#: en/git-format-patch.txt:412
#, no-wrap, priority:100
msgid "Checking for patch corruption"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:411
+#: en/git-format-patch.txt:415
#, priority:100
msgid "Many mailers if not set up properly will corrupt whitespace. Here are two common types of corruption:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:413
+#: en/git-format-patch.txt:417
#, priority:100
msgid "Empty context lines that do not have _any_ whitespace."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:416
+#: en/git-format-patch.txt:420
#, priority:100
msgid "Non-empty context lines that have one extra whitespace at the beginning."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:418
+#: en/git-format-patch.txt:422
#, priority:100
msgid "One way to test if your MUA is set up correctly is:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:422
+#: en/git-format-patch.txt:426
#, priority:100
msgid "Send the patch to yourself, exactly the way you would, except with To: and Cc: lines that do not contain the list and maintainer address."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:425
+#: en/git-format-patch.txt:429
#, priority:100
msgid "Save that patch to a file in UNIX mailbox format. Call it a.patch, say."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:427
+#: en/git-format-patch.txt:431
#, priority:100
msgid "Apply it:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:432
+#: en/git-format-patch.txt:436
#, no-wrap, priority:100
msgid ""
"$ git fetch <project> master:test-apply\n"
@@ -24881,175 +25152,175 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:434
+#: en/git-format-patch.txt:438
#, priority:100
msgid "If it does not apply correctly, there can be various reasons."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:439
+#: en/git-format-patch.txt:443
#, priority:100
msgid "The patch itself does not apply cleanly. That is _bad_ but does not have much to do with your MUA. You might want to rebase the patch with linkgit:git-rebase[1] before regenerating it in this case."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:444
+#: en/git-format-patch.txt:448
#, priority:100
msgid "The MUA corrupted your patch; \"am\" would complain that the patch does not apply. Look in the .git/rebase-apply/ subdirectory and see what 'patch' file contains and check for the common corruption patterns mentioned above."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:452
+#: en/git-format-patch.txt:456
#, priority:100
msgid "While at it, check the 'info' and 'final-commit' files as well. If what is in 'final-commit' is not exactly what you would want to see in the commit log message, it is very likely that the receiver would end up hand editing the log message when applying your patch. Things like \"Hi, this is my first patch.\\n\" in the patch e-mail should come after the three-dash line that signals the end of the commit message."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:454
+#: en/git-format-patch.txt:458
#, no-wrap, priority:100
msgid "MUA-SPECIFIC HINTS"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:457
+#: en/git-format-patch.txt:461
#, priority:100
msgid "Here are some hints on how to successfully submit patches inline using various mailers."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:459
+#: en/git-format-patch.txt:463
#, no-wrap, priority:100
msgid "GMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:465
+#: en/git-format-patch.txt:469
#, priority:100
msgid "GMail does not have any way to turn off line wrapping in the web interface, so it will mangle any emails that you send. You can however use \"git send-email\" and send your patches through the GMail SMTP server, or use any IMAP email client to connect to the google IMAP server and forward the emails through that."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:468
+#: en/git-format-patch.txt:472
#, priority:100
msgid "For hints on using 'git send-email' to send your patches through the GMail SMTP server, see the EXAMPLE section of linkgit:git-send-email[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:471
+#: en/git-format-patch.txt:475
#, priority:100
msgid "For hints on submission using the IMAP interface, see the EXAMPLE section of linkgit:git-imap-send[1]."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:473
+#: en/git-format-patch.txt:477
#, no-wrap, priority:100
msgid "Thunderbird"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:477
+#: en/git-format-patch.txt:481
#, priority:100
msgid "By default, Thunderbird will both wrap emails as well as flag them as being 'format=flowed', both of which will make the resulting email unusable by Git."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:481
+#: en/git-format-patch.txt:485
#, priority:100
msgid "There are three different approaches: use an add-on to turn off line wraps, configure Thunderbird to not mangle patches, or use an external editor to keep Thunderbird from mangling the patches."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:483
+#: en/git-format-patch.txt:487
#, no-wrap, priority:100
msgid "Approach #1 (add-on)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:491
+#: en/git-format-patch.txt:495
#, priority:100
msgid "Install the Toggle Word Wrap add-on that is available from https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you can tick off. Now you can compose the message as you otherwise do (cut + paste, 'git format-patch' | 'git imap-send', etc), but you have to insert line breaks manually in any text that you type."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:493
+#: en/git-format-patch.txt:497
#, no-wrap, priority:100
msgid "Approach #2 (configuration)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:495
+#: en/git-format-patch.txt:499
#, priority:100
msgid "Three steps:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:499
+#: en/git-format-patch.txt:503
#, ignore-ellipsis, priority:100
msgid "Configure your mail server composition as plain text: Edit...Account Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:501
+#: en/git-format-patch.txt:505
#, priority:100
msgid "Configure your general composition window to not wrap."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:504
+#: en/git-format-patch.txt:508
#, priority:100
msgid "In Thunderbird 2: Edit..Preferences..Composition, wrap plain text messages at 0"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:510
+#: en/git-format-patch.txt:514
#, priority:100
msgid "In Thunderbird 3: Edit..Preferences..Advanced..Config Editor. Search for \"mail.wrap_long_lines\". Toggle it to make sure it is set to `false`. Also, search for \"mailnews.wraplength\" and set the value to 0."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:515
+#: en/git-format-patch.txt:519
#, priority:100
msgid "Disable the use of format=flowed: Edit..Preferences..Advanced..Config Editor. Search for \"mailnews.send_plaintext_flowed\". Toggle it to make sure it is set to `false`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:519
+#: en/git-format-patch.txt:523
#, priority:100
msgid "After that is done, you should be able to compose email as you otherwise would (cut + paste, 'git format-patch' | 'git imap-send', etc), and the patches will not be mangled."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:521
+#: en/git-format-patch.txt:525
#, no-wrap, priority:100
msgid "Approach #3 (external editor)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:526
+#: en/git-format-patch.txt:530
#, priority:100
msgid "The following Thunderbird extensions are needed: AboutConfig from http://aboutconfig.mozdev.org/ and External Editor from http://globs.org/articles.php?lng=en&pg=8"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:528
+#: en/git-format-patch.txt:532
#, priority:100
msgid "Prepare the patch as a text file using your method of choice."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:533
+#: en/git-format-patch.txt:537
#, priority:100
msgid "Before opening a compose window, use Edit->Account Settings to uncheck the \"Compose messages in HTML format\" setting in the \"Composition & Addressing\" panel of the account to be used to send the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:537
+#: en/git-format-patch.txt:541
#, priority:100
msgid "In the main Thunderbird window, 'before' you open the compose window for the patch, use Tools->about:config to set the following to the indicated values:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:541
+#: en/git-format-patch.txt:545
#, no-wrap, priority:100
msgid ""
"\tmailnews.send_plaintext_flowed => false\n"
@@ -25057,25 +25328,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:544
+#: en/git-format-patch.txt:548
#, priority:100
msgid "Open a compose window and click the external editor icon."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:547
+#: en/git-format-patch.txt:551
#, priority:100
msgid "In the external editor window, read in the patch file and exit the editor normally."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:550
+#: en/git-format-patch.txt:554
#, priority:100
msgid "Side note: it may be possible to do step 2 with about:config and the following settings but no one's tried yet."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:555
+#: en/git-format-patch.txt:559
#, no-wrap, priority:100
msgid ""
"\tmail.html_compose => false\n"
@@ -25084,91 +25355,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:560
+#: en/git-format-patch.txt:564
#, priority:100
msgid "There is a script in contrib/thunderbird-patch-inline which can help you include patches with Thunderbird in an easy way. To use it, do the steps above and then use the script as the external editor."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:562
+#: en/git-format-patch.txt:566
#, no-wrap, priority:100
msgid "KMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:564
+#: en/git-format-patch.txt:568
#, priority:100
msgid "This should help you to submit patches inline using KMail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:566
+#: en/git-format-patch.txt:570
#, priority:100
msgid "Prepare the patch as a text file."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:568
+#: en/git-format-patch.txt:572
#, priority:100
msgid "Click on New Mail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:571
+#: en/git-format-patch.txt:575
#, priority:100
msgid "Go under \"Options\" in the Composer window and be sure that \"Word wrap\" is not set."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:573
+#: en/git-format-patch.txt:577
#, ignore-ellipsis, priority:100
msgid "Use Message -> Insert file... and insert the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:576
+#: en/git-format-patch.txt:580
#, priority:100
msgid "Back in the compose window: add whatever other text you wish to the message, complete the addressing and subject fields, and press send."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:578
+#: en/git-format-patch.txt:582
#, no-wrap, priority:100
msgid "BASE TREE INFORMATION"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:587
+#: en/git-format-patch.txt:591
#, priority:100
msgid "The base tree information block is used for maintainers or third party testers to know the exact state the patch series applies to. It consists of the 'base commit', which is a well-known commit that is part of the stable part of the project history everybody else works off of, and zero or more 'prerequisite patches', which are well-known patches in flight that is not yet part of the 'base commit' that need to be applied on top of 'base commit' in topological order before the patches can be applied."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:593
+#: en/git-format-patch.txt:597
#, priority:100
msgid "The 'base commit' is shown as \"base-commit: \" followed by the 40-hex of the commit object name. A 'prerequisite patch' is shown as \"prerequisite-patch-id: \" followed by the 40-hex 'patch id', which can be obtained by passing the patch through the `git patch-id --stable` command."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:597
+#: en/git-format-patch.txt:601
#, priority:100
msgid "Imagine that on top of the public commit P, you applied well-known patches X, Y and Z from somebody else, and then built your three-patch series A, B, C, the history would be like:"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:600
+#: en/git-format-patch.txt:604
#, no-wrap, priority:100
msgid "---P---X---Y---Z---A---B---C\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:607
+#: en/git-format-patch.txt:611
#, priority:100
msgid "With `git format-patch --base=P -3 C` (or variants thereof, e.g. with `--cover-letter` or using `Z..C` instead of `-3 C` to specify the range), the base tree information block is shown at the end of the first message the command outputs (either the first patch, or the cover letter), like this:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:613
+#: en/git-format-patch.txt:617
#, no-wrap, priority:100
msgid ""
"base-commit: P\n"
@@ -25178,13 +25449,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:616
+#: en/git-format-patch.txt:620
#, priority:100
msgid "For non-linear topology, such as"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:621
+#: en/git-format-patch.txt:625
#, no-wrap, priority:100
msgid ""
"---P---X---A---M---C\n"
@@ -25193,91 +25464,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:626
+#: en/git-format-patch.txt:630
#, priority:100
msgid "You can also use `git format-patch --base=P -3 C` to generate patches for A, B and C, and the identifiers for P, X, Y, Z are appended at the end of the first message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:632
+#: en/git-format-patch.txt:636
#, priority:100
msgid "If set `--base=auto` in cmdline, it will track base commit automatically, the base commit will be the merge base of tip commit of the remote-tracking branch and revision-range specified in cmdline. For a local branch, you need to track a remote branch by `git branch --set-upstream-to` before using this option."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:638
+#: en/git-format-patch.txt:642
#, priority:100
msgid "Extract commits between revisions R1 and R2, and apply them on top of the current branch using 'git am' to cherry-pick them:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:641
+#: en/git-format-patch.txt:645
#, no-wrap, priority:100
msgid "$ git format-patch -k --stdout R1..R2 | git am -3 -k\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:645
+#: en/git-format-patch.txt:649
#, priority:100
msgid "Extract all commits which are in the current branch but not in the origin branch:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:648
+#: en/git-format-patch.txt:652
#, no-wrap, priority:100
msgid "$ git format-patch origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:651
+#: en/git-format-patch.txt:655
#, priority:100
msgid "For each commit a separate file is created in the current directory."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:654
+#: en/git-format-patch.txt:658
#, priority:100
msgid "Extract all commits that lead to 'origin' since the inception of the project:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:657
+#: en/git-format-patch.txt:661
#, no-wrap, priority:100
msgid "$ git format-patch --root origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:660
+#: en/git-format-patch.txt:664
#, priority:100
msgid "The same as the previous one:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:663
+#: en/git-format-patch.txt:667
#, no-wrap, priority:100
msgid "$ git format-patch -M -B origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:670
+#: en/git-format-patch.txt:674
#, priority:100
msgid "Additionally, it detects and handles renames and complete rewrites intelligently to produce a renaming patch. A renaming patch reduces the amount of text output, and generally makes it easier to review. Note that non-Git \"patch\" programs won't understand renaming patches, so use it only when you know the recipient uses Git to apply your patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:673
+#: en/git-format-patch.txt:677
#, priority:100
msgid "Extract three topmost commits from the current branch and format them as e-mailable patches:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:676
+#: en/git-format-patch.txt:680
#, no-wrap, priority:100
msgid "$ git format-patch -3\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:681
+#: en/git-format-patch.txt:685
#, ignore-same, priority:100
msgid "linkgit:git-am[1], linkgit:git-send-email[1]"
msgstr "linkgit:git-am[1], linkgit:git-send-email[1]"
@@ -25773,43 +26044,43 @@ msgid "The below documentation is the same as what's found in linkgit:git-config
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:127
+#: en/git-gc.txt:126
#, priority:100
-msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, refs saved by 'git filter-branch' in refs/original/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
+msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, notes saved by 'git notes' under refs/notes/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:134
+#: en/git-gc.txt:133
#, priority:100
msgid "On the other hand, when 'git gc' runs concurrently with another process, there is a risk of it deleting an object that the other process is using but hasn't created a reference to. This may just cause the other process to fail or may corrupt the repository if the other process later adds a reference to the deleted object. Git has two features that significantly mitigate this problem:"
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:137
+#: en/git-gc.txt:136
#, priority:100
msgid "Any object with modification time newer than the `--prune` date is kept, along with everything reachable from it."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:141
+#: en/git-gc.txt:140
#, priority:100
msgid "Most operations that add an object to the database update the modification time of the object if it is already present so that #1 applies."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:145
+#: en/git-gc.txt:144
#, priority:100
msgid "However, these features fall short of a complete solution, so users who run commands concurrently have to live with some risk of corruption (which seems to be low in practice)."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:151
+#: en/git-gc.txt:150
#, priority:100
msgid "The 'git gc --auto' command will run the 'pre-auto-gc' hook. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:159
+#: en/git-gc.txt:158
#, ignore-same, priority:100
msgid "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
msgstr "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
@@ -26075,7 +26346,7 @@ msgid "For each <pathspec> given on command line, descend at most <depth> levels
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:399
+#: en/git-grep.txt:128 en/git-submodule.txt:400
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
@@ -26291,7 +26562,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:951
+#: en/git-grep.txt:217 en/rev-list-options.txt:967
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -26441,127 +26712,151 @@ msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:280
+#: en/git-grep.txt:277
+#, priority:100
+msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:282
+#, priority:100
+msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:287
+#, priority:100
+msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:291
+#, priority:100
+msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:297
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:281
+#: en/git-grep.txt:298
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:282
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:283 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:284
+#: en/git-grep.txt:301
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:289
+#: en/git-grep.txt:306
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:290 en/rev-list-options.txt:65
+#: en/git-grep.txt:307 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:294
+#: en/git-grep.txt:311
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:299
+#: en/git-grep.txt:316
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:300
+#: en/git-grep.txt:317
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:303
+#: en/git-grep.txt:320
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:307
+#: en/git-grep.txt:324
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:328
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:318
+#: en/git-grep.txt:335
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:321
+#: en/git-grep.txt:338
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:322
+#: en/git-grep.txt:339
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:325
+#: en/git-grep.txt:342
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:326
+#: en/git-grep.txt:343
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:329
+#: en/git-grep.txt:346
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:330
+#: en/git-grep.txt:347
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:332
+#: en/git-grep.txt:349
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
@@ -26779,25 +27074,13 @@ msgstr ""
#. type: Plain text
#: en/git-gui.txt:116
#, priority:100
-msgid "A 'git gui' development repository can be obtained from:"
+msgid "The official repository of the 'git gui' project can be found at:"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:118
#, no-wrap, priority:100
-msgid " git clone git://repo.or.cz/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:122
-#, no-wrap, priority:100
-msgid " git clone http://repo.or.cz/r/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:124
-#, priority:100
-msgid "or browsed online at http://repo.or.cz/w/git-gui.git/[]."
+msgid " https://github.com/prati0100/git-gui.git/\n"
msgstr ""
#. type: Title =
@@ -30409,29 +30692,29 @@ msgstr ""
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
-#. type: Plain text
-#: en/git-ls-remote.txt:110
+#. type: delimited block -
+#: en/git-ls-remote.txt:111
#, no-wrap, priority:100
msgid ""
-"\t$ git ls-remote --tags ./.\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"\t$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
-"\t5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"\tc781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
-"\t$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
-"\t$ git ls-remote --tags korg v\\*\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"$ git ls-remote --tags ./.\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
+"$ git ls-remote --tags korg v\\*\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:114
+#: en/git-ls-remote.txt:116
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -30939,7 +31222,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:358
+#: en/git-merge-base.txt:60 en/git-rebase.txt:376
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -30968,235 +31251,235 @@ msgstr ""
msgid "For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:86
+#. type: delimited block .
+#: en/git-merge-base.txt:87
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---B\n"
-"\t /\n"
-"\t---o---1---o---o---o---A\n"
+"\t o---o---o---B\n"
+"\t/\n"
+"---o---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:88
+#: en/git-merge-base.txt:90
#, priority:100
msgid "the merge base between 'A' and 'B' is '1'."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:92
+#: en/git-merge-base.txt:94
#, priority:100
msgid "Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the merge base between 'A' and a hypothetical commit 'M', which is a merge between 'B' and 'C'. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:98
+#. type: delimited block .
+#: en/git-merge-base.txt:101
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---C\n"
-"\t /\n"
-"\t / o---o---o---B\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---C\n"
+" /\n"
+" / o---o---o---B\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:101
+#: en/git-merge-base.txt:105
#, priority:100
msgid "the result of `git merge-base A B C` is '1'. This is because the equivalent topology with a merge commit 'M' between 'B' and 'C' is:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:108
+#. type: delimited block .
+#: en/git-merge-base.txt:113
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---o\n"
-"\t / \\\n"
-"\t / o---o---o---o---M\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---o\n"
+" / \\\n"
+" / o---o---o---o---M\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:112
+#: en/git-merge-base.txt:118
#, priority:100
msgid "and the result of `git merge-base A M` is '1'. Commit '2' is also a common ancestor between 'A' and 'M', but '1' is a better common ancestor, because '2' is an ancestor of '1'. Hence, '2' is not a merge base."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:115
+#: en/git-merge-base.txt:121
#, priority:100
msgid "The result of `git merge-base --octopus A B C` is '2', because '2' is the best common ancestor of all commits."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:118
+#: en/git-merge-base.txt:124
#, priority:100
msgid "When the history involves criss-cross merges, there can be more than one 'best' common ancestor for two commits. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:124
+#. type: delimited block .
+#: en/git-merge-base.txt:131
#, no-wrap, priority:100
msgid ""
-"\t---1---o---A\n"
-"\t \\ /\n"
-"\t X\n"
-"\t / \\\n"
-"\t---2---o---o---B\n"
+"---1---o---A\n"
+" \\ /\n"
+" X\n"
+" / \\\n"
+"---2---o---o---B\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:128
+#: en/git-merge-base.txt:136
#, priority:100
msgid "both '1' and '2' are merge-bases of A and B. Neither one is better than the other (both are 'best' merge bases). When the `--all` option is not given, it is unspecified which best one is output."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:133
+#: en/git-merge-base.txt:141
#, priority:100
msgid "A common idiom to check \"fast-forward-ness\" between two commits A and B is (or at least used to be) to compute the merge base between A and B, and check if it is the same as A, in which case, A is an ancestor of B. You will see this idiom used often in older scripts."
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:139
+#. type: delimited block .
+#: en/git-merge-base.txt:148
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tA=$(git rev-parse --verify A)\n"
-"\tif test \"$A\" = \"$(git merge-base A B)\"\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"A=$(git rev-parse --verify A)\n"
+"if test \"$A\" = \"$(git merge-base A B)\"\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:141
+#: en/git-merge-base.txt:151
#, priority:100
msgid "In modern git, you can say this in a more direct way:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:146
+#. type: delimited block .
+#: en/git-merge-base.txt:157
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tif git merge-base --is-ancestor A B\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"if git merge-base --is-ancestor A B\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:148
+#: en/git-merge-base.txt:160
#, priority:100
msgid "instead."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:150
+#: en/git-merge-base.txt:162
#, no-wrap, priority:100
msgid "Discussion on fork-point mode"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:156
+#: en/git-merge-base.txt:168
#, priority:100
msgid "After working on the `topic` branch created with `git switch -c topic origin/master`, the history of remote-tracking branch `origin/master` may have been rewound and rebuilt, leading to a history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:164
+#. type: delimited block .
+#: en/git-merge-base.txt:177
#, no-wrap, priority:100
msgid ""
-"\t o---B2\n"
-"\t /\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t \\\n"
-"\t B0\n"
-"\t \\\n"
-"\t D0---D1---D (topic)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\\n"
+"\t B0\n"
+"\t \\\n"
+"\t D0---D1---D (topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:170
+#: en/git-merge-base.txt:184
#, priority:100
msgid "where `origin/master` used to point at commits B0, B1, B2 and now it points at B, and your `topic` branch was started on top of it back when `origin/master` was at B0, and you built three commits, D0, D1, and D, on top of it. Imagine that you now want to rebase the work you did on the topic on top of the updated origin/master."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:176
+#: en/git-merge-base.txt:190
#, priority:100
msgid "In such a case, `git merge-base origin/master topic` would return the parent of B0 in the above picture, but B0^..D is *not* the range of commits you would want to replay on top of B (it includes B0, which is not what you wrote; it is a commit the other side discarded when it moved its tip from B0 to B1)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:184
+#: en/git-merge-base.txt:198
#, priority:100
msgid "`git merge-base --fork-point origin/master topic` is designed to help in such a case. It takes not only B but also B0, B1, and B2 (i.e. old tips of the remote-tracking branches your repository's reflog knows about) into account to see on which commit your topic branch was built and finds B0, allowing you to replay only the commits on your topic, excluding the commits the other side later discarded."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:186
+#: en/git-merge-base.txt:200
#, priority:100
msgid "Hence"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:188
+#: en/git-merge-base.txt:202
#, no-wrap, priority:100
msgid " $ fork_point=$(git merge-base --fork-point origin/master topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:190
+#: en/git-merge-base.txt:204
#, priority:100
msgid "will find B0, and"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:192
+#: en/git-merge-base.txt:206
#, no-wrap, priority:100
msgid " $ git rebase --onto origin/master $fork_point topic\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:195
+#: en/git-merge-base.txt:209
#, priority:100
msgid "will replay D0, D1 and D on top of B to create a new history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:203
+#. type: delimited block .
+#: en/git-merge-base.txt:218
#, no-wrap, priority:100
msgid ""
-"\t\t\t o---B2\n"
-"\t\t\t/\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t\t\\ \\\n"
-"\t\t B0 D0'--D1'--D' (topic - updated)\n"
-"\t\t \\\n"
-"\t\t D0---D1---D (topic - old)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\ \\\n"
+"\t B0 D0'--D1'--D' (topic - updated)\n"
+"\t \\\n"
+"\t D0---D1---D (topic - old)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:210
+#: en/git-merge-base.txt:226
#, priority:100
msgid "A caveat is that older reflog entries in your repository may be expired by `git gc`. If B0 no longer appears in the reflog of the remote-tracking branch `origin/master`, the `--fork-point` mode obviously cannot find it and fails, avoiding to give a random and useless result (such as the parent of B0, like the same command without the `--fork-point` option gives)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:221
+#: en/git-merge-base.txt:237
#, priority:100
msgid "Also, the remote-tracking branch you use the `--fork-point` mode with must be the one your topic forked from its tip. If you forked from an older commit than the tip, this mode would not find the fork point (imagine in the above sample history B0 did not exist, origin/master started at B1, moved to B2 and then B, and you forked your topic at origin/master^ when origin/master was B1; the shape of the history would be the same as above, without B0, and the parent of B1 is what `git merge-base origin/master topic` correctly finds, but the `--fork-point` mode will not, because it is not one of the commits that used to be at the tip of origin/master)."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:224
+#: en/git-merge-base.txt:240
#, no-wrap, priority:100
msgid "See also"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:228
+#: en/git-merge-base.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
msgstr "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
@@ -31407,31 +31690,31 @@ msgstr ""
msgid "Examples:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:62
+#. type: delimited block -
+#: en/git-merge-index.txt:63
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
-" This is MM from the original tree.\t\t\t# original\n"
-" This is modified MM in the branch A.\t\t\t# merge1\n"
-" This is modified MM in the branch B.\t\t\t# merge2\n"
-" This is modified MM in the branch B.\t\t\t# current contents\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
+"This is MM from the original tree.\t\t# original\n"
+"This is modified MM in the branch A.\t\t# merge1\n"
+"This is modified MM in the branch B.\t\t# merge2\n"
+"This is modified MM in the branch B.\t\t# current contents\n"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:71
+#. type: delimited block -
+#: en/git-merge-index.txt:74
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
-" cat: : No such file or directory\n"
-" This is added AA in the branch A.\n"
-" This is added AA in the branch B.\n"
-" This is added AA in the branch B.\n"
-" fatal: merge program failed\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
+"cat: : No such file or directory\n"
+"This is added AA in the branch A.\n"
+"This is added AA in the branch B.\n"
+"This is added AA in the branch B.\n"
+"fatal: merge program failed\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-index.txt:76
+#: en/git-merge-index.txt:80
#, priority:100
msgid "where the latter example shows how 'git merge-index' will stop trying to merge once anything has returned an error (i.e., `cat` returned an error for the AA file, because it didn't exist in the original, and thus 'git merge-index' didn't even try to merge the MM thing)."
msgstr ""
@@ -31729,7 +32012,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n"
-"\t[-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
+"\t[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
"\t[--[no-]allow-unrelated-histories]\n"
"\t[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]\n"
"'git merge' (--continue | --abort | --quit)\n"
@@ -32810,7 +33093,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:281 en/merge-options.txt:108
+#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -33790,7 +34073,7 @@ msgid "Conflicts can occur when applying a commit to p4. When this happens, the
msgstr ""
#. type: Labeled list
-#: en/git-p4.txt:359 en/git-submodule.txt:270
+#: en/git-p4.txt:359 en/git-submodule.txt:271
#, no-wrap, priority:220
msgid "--branch <branch>"
msgstr ""
@@ -34926,7 +35209,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:263 en/rev-list-options.txt:760
+#: en/git-pack-objects.txt:263 en/rev-list-options.txt:776
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -34938,13 +35221,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:266 en/rev-list-options.txt:767
+#: en/git-pack-objects.txt:266 en/rev-list-options.txt:783
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:269 en/rev-list-options.txt:770
+#: en/git-pack-objects.txt:269 en/rev-list-options.txt:786
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -34956,7 +35239,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:276 en/rev-list-options.txt:777
+#: en/git-pack-objects.txt:276 en/rev-list-options.txt:793
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -34968,7 +35251,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:281 en/rev-list-options.txt:785
+#: en/git-pack-objects.txt:281 en/rev-list-options.txt:801
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -35727,13 +36010,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:502
+#: en/git-pull.txt:136 en/git-rebase.txt:524
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:503
+#: en/git-pull.txt:137 en/git-rebase.txt:525
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -37526,8 +37809,8 @@ msgstr ""
#: en/git-rebase.txt:16
#, no-wrap, priority:100
msgid ""
-"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
-"\t[<upstream> [<branch>]]\n"
+"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>]\n"
+"\t[--onto <newbase> | --keep-base] [<upstream> [<branch>]]\n"
"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
"\t--root [<branch>]\n"
"'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch)\n"
@@ -37846,512 +38129,542 @@ msgstr ""
msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:220
+#, ignore-same, no-wrap, priority:100
+msgid "--keep-base"
+msgstr "--keep-base"
+
#. type: Plain text
-#: en/git-rebase.txt:224
+#: en/git-rebase.txt:225
+#, ignore-ellipsis, priority:100
+msgid "Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running 'git rebase --keep-base <upstream> <branch>' is equivalent to running 'git rebase --onto <upstream>... <upstream>'."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:230
+#, priority:100
+msgid "This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:235
+#, priority:100
+msgid "Although both this option and --fork-point find the merge base between <upstream> and <branch>, this option uses the merge base as the _starting point_ on which new commits will be created, whereas --fork-point uses the merge base to determine the _set of commits_ which will be rebased."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#, priority:100
+msgid "See also INCOMPATIBLE OPTIONS below."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:242
#, priority:100
msgid "Upstream branch to compare against. May be any valid commit, not just an existing branch name. Defaults to the configured upstream for the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:230
+#: en/git-rebase.txt:248
#, priority:100
msgid "Restart the rebasing process after having resolved a merge conflict."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237
+#: en/git-rebase.txt:255
#, priority:100
msgid "Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:242
+#: en/git-rebase.txt:260
#, priority:100
msgid "Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:243 en/git-rebase.txt:538
+#: en/git-rebase.txt:261 en/git-rebase.txt:560
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:246
+#: en/git-rebase.txt:264
#, priority:100
msgid "Keep the commits that do not change anything from its parents in the result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:248 en/git-rebase.txt:255 en/git-rebase.txt:280 en/git-rebase.txt:293 en/git-rebase.txt:302 en/git-rebase.txt:344 en/git-rebase.txt:379 en/git-rebase.txt:386 en/git-rebase.txt:393 en/git-rebase.txt:405 en/git-rebase.txt:445 en/git-rebase.txt:470 en/git-rebase.txt:482 en/git-rebase.txt:501
-#, priority:100
-msgid "See also INCOMPATIBLE OPTIONS below."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rebase.txt:253
+#: en/git-rebase.txt:271
#, priority:100
msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:258
+#: en/git-rebase.txt:276
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:259 en/git-rebase.txt:539
+#: en/git-rebase.txt:277 en/git-rebase.txt:561
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:261
+#: en/git-rebase.txt:279
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:266
+#: en/git-rebase.txt:284
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:272
+#: en/git-rebase.txt:290
#, priority:100
msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:278
+#: en/git-rebase.txt:296
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:286
+#: en/git-rebase.txt:304
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:291
+#: en/git-rebase.txt:309
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:294
+#: en/git-rebase.txt:312
#, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:295
+#: en/git-rebase.txt:313
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:300
+#: en/git-rebase.txt:318
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:317
+#: en/git-rebase.txt:335
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:321
+#: en/git-rebase.txt:339
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:325
+#: en/git-rebase.txt:343
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:329
+#: en/git-rebase.txt:347
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:332
+#: en/git-rebase.txt:350
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:333 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:336
+#: en/git-rebase.txt:354
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:345 en/merge-options.txt:47
+#: en/git-rebase.txt:363 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:346
+#: en/git-rebase.txt:364
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:351
+#: en/git-rebase.txt:369
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:357
+#: en/git-rebase.txt:375
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:359
+#: en/git-rebase.txt:377
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:363
+#: en/git-rebase.txt:381
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:387
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:372
+#: en/git-rebase.txt:390
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:394
+#, priority:100
+msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:399
#, priority:100
msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:384
+#: en/git-rebase.txt:406
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:391
+#: en/git-rebase.txt:413
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:421
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:403
+#: en/git-rebase.txt:425
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:407
+#: en/git-rebase.txt:429
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:415
+#: en/git-rebase.txt:437
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:422
+#: en/git-rebase.txt:444
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:426
+#: en/git-rebase.txt:448
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges`, but in contrast to that option works well in interactive rebases: commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:430
+#: en/git-rebase.txt:452
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:432
+#: en/git-rebase.txt:454
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:434 en/git-rebase.txt:535 en/git-svn.txt:680
+#: en/git-rebase.txt:456 en/git-rebase.txt:557 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:439
+#: en/git-rebase.txt:461
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:443
+#: en/git-rebase.txt:465
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:446
+#: en/git-rebase.txt:468
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:447
+#: en/git-rebase.txt:469
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:474
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:455
+#: en/git-rebase.txt:477
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:457
+#: en/git-rebase.txt:479
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:459
+#: en/git-rebase.txt:481
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:483
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:487
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:490
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:480
+#: en/git-rebase.txt:502
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:505
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:484
+#: en/git-rebase.txt:506
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:495
+#: en/git-rebase.txt:517
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:499
+#: en/git-rebase.txt:521
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:509
+#: en/git-rebase.txt:531
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:510
+#: en/git-rebase.txt:532
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:511
+#: en/git-rebase.txt:533
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:514
+#: en/git-rebase.txt:536
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:516
+#: en/git-rebase.txt:538
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:519
+#: en/git-rebase.txt:541
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:523
+#: en/git-rebase.txt:545
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:527
+#: en/git-rebase.txt:549
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:530
+#: en/git-rebase.txt:552
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:553
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:555
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Plain text
-#: en/git-rebase.txt:534
+#: en/git-rebase.txt:556
#, ignore-same, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:537
+#: en/git-rebase.txt:559
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:540
+#: en/git-rebase.txt:562
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:542
+#: en/git-rebase.txt:564
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:544
+#: en/git-rebase.txt:566
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:567
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:546
+#: en/git-rebase.txt:568
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:547
+#: en/git-rebase.txt:569
#, priority:100
-msgid "--rebase-merges and --strategy"
+msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:548
+#: en/git-rebase.txt:570
#, priority:100
-msgid "--rebase-merges and --strategy-option"
+msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:550
+#: en/git-rebase.txt:572
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:575
#, no-wrap, priority:100
msgid "There are some subtle differences how the backends behave.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:556
+#: en/git-rebase.txt:578
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38359,7 +38672,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:561
+#: en/git-rebase.txt:583
#, no-wrap, priority:100
msgid ""
"The am backend drops any \"empty\" commits, regardless of whether the\n"
@@ -38369,7 +38682,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:588
#, no-wrap, priority:100
msgid ""
"The interactive backend drops commits by default that\n"
@@ -38379,7 +38692,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:591
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38387,7 +38700,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:573
+#: en/git-rebase.txt:595
#, no-wrap, priority:100
msgid ""
"Directory rename heuristics are enabled in the merge and interactive\n"
@@ -38396,145 +38709,145 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:597
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:577
+#: en/git-rebase.txt:599
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:582
+#: en/git-rebase.txt:604
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:587
+#: en/git-rebase.txt:609
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:589
+#: en/git-rebase.txt:611
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:596
+#: en/git-rebase.txt:618
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:598
+#: en/git-rebase.txt:620
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:600
+#: en/git-rebase.txt:622
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:601
+#: en/git-rebase.txt:623
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:602
+#: en/git-rebase.txt:624
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:603
+#: en/git-rebase.txt:625
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:605
+#: en/git-rebase.txt:627
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:607
+#: en/git-rebase.txt:629
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:631
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:610
+#: en/git-rebase.txt:632
#, priority:100
msgid "commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:612
+#: en/git-rebase.txt:634
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:614
+#: en/git-rebase.txt:636
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:615
+#: en/git-rebase.txt:637
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:616
+#: en/git-rebase.txt:638
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:644
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:646
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:626
+#: en/git-rebase.txt:648
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:653
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:658
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -38543,73 +38856,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:641
+#: en/git-rebase.txt:663
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:668
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:649
+#: en/git-rebase.txt:671
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:652
+#: en/git-rebase.txt:674
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:655
+#: en/git-rebase.txt:677
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:685
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:667
+#: en/git-rebase.txt:689
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:693
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:696
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:699
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:680
+#: en/git-rebase.txt:702
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:687
+#: en/git-rebase.txt:709
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -38620,25 +38933,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:691
+#: en/git-rebase.txt:713
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:694
+#: en/git-rebase.txt:716
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:701
+#: en/git-rebase.txt:723
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:710
+#: en/git-rebase.txt:732
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -38651,31 +38964,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:715
+#: en/git-rebase.txt:737
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:720
+#: en/git-rebase.txt:742
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:745
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:727
+#: en/git-rebase.txt:749
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:759
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -38689,85 +39002,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:740
+#: en/git-rebase.txt:762
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:746
+#: en/git-rebase.txt:768
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:750
+#: en/git-rebase.txt:772
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:752
+#: en/git-rebase.txt:774
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:756
+#: en/git-rebase.txt:778
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:760
+#: en/git-rebase.txt:782
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:763
+#: en/git-rebase.txt:785
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:765
+#: en/git-rebase.txt:787
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:767
+#: en/git-rebase.txt:789
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:794
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:775
+#: en/git-rebase.txt:797
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:804
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:809
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:816
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38778,13 +39091,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:819
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:826
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38795,13 +39108,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:808
+#: en/git-rebase.txt:830
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:815
+#: en/git-rebase.txt:837
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38812,73 +39125,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:822
+#: en/git-rebase.txt:844
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:824
+#: en/git-rebase.txt:846
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:825
+#: en/git-rebase.txt:847
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:829
+#: en/git-rebase.txt:851
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:836
+#: en/git-rebase.txt:859
#, priority:100
-msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or `filter-branch`."
+msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:839
+#: en/git-rebase.txt:862
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:867
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:848
+#: en/git-rebase.txt:871
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:850
+#: en/git-rebase.txt:873
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:875
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:858
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38889,19 +39202,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:885
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:866
+#: en/git-rebase.txt:889
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:894
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -38911,67 +39224,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:876
+#: en/git-rebase.txt:899
#, priority:100
-msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge-base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
+msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:880
+#: en/git-rebase.txt:903
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:883
+#: en/git-rebase.txt:906
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:886
+#: en/git-rebase.txt:909
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:888
+#: en/git-rebase.txt:911
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:893
+#: en/git-rebase.txt:916
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:895
+#: en/git-rebase.txt:918
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:926
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:907
+#: en/git-rebase.txt:930
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:912
+#: en/git-rebase.txt:935
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:922
+#: en/git-rebase.txt:945
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -38985,25 +39298,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:929
+#: en/git-rebase.txt:952
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:932
+#: en/git-rebase.txt:955
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:935 en/git-rebase.txt:1012
+#: en/git-rebase.txt:958 en/git-rebase.txt:1035
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:941
+#: en/git-rebase.txt:964
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39014,7 +39327,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:946
+#: en/git-rebase.txt:969
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39024,7 +39337,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:950
+#: en/git-rebase.txt:973
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39033,55 +39346,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:954
+#: en/git-rebase.txt:977
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:962
+#: en/git-rebase.txt:985
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:992
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:975
+#: en/git-rebase.txt:998
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:978
+#: en/git-rebase.txt:1001
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1008
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:989
+#: en/git-rebase.txt:1012
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:996
+#: en/git-rebase.txt:1019
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1003
+#: en/git-rebase.txt:1026
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39092,13 +39405,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1009
+#: en/git-rebase.txt:1032
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1015
+#: en/git-rebase.txt:1038
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39106,7 +39419,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1022
+#: en/git-rebase.txt:1045
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39118,7 +39431,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1049
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39127,37 +39440,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1035
+#: en/git-rebase.txt:1058
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1037
+#: en/git-rebase.txt:1060
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1039
+#: en/git-rebase.txt:1062
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1043
+#: en/git-rebase.txt:1066
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1068
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1072
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -39465,117 +39778,118 @@ msgstr ""
msgid "Using this hook, it is easy to generate mails describing the updates to the repository. This example script sends one mail message per ref listing the commits pushed to the repository, and logs the push certificates of signed pushes with good signatures to a logger service:"
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:191
+#. type: delimited block -
+#: en/git-receive-pack.txt:192
#, no-wrap, priority:100
msgid ""
-"\t#!/bin/sh\n"
-"\t# mail out commit update information.\n"
-"\twhile read oval nval ref\n"
-"\tdo\n"
-"\t\tif expr \"$oval\" : '0*$' >/dev/null\n"
-"\t\tthen\n"
-"\t\t\techo \"Created a new ref, with the following commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\"\n"
-"\t\telse\n"
-"\t\t\techo \"New commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
-"\t\tfi |\n"
-"\t\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
-"\tdone\n"
-"\t# log signed push certificate, if any\n"
-"\tif test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"#!/bin/sh\n"
+"# mail out commit update information.\n"
+"while read oval nval ref\n"
+"do\n"
+"\tif expr \"$oval\" : '0*$' >/dev/null\n"
"\tthen\n"
-"\t\t(\n"
-"\t\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
-"\t\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
-"\t\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
-"\tfi\n"
-"\texit 0\n"
+"\t\techo \"Created a new ref, with the following commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\"\n"
+"\telse\n"
+"\t\techo \"New commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
+"\tfi |\n"
+"\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
+"done\n"
+"# log signed push certificate, if any\n"
+"if test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"then\n"
+"\t(\n"
+"\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
+"\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
+"\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
+"fi\n"
+"exit 0\n"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:194
+#: en/git-receive-pack.txt:196
#, priority:100
msgid "The exit code from this hook invocation is ignored, however a non-zero exit code will generate an error message."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:200
+#: en/git-receive-pack.txt:202
#, priority:100
msgid "Note that it is possible for refname to not have sha1-new when this hook runs. This can easily occur if another user modifies the ref after it was updated by 'git-receive-pack', but before the hook was able to evaluate it. It is recommended that hooks rely on sha1-new rather than the current value of refname."
msgstr ""
#. type: Title -
-#: en/git-receive-pack.txt:202
+#: en/git-receive-pack.txt:204
#, no-wrap, priority:100
msgid "POST-UPDATE HOOK"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:207
+#: en/git-receive-pack.txt:209
#, priority:100
msgid "After all other processing, if at least one ref was updated, and if $GIT_DIR/hooks/post-update file exists and is executable, then post-update will be called with the list of refs that have been updated. This can be used to implement any repository wide cleanup tasks."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:211
+#: en/git-receive-pack.txt:213
#, priority:100
msgid "The exit code from this hook invocation is ignored; the only thing left for 'git-receive-pack' to do at that point is to exit itself anyway."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:214
+#: en/git-receive-pack.txt:216
#, priority:100
msgid "This hook can be used, for example, to run `git update-server-info` if the repository is packed and is served via a dumb transport."
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:217
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/git-receive-pack.txt:220
+#, fuzzy, no-wrap, priority:100
+#| msgid "git-update-server-info(1)"
msgid ""
-"\t#!/bin/sh\n"
-"\texec git update-server-info\n"
-msgstr ""
+"#!/bin/sh\n"
+"exec git update-server-info\n"
+msgstr "git-update-server-info(1)"
#. type: Title -
-#: en/git-receive-pack.txt:220
+#: en/git-receive-pack.txt:224
#, no-wrap, priority:100
msgid "QUARANTINE ENVIRONMENT"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:227
+#: en/git-receive-pack.txt:231
#, priority:100
msgid "When `receive-pack` takes in objects, they are placed into a temporary \"quarantine\" directory within the `$GIT_DIR/objects` directory and migrated into the main object store only after the `pre-receive` hook has completed. If the push fails before then, the temporary directory is removed entirely."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:229
+#: en/git-receive-pack.txt:233
#, priority:100
msgid "This has a few user-visible effects and caveats:"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:235
+#: en/git-receive-pack.txt:239
#, priority:100
msgid "Pushes which fail due to problems with the incoming pack, missing objects, or due to the `pre-receive` hook will not leave any on-disk data. This is usually helpful to prevent repeated failed pushes from filling up your disk, but can make debugging more challenging."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:238
+#: en/git-receive-pack.txt:242
#, priority:100
msgid "Any objects created by the `pre-receive` hook will be created in the quarantine directory (and migrated only if it succeeds)."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:244
+#: en/git-receive-pack.txt:248
#, priority:100
msgid "The `pre-receive` hook MUST NOT update any refs to point to quarantined objects. Other programs accessing the repository will not be able to see the objects (and if the pre-receive hook fails, those refs would become corrupted). For safety, any ref updates from within `pre-receive` are automatically rejected."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:249
+#: en/git-receive-pack.txt:253
#, ignore-same, priority:100
msgid "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
msgstr "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
@@ -40903,7 +41217,7 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:131
#, priority:100
-msgid "linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and linkgit:git-rebase[1], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
+msgid "linkgit:git-hash-object[1], linkgit:git-rebase[1], and https://github.com/newren/git-filter-repo[git-filter-repo], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
msgstr ""
#. type: Plain text
@@ -40926,9 +41240,10 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:158
-#, priority:100
-msgid "linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1]"
-msgstr ""
+#, fuzzy, priority:100
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] https://github.com/newren/git-filter-repo[git-filter-repo]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title =
#: en/git-request-pull.txt:2
@@ -41720,7 +42035,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:228 en/git-stash.txt:229
+#: en/git-reset.txt:228 en/git-stash.txt:230
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -42447,102 +42762,49 @@ msgid "git-rev-list - Lists commit objects in reverse chronological order"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:65
+#: en/git-rev-list.txt:13
#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"'git rev-list' [ --max-count=<number> ]\n"
-"\t [ --skip=<number> ]\n"
-"\t [ --max-age=<timestamp> ]\n"
-"\t [ --min-age=<timestamp> ]\n"
-"\t [ --sparse ]\n"
-"\t [ --merges ]\n"
-"\t [ --no-merges ]\n"
-"\t [ --min-parents=<number> ]\n"
-"\t [ --no-min-parents ]\n"
-"\t [ --max-parents=<number> ]\n"
-"\t [ --no-max-parents ]\n"
-"\t [ --first-parent ]\n"
-"\t [ --remove-empty ]\n"
-"\t [ --full-history ]\n"
-"\t [ --not ]\n"
-"\t [ --all ]\n"
-"\t [ --branches[=<pattern>] ]\n"
-"\t [ --tags[=<pattern>] ]\n"
-"\t [ --remotes[=<pattern>] ]\n"
-"\t [ --glob=<glob-pattern> ]\n"
-"\t [ --ignore-missing ]\n"
-"\t [ --stdin ]\n"
-"\t [ --quiet ]\n"
-"\t [ --topo-order ]\n"
-"\t [ --parents ]\n"
-"\t [ --timestamp ]\n"
-"\t [ --left-right ]\n"
-"\t [ --left-only ]\n"
-"\t [ --right-only ]\n"
-"\t [ --cherry-mark ]\n"
-"\t [ --cherry-pick ]\n"
-"\t [ --encoding=<encoding> ]\n"
-"\t [ --(author|committer|grep)=<pattern> ]\n"
-"\t [ --regexp-ignore-case | -i ]\n"
-"\t [ --extended-regexp | -E ]\n"
-"\t [ --fixed-strings | -F ]\n"
-"\t [ --date=<format>]\n"
-"\t [ [ --objects | --objects-edge | --objects-edge-aggressive ]\n"
-"\t [ --unpacked ]\n"
-"\t [ --object-names | --no-object-names ]\n"
-"\t [ --filter=<filter-spec> [ --filter-print-omitted ] ] ]\n"
-"\t [ --missing=<missing-action> ]\n"
-"\t [ --pretty | --header ]\n"
-"\t [ --bisect ]\n"
-"\t [ --bisect-vars ]\n"
-"\t [ --bisect-all ]\n"
-"\t [ --merge ]\n"
-"\t [ --reverse ]\n"
-"\t [ --walk-reflogs ]\n"
-"\t [ --no-walk ] [ --do-walk ]\n"
-"\t [ --count ]\n"
-"\t [ --use-bitmap-index ]\n"
-"\t <commit>... [ \\-- <paths>... ]\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:73
+msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rev-list.txt:21
#, priority:100
msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:80
+#: en/git-rev-list.txt:28
#, priority:100
msgid "You can think of this as a set operation. Commits given on the command line form a set of commits that are reachable from any of them, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:82
+#: en/git-rev-list.txt:30
#, priority:100
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:85
+#: en/git-rev-list.txt:33
#, no-wrap, priority:100
msgid "\t$ git rev-list foo bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:89
+#: en/git-rev-list.txt:37
#, priority:100
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:93
+#: en/git-rev-list.txt:41
#, priority:100
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:97
+#: en/git-rev-list.txt:45
#, no-wrap, priority:100
msgid ""
"\t$ git rev-list origin..HEAD\n"
@@ -42550,13 +42812,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:102
+#: en/git-rev-list.txt:50
#, ignore-ellipsis, priority:100
msgid "Another special notation is \"'<commit1>'...'<commit2>'\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:106
+#: en/git-rev-list.txt:54
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git rev-list A B --not $(git merge-base --all A B)\n"
@@ -42564,7 +42826,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:113
+#: en/git-rev-list.txt:61
#, priority:100
msgid "'rev-list' is a very essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For this reason, it has a lot of different options that enables it to be used by commands as different as 'git bisect' and 'git repack'."
msgstr ""
@@ -44686,31 +44948,31 @@ msgstr ""
msgid "To use 'git send-email' to send your patches through the GMail SMTP server, edit ~/.gitconfig to specify your account settings:"
msgstr ""
-#. type: Plain text
-#: en/git-send-email.txt:494
+#. type: delimited block -
+#: en/git-send-email.txt:495
#, no-wrap, priority:100
msgid ""
-"\t[sendemail]\n"
-"\t\tsmtpEncryption = tls\n"
-"\t\tsmtpServer = smtp.gmail.com\n"
-"\t\tsmtpUser = yourname@gmail.com\n"
-"\t\tsmtpServerPort = 587\n"
+"[sendemail]\n"
+"\tsmtpEncryption = tls\n"
+"\tsmtpServer = smtp.gmail.com\n"
+"\tsmtpUser = yourname@gmail.com\n"
+"\tsmtpServerPort = 587\n"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:498
+#: en/git-send-email.txt:500
#, priority:100
msgid "If you have multifactor authentication setup on your gmail account, you will need to generate an app-specific password for use with 'git send-email'. Visit https://security.google.com/settings/security/apppasswords to create it."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:501
+#: en/git-send-email.txt:503
#, priority:100
msgid "Once your commits are ready to be sent to the mailing list, run the following commands:"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:505
+#: en/git-send-email.txt:507
#, no-wrap, priority:100
msgid ""
"\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -44719,19 +44981,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:510
+#: en/git-send-email.txt:512
#, priority:100
msgid "The first time you run it, you will be prompted for your credentials. Enter the app-specific or your regular password as appropriate. If you have credential helper configured (see linkgit:git-credential[1]), the password will be saved in the credential store so you won't have to type it the next time."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:518
#, priority:100
msgid "Note: the following core Perl modules that may be installed with your distribution of Perl are required: MIME::Base64, MIME::QuotedPrint, Net::Domain and Net::SMTP. These additional Perl modules are also required: Authen::SASL and Mail::Address."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:521
+#: en/git-send-email.txt:523
#, priority:100
msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
msgstr ""
@@ -46320,25 +46582,25 @@ msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--a
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:92
+#: en/git-stash.txt:93
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs, and any non-option arguments form the message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:93
+#: en/git-stash.txt:94
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:100
+#: en/git-stash.txt:101
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:104
+#: en/git-stash.txt:105
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46346,139 +46608,139 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:108
+#: en/git-stash.txt:109
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:109
+#: en/git-stash.txt:110
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:119
+#: en/git-stash.txt:120
#, priority:240
msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:120
+#: en/git-stash.txt:121
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:126
+#: en/git-stash.txt:127
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:130
+#: en/git-stash.txt:131
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:135
+#: en/git-stash.txt:136
#, priority:240
msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:138
+#: en/git-stash.txt:139
#, priority:240
msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:139
+#: en/git-stash.txt:140
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:145
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:145
+#: en/git-stash.txt:146
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:153
+#: en/git-stash.txt:154
#, priority:240
msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:159
+#: en/git-stash.txt:160
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:160
+#: en/git-stash.txt:161
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:164
+#: en/git-stash.txt:165
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:165
+#: en/git-stash.txt:166
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:171
+#: en/git-stash.txt:172
#, priority:240
msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:172 en/git-update-ref.txt:100
+#: en/git-stash.txt:173 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:179
+#: en/git-stash.txt:180
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:180
+#: en/git-stash.txt:181
#, no-wrap, priority:240
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:186
+#: en/git-stash.txt:187
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:195
+#: en/git-stash.txt:196
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:199
+#: en/git-stash.txt:200
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46487,31 +46749,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:203
+#: en/git-stash.txt:204
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:208
+#: en/git-stash.txt:209
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:214
+#: en/git-stash.txt:215
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:219
+#: en/git-stash.txt:220
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:227
+#: en/git-stash.txt:228
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -46523,13 +46785,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:235
+#: en/git-stash.txt:236
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:246
+#: en/git-stash.txt:247
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46544,13 +46806,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:249
+#: en/git-stash.txt:250
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:257
+#: en/git-stash.txt:258
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46562,19 +46824,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:259
+#: en/git-stash.txt:260
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:264
+#: en/git-stash.txt:265
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:275
+#: en/git-stash.txt:276
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46589,19 +46851,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:277
+#: en/git-stash.txt:278
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:283
+#: en/git-stash.txt:284
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:288
+#: en/git-stash.txt:289
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -46610,7 +46872,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:298
+#: en/git-stash.txt:299
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -46688,61 +46950,61 @@ msgid "In addition to the names of files that have been changed, also show the t
msgstr ""
#. type: Plain text
-#: en/git-status.txt:65
+#: en/git-status.txt:66
#, priority:280
msgid "The mode parameter is used to specify the handling of untracked files. It is optional: it defaults to 'all', and if specified, it must be stuck to the option (e.g. `-uno`, but not `-u no`)."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:69
+#: en/git-status.txt:70
#, no-wrap, priority:280
msgid "'no' - Show no untracked files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:70
+#: en/git-status.txt:71
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:81
+#: en/git-status.txt:82
#, priority:280
msgid "When `-u` option is not used, untracked files and directories are shown (i.e. the same as specifying `normal`), to help you avoid forgetting to add newly created files. Because it takes extra work to find untracked files in the filesystem, this mode may take some time in a large working tree. Consider enabling untracked cache and split index if supported (see `git update-index --untracked-cache` and `git update-index --split-index`), Otherwise you can use `no` to have `git status` return more quickly without showing untracked files."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:99
+#: en/git-status.txt:101
#, priority:280
msgid "Ignore changes to submodules when looking for changes. <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 before 1.7.0). Using \"all\" hides all changes to submodules (and suppresses the output of submodule summaries when the config option `status.submoduleSummary` is set)."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:100
+#: en/git-status.txt:102
#, no-wrap, priority:280
msgid "--ignored[=<mode>]"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:102
+#: en/git-status.txt:104
#, priority:280
msgid "Show ignored files as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:105
+#: en/git-status.txt:108
#, priority:280
msgid "The mode parameter is used to specify the handling of ignored files. It is optional: it defaults to 'traditional'."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:109
+#: en/git-status.txt:112
#, priority:280
msgid "'traditional' - Shows ignored files and directories, unless"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:112
+#: en/git-status.txt:115
#, no-wrap, priority:280
msgid ""
"--untracked-files=all is specified, in which case\n"
@@ -46751,109 +47013,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:113
+#: en/git-status.txt:116
#, no-wrap, priority:280
msgid "'no'\t - Show no ignored files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:114
+#: en/git-status.txt:117
#, no-wrap, priority:280
msgid "'matching' - Shows ignored files and directories matching an\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:115
+#: en/git-status.txt:118
#, no-wrap, priority:280
msgid "ignore pattern.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:121
+#: en/git-status.txt:124
#, priority:280
msgid "When 'matching' mode is specified, paths that explicitly match an ignored pattern are shown. If a directory matches an ignore pattern, then it is shown, but not paths contained in the ignored directory. If a directory does not match an ignore pattern, but all contents are ignored, then the directory is not shown, but all contents are shown."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:125
+#: en/git-status.txt:129
#, priority:280
msgid "Terminate entries with NUL, instead of LF. This implies the `--porcelain=v1` output format if no other format is given."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:132
+#: en/git-status.txt:136
#, priority:280
msgid "Display untracked files in columns. See configuration variable column.status for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:133
+#: en/git-status.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--ahead-behind"
msgstr "--ahead-behind"
#. type: Labeled list
-#: en/git-status.txt:134
+#: en/git-status.txt:138
#, ignore-same, no-wrap, priority:280
msgid "--no-ahead-behind"
msgstr "--no-ahead-behind"
#. type: Plain text
-#: en/git-status.txt:137
+#: en/git-status.txt:141
#, priority:280
msgid "Display or do not display detailed ahead/behind counts for the branch relative to its upstream branch. Defaults to true."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:138
+#: en/git-status.txt:142
#, ignore-same, no-wrap, priority:280
msgid "--renames"
msgstr "--renames"
#. type: Plain text
-#: en/git-status.txt:142
+#: en/git-status.txt:146
#, priority:280
msgid "Turn on/off rename detection regardless of user configuration. See also linkgit:git-diff[1] `--no-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:147
+#: en/git-status.txt:151
#, priority:280
msgid "Turn on rename detection, optionally setting the similarity threshold. See also linkgit:git-diff[1] `--find-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:150
+#: en/git-status.txt:154
#, priority:280
msgid "See the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:158
+#: en/git-status.txt:162
#, priority:280
msgid "The output from this command is designed to be used as a commit template comment. The default, long format, is designed to be human readable, verbose and descriptive. Its contents and format are subject to change at any time."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:163
+#: en/git-status.txt:167
#, priority:280
msgid "The paths mentioned in the output, unlike many other Git commands, are made relative to the current directory if you are working in a subdirectory (this is on purpose, to help cutting and pasting). See the status.relativePaths config option below."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:165
+#: en/git-status.txt:169
#, no-wrap, priority:280
msgid "Short Format"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:169
+#: en/git-status.txt:173
#, priority:280
msgid "In the short-format, the status of each path is shown as one of these forms"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:172
+#: en/git-status.txt:176
#, no-wrap, priority:280
msgid ""
"\tXY PATH\n"
@@ -46861,73 +47123,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:176
+#: en/git-status.txt:180
#, priority:280
msgid "where `ORIG_PATH` is where the renamed/copied contents came from. `ORIG_PATH` is only shown when the entry is renamed or copied. The `XY` is a two-letter status code."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:182
+#: en/git-status.txt:186
#, priority:280
msgid "The fields (including the `->`) are separated from each other by a single space. If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash-escaped."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:188
+#: en/git-status.txt:192
#, priority:280
msgid "For paths with merge conflicts, `X` and `Y` show the modification states of each side of the merge. For paths that do not have merge conflicts, `X` shows the status of the index, and `Y` shows the status of the work tree. For untracked paths, `XY` are `??`. Other status codes can be interpreted as follows:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:190
+#: en/git-status.txt:194
#, priority:280
msgid "' ' = unmodified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:191
+#: en/git-status.txt:195
#, priority:280
msgid "'M' = modified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:192
+#: en/git-status.txt:196
#, priority:280
msgid "'A' = added"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:193
+#: en/git-status.txt:197
#, priority:280
msgid "'D' = deleted"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:194
+#: en/git-status.txt:198
#, priority:280
msgid "'R' = renamed"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:195
+#: en/git-status.txt:199
#, priority:280
msgid "'C' = copied"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:196
+#: en/git-status.txt:200
#, priority:280
msgid "'U' = updated but unmerged"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:199
+#: en/git-status.txt:203
#, priority:280
msgid "Ignored files are not listed, unless `--ignored` option is in effect, in which case `XY` are `!!`."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:226
+#: en/git-status.txt:230
#, no-wrap, priority:280
msgid ""
"X Y Meaning\n"
@@ -46958,7 +47220,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:235
+#: en/git-status.txt:239
#, no-wrap, priority:280
msgid ""
"Submodules have more state and instead report\n"
@@ -46971,91 +47233,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:238
+#: en/git-status.txt:242
#, priority:280
msgid "'m' and '?' are applied recursively. For example if a nested submodule in a submodule contains an untracked file, this is reported as '?' as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:240
+#: en/git-status.txt:244
#, priority:280
msgid "If -b is used the short-format status is preceded by a line"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:242
+#: en/git-status.txt:246
#, no-wrap, priority:280
msgid " ## branchname tracking info\n"
msgstr ""
#. type: Title ~
-#: en/git-status.txt:244
+#: en/git-status.txt:248
#, no-wrap, priority:280
msgid "Porcelain Format Version 1"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:251
+#: en/git-status.txt:255
#, priority:280
msgid "Version 1 porcelain format is similar to the short format, but is guaranteed not to change in a backwards-incompatible way between Git versions or based on user configuration. This makes it ideal for parsing by scripts. The description of the short format above also describes the porcelain format, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:254
+#: en/git-status.txt:258
#, priority:280
msgid "The user's color.status configuration is not respected; color will always be off."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:257
+#: en/git-status.txt:261
#, priority:280
msgid "The user's status.relativePaths configuration is not respected; paths shown will always be relative to the repository root."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:267
+#: en/git-status.txt:271
#, priority:280
msgid "There is also an alternate -z format recommended for machine parsing. In that format, the status field is the same, but some other things change. First, the '\\->' is omitted from rename entries and the field order is reversed (e.g 'from \\-> to' becomes 'to from'). Second, a NUL (ASCII 0) follows each filename, replacing space as a field separator and the terminating newline (but a space still separates the status field from the first filename). Third, filenames containing special characters are not specially formatted; no quoting or backslash-escaping is performed."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:269
+#: en/git-status.txt:273
#, priority:280
msgid "Any submodule changes are reported as modified `M` instead of `m` or single `?`."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:271
+#: en/git-status.txt:275
#, no-wrap, priority:280
msgid "Porcelain Format Version 2"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:276
+#: en/git-status.txt:280
#, priority:280
msgid "Version 2 format adds more detailed information about the state of the worktree and changed items. Version 2 also defines an extensible set of easy to parse optional headers."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:280
+#: en/git-status.txt:284
#, priority:280
msgid "Header lines start with \"#\" and are added in response to specific command line arguments. Parsers should ignore headers they don't recognize."
msgstr ""
#. type: Title ^
-#: en/git-status.txt:282
+#: en/git-status.txt:286
#, no-wrap, priority:280
msgid "Branch Headers"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:286
+#: en/git-status.txt:290
#, priority:280
msgid "If `--branch` is given, a series of header lines are printed with information about the current branch."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:296
+#: en/git-status.txt:300
#, no-wrap, priority:280
msgid ""
"Line Notes\n"
@@ -47069,43 +47331,43 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:299
+#: en/git-status.txt:303
#, no-wrap, priority:280
msgid "Changed Tracked Entries"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:306
+#: en/git-status.txt:310
#, priority:280
msgid "Following the headers, a series of lines are printed for tracked entries. One of three different line formats may be used to describe an entry depending on the type of change. Tracked entries are printed in an undefined order; parsers should allow for a mixture of the 3 line types in any order."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:308
+#: en/git-status.txt:312
#, priority:280
msgid "Ordinary changed entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:310
+#: en/git-status.txt:314
#, no-wrap, priority:280
msgid " 1 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:312
+#: en/git-status.txt:316
#, priority:280
msgid "Renamed or copied entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:314
+#: en/git-status.txt:318
#, no-wrap, priority:280
msgid " 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:345
+#: en/git-status.txt:349
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47140,19 +47402,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:349
+#: en/git-status.txt:353
#, priority:280
msgid "Unmerged entries have the following format; the first character is a \"u\" to distinguish from ordinary changed entries."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:351
+#: en/git-status.txt:355
#, no-wrap, priority:280
msgid " u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:368
+#: en/git-status.txt:372
#, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47173,85 +47435,85 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:371
+#: en/git-status.txt:375
#, no-wrap, priority:280
msgid "Other Items"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:376
+#: en/git-status.txt:380
#, priority:280
msgid "Following the tracked entries (and if requested), a series of lines will be printed for untracked and then ignored items found in the worktree."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:378
+#: en/git-status.txt:382
#, priority:280
msgid "Untracked items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:380
+#: en/git-status.txt:384
#, no-wrap, priority:280
msgid " ? <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:382
+#: en/git-status.txt:386
#, priority:280
msgid "Ignored items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:384
+#: en/git-status.txt:388
#, no-wrap, priority:280
msgid " ! <path>\n"
msgstr ""
#. type: Title ^
-#: en/git-status.txt:386
+#: en/git-status.txt:390
#, no-wrap, priority:280
msgid "Pathname Format Notes and -z"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:391
+#: en/git-status.txt:395
#, priority:280
msgid "When the `-z` option is given, pathnames are printed as is and without any quoting and lines are terminated with a NUL (ASCII 0x00) byte."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:395
+#: en/git-status.txt:399
#, 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])."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:404
+#: en/git-status.txt:408
#, priority:280
msgid "The command honors `color.status` (or `status.color` -- they mean the same thing and the latter is kept for backward compatibility) and `color.status.<slot>` configuration variables to colorize its output."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:408
+#: en/git-status.txt:412
#, priority:280
msgid "If the config variable `status.relativePaths` is set to false, then all paths shown are relative to the repository root, not to the current directory."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:419
+#: en/git-status.txt:423
#, priority:280
msgid "If `status.submoduleSummary` is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). Please note that the summary output from the status command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings."
msgstr ""
#. type: Title -
-#: en/git-status.txt:421
+#: en/git-status.txt:425
#, no-wrap, priority:280
msgid "BACKGROUND REFRESH"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:432
+#: en/git-status.txt:436
#, priority:280
msgid "By default, `git status` will automatically refresh the index, updating the cached stat information from the working tree and writing out the result. Writing out the updated index is an optimization that isn't strictly necessary (`status` computes the values for itself, but writing them out is just to save subsequent programs from repeating our computation). When `status` is run in the background, the lock held during the write may conflict with other simultaneous processes, causing them to fail. Scripts running `status` in the background should consider using `git --no-optional-locks status` (see linkgit:git[1] for details)."
msgstr ""
@@ -47695,281 +47957,287 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:176
#, no-wrap, priority:220
-msgid "set-branch ((-d|--default)|(-b|--branch <branch>)) [--] <path>"
+msgid "set-branch (-b|--branch) <branch> [--] <path>"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-submodule.txt:177
+#, no-wrap, priority:220
+msgid "set-branch (-d|--default) [--] <path>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:181
+#: en/git-submodule.txt:182
#, priority:220
msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:182
+#: en/git-submodule.txt:183
#, ignore-ellipsis, no-wrap, priority:220
msgid "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:191
+#: en/git-submodule.txt:192
#, priority:220
msgid "Show commit summary between the given commit (defaults to HEAD) and working tree/index. For a submodule in question, a series of commits in the submodule between the given super project commit and the index or working tree (switched by `--cached`) are shown. If the option `--files` is given, show the series of commits in the submodule between the index of the super project and the working tree of the submodule (this option doesn't allow to use the `--cached` option or to provide an explicit commit)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:194
+#: en/git-submodule.txt:195
#, priority:220
msgid "Using the `--submodule=log` option with linkgit:git-diff[1] will provide that information too."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:195
+#: en/git-submodule.txt:196
#, no-wrap, priority:220
msgid "foreach [--recursive] <command>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:216
+#: en/git-submodule.txt:217
#, priority:220
msgid "Evaluates an arbitrary shell command in each checked out submodule. The command has access to the variables $name, $sm_path, $displaypath, $sha1 and $toplevel: $name is the name of the relevant submodule section in `.gitmodules`, $sm_path is the path of the submodule as recorded in the immediate superproject, $displaypath contains the relative path from the current working directory to the submodules root directory, $sha1 is the commit as recorded in the immediate superproject, and $toplevel is the absolute path to the top-level of the immediate superproject. Note that to avoid conflicts with '$PATH' on Windows, the '$path' variable is now a deprecated synonym of '$sm_path' variable. Any submodules defined in the superproject but not checked out are ignored by this command. Unless given `--quiet`, foreach prints the name of each submodule before evaluating the command. If `--recursive` is given, submodules are traversed recursively (i.e. the given shell command is evaluated in nested submodules as well). A non-zero return from the command in any submodule causes the processing to terminate. This can be overridden by adding '|| :' to the end of the command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:219
+#: en/git-submodule.txt:220
#, priority:220
msgid "As an example, the command below will show the path and currently checked out commit for each submodule:"
msgstr ""
#. type: delimited block -
-#: en/git-submodule.txt:222
+#: en/git-submodule.txt:223
#, no-wrap, priority:220
msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:224
+#: en/git-submodule.txt:225
#, ignore-ellipsis, no-wrap, priority:220
msgid "sync [--recursive] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:231
+#: en/git-submodule.txt:232
#, priority:220
msgid "Synchronizes submodules' remote URL configuration setting to the value specified in `.gitmodules`. It will only affect those submodules which already have a URL entry in .git/config (that is the case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:234
+#: en/git-submodule.txt:235
#, priority:220
msgid "`git submodule sync` synchronizes all submodules while `git submodule sync -- A` synchronizes submodule \"A\" only."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:237
+#: en/git-submodule.txt:238
#, priority:220
msgid "If `--recursive` is specified, this command will recurse into the registered submodules, and sync any nested submodules within."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:238
+#: en/git-submodule.txt:239
#, no-wrap, priority:220
msgid "absorbgitdirs"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:245
+#: en/git-submodule.txt:246
#, priority:220
msgid "If a git directory of a submodule is inside the submodule, move the git directory of the submodule into its superprojects `$GIT_DIR/modules` path and then connect the git directory and its working directory by setting the `core.worktree` and adding a .git file pointing to the git directory embedded in the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:249
+#: en/git-submodule.txt:250
#, priority:220
msgid "A repository that was cloned independently and later added as a submodule or old setups have the submodules git directory inside the submodule instead of embedded into the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:251
+#: en/git-submodule.txt:252
#, priority:220
msgid "This command is recursive by default."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:257
+#: en/git-submodule.txt:258
#, priority:220
msgid "Only print error messages."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:264
+#: en/git-submodule.txt:265
#, priority:220
msgid "This option is only valid for add and update commands. Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:268
+#: en/git-submodule.txt:269
#, priority:220
msgid "This option is only valid for the deinit command. Unregister all submodules in the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:269
+#: en/git-submodule.txt:270
#, no-wrap, priority:220
msgid "-b <branch>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:277
+#: en/git-submodule.txt:278
#, priority:220
msgid "Branch of repository to add as submodule. The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository. If the option is not specified, it defaults to 'master'."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:290
+#: en/git-submodule.txt:291
#, priority:220
msgid "This option is only valid for add, deinit and update commands. When running add, allow adding an otherwise ignored submodule path. When running deinit the submodule working trees will be removed even if they contain local changes. When running update (only effective with the checkout procedure), throw away local changes in submodules when switching to a different commit; and always run a checkout operation in the submodule, even if the commit listed in the index of the containing repository matches the commit checked out in the submodule."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:295
+#: en/git-submodule.txt:296
#, priority:220
msgid "This option is only valid for status and summary commands. These commands typically use the commit found in the submodule HEAD, but with this option, the commit stored in the index is used instead."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:296
+#: en/git-submodule.txt:297
#, ignore-same, no-wrap, priority:220
msgid "--files"
msgstr "--files"
#. type: Plain text
-#: en/git-submodule.txt:300
+#: en/git-submodule.txt:301
#, priority:220
msgid "This option is only valid for the summary command. This command compares the commit in the index with that in the submodule HEAD when this option is used."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:302
+#: en/git-submodule.txt:303
#, ignore-same, no-wrap, priority:220
msgid "--summary-limit"
msgstr "--summary-limit"
#. type: Plain text
-#: en/git-submodule.txt:308
+#: en/git-submodule.txt:309
#, priority:220
msgid "This option is only valid for the summary command. Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:309
+#: en/git-submodule.txt:310
#, ignore-same, no-wrap, priority:220
msgid "--remote"
msgstr "--remote"
#. type: Plain text
-#: en/git-submodule.txt:318
+#: en/git-submodule.txt:319
#, priority:220
msgid "This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:324
+#: en/git-submodule.txt:325
#, priority:220
msgid "This works for any of the supported update procedures (`--checkout`, `--rebase`, etc.). The only change is the source of the target SHA-1. For example, `submodule update --remote --merge` will merge upstream submodule changes into the submodules, while `submodule update --merge` will merge superproject gitlink changes into the submodules."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:329
+#: en/git-submodule.txt:330
#, priority:220
msgid "In order to ensure a current tracking branch state, `update --remote` fetches the submodule's remote repository before calculating the SHA-1. If you don't want to fetch, you should use `submodule update --remote --no-fetch`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:339
+#: en/git-submodule.txt:340
#, priority:220
msgid "Use this option to integrate changes from the upstream subproject with your submodule's current HEAD. Alternatively, you can run `git pull` from the submodule, which is equivalent except for the remote branch name: `update --remote` uses the default upstream repository and `submodule.<name>.branch`, while `git pull` uses the submodule's `branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want to distribute the default upstream branch with the superproject and `branch.<name>.merge` if you want a more native feel while working in the submodule itself."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:341
+#: en/git-submodule.txt:342
#, ignore-same, no-wrap, priority:220
msgid "--no-fetch"
msgstr "--no-fetch"
#. type: Plain text
-#: en/git-submodule.txt:344
+#: en/git-submodule.txt:345
#, priority:220
msgid "This option is only valid for the update command. Don't fetch new objects from the remote site."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:345
+#: en/git-submodule.txt:346
#, ignore-same, no-wrap, priority:220
msgid "--checkout"
msgstr "--checkout"
#. type: Plain text
-#: en/git-submodule.txt:353
+#: en/git-submodule.txt:354
#, priority:220
msgid "This option is only valid for the update command. Checkout the commit recorded in the superproject on a detached HEAD in the submodule. This is the default behavior, the main use of this option is to override `submodule.$name.update` when set to a value other than `checkout`. If the key `submodule.$name.update` is either not explicitly set or set to `checkout`, this option is implicit."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:363
+#: en/git-submodule.txt:364
#, priority:220
msgid "This option is only valid for the update command. Merge the commit recorded in the superproject into the current branch of the submodule. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve the resulting conflicts within the submodule with the usual conflict resolution tools. If the key `submodule.$name.update` is set to `merge`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:364
+#: en/git-submodule.txt:365
#, ignore-same, no-wrap, priority:220
msgid "--rebase"
msgstr "--rebase"
#. type: Plain text
-#: en/git-submodule.txt:372
+#: en/git-submodule.txt:373
#, priority:220
msgid "This option is only valid for the update command. Rebase the current branch onto the commit recorded in the superproject. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve these failures with linkgit:git-rebase[1]. If the key `submodule.$name.update` is set to `rebase`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:373
+#: en/git-submodule.txt:374
#, ignore-same, no-wrap, priority:220
msgid "--init"
msgstr "--init"
#. type: Plain text
-#: en/git-submodule.txt:377
+#: en/git-submodule.txt:378
#, priority:220
msgid "This option is only valid for the update command. Initialize all submodules for which \"git submodule init\" has not been called so far before updating."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:378
+#: en/git-submodule.txt:379
#, ignore-same, no-wrap, priority:220
msgid "--name"
msgstr "--name"
#. type: Plain text
-#: en/git-submodule.txt:382
+#: en/git-submodule.txt:383
#, priority:220
msgid "This option is only valid for the add command. It sets the submodule's name to the given string instead of defaulting to its path. The name must be valid as a directory name and may not end with a '/'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:383
+#: en/git-submodule.txt:384
#, no-wrap, priority:220
msgid "--reference <repository>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:387 en/git-submodule.txt:396
+#: en/git-submodule.txt:388 en/git-submodule.txt:397
#, priority:220
msgid "This option is only valid for add and update commands. These commands sometimes need to clone a remote repository. In this case, this option will be passed to the linkgit:git-clone[1] command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:391
+#: en/git-submodule.txt:392
#, no-wrap, priority:220
msgid ""
"*NOTE*: Do *not* use this option unless you have read the note\n"
@@ -47978,61 +48246,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:398
+#: en/git-submodule.txt:399
#, no-wrap, priority:220
msgid "*NOTE*: see the NOTE for the `--reference` option.\n"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:404
+#: en/git-submodule.txt:405
#, priority:220
msgid "This option is only valid for foreach, update, status and sync commands. Traverse submodules recursively. The operation is performed not only in the submodules of the current repo, but also in any nested submodules inside those submodules (and so on)."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:405
+#: en/git-submodule.txt:406
#, ignore-same, no-wrap, priority:220
msgid "--depth"
msgstr "--depth"
#. type: Plain text
-#: en/git-submodule.txt:409
+#: en/git-submodule.txt:410
#, priority:220
msgid "This option is valid for add and update commands. Create a 'shallow' clone with a history truncated to the specified number of revisions. See linkgit:git-clone[1]"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:410
+#: en/git-submodule.txt:411
#, ignore-same, no-wrap, priority:220
msgid "--[no-]recommend-shallow"
msgstr "--[no-]recommend-shallow"
#. type: Plain text
-#: en/git-submodule.txt:415
+#: en/git-submodule.txt:416
#, priority:220
msgid "This option is only valid for the update command. The initial clone of a submodule will use the recommended `submodule.<name>.shallow` as provided by the `.gitmodules` file by default. To ignore the suggestions use `--no-recommend-shallow`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:421
+#: en/git-submodule.txt:422
#, priority:220
msgid "This option is only valid for the update command. Clone new submodules in parallel with as many jobs. Defaults to the `submodule.fetchJobs` option."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:426
+#: en/git-submodule.txt:427
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:434
+#: en/git-submodule.txt:435
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:438
+#: en/git-submodule.txt:439
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -48664,7 +48932,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:889
+#: en/git-svn.txt:346 en/rev-list-options.txt:905
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -49477,7 +49745,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:777
#, priority:100
-msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider linkgit:git-filter-branch[1] instead. filter-branch also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
+msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports, and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider https://github.com/newren/git-filter-repo[git-filter-repo] instead. filter-repo also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
msgstr ""
#. type: Labeled list
@@ -51398,16 +51666,6 @@ msgid ""
"#\n"
msgstr ""
-#. type: delimited block -
-#: en/git.txt:310
-#, 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/git.txt:315
#, no-wrap, priority:100
@@ -55448,98 +55706,104 @@ msgstr ""
msgid "This option determines how the merge message will be cleaned up before commiting. See linkgit:git-commit[1] for more details. In addition, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on to the commit machinery in the case of a merge conflict."
msgstr ""
+#. type: Labeled list
+#: en/merge-options.txt:44
+#, ignore-same, no-wrap, priority:240
+msgid "--ff-only"
+msgstr "--ff-only"
+
#. type: Plain text
-#: en/merge-options.txt:46
+#: en/merge-options.txt:50
#, priority:240
-msgid "When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. This is the default behavior."
+msgid "Specifies how a merge is handled when the merged-in history is already a descendant of the current history. `--ff` is the default unless merging an annotated (and possibly signed) tag that is not stored in its natural place in the `refs/tags/` hierarchy, in which case `--no-ff` is assumed."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:52
+#: en/merge-options.txt:55
#, priority:240
-msgid "Create a merge commit even when the merge resolves as a fast-forward. This is the default behaviour when merging an annotated (and possibly signed) tag that is not stored in its natural place in 'refs/tags/' hierarchy."
+msgid "With `--ff`, when possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit."
msgstr ""
-#. type: Labeled list
-#: en/merge-options.txt:53
-#, ignore-same, no-wrap, priority:240
-msgid "--ff-only"
-msgstr "--ff-only"
+#. type: Plain text
+#: en/merge-options.txt:58
+#, priority:240
+msgid "With `--no-ff`, create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward."
+msgstr ""
#. type: Plain text
-#: en/merge-options.txt:57
+#: en/merge-options.txt:61
#, priority:240
-msgid "Refuse to merge and exit with a non-zero status unless the current `HEAD` is already up to date or the merge can be resolved as a fast-forward."
+msgid "With `--ff-only`, resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:63
+#: en/merge-options.txt:67
#, priority:240
msgid "GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:69
+#: en/merge-options.txt:73
#, priority:240
msgid "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also linkgit:git-fmt-merge-msg[1]."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:72
+#: en/merge-options.txt:76
#, priority:240
msgid "With --no-log do not list one-line descriptions from the actual commits being merged."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:74
+#: en/merge-options.txt:78
#, ignore-same, no-wrap, priority:240
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
-#: en/merge-options.txt:83
+#: en/merge-options.txt:87
#, priority:240
msgid "With --no-signoff do not add a Signed-off-by line."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:89
+#: en/merge-options.txt:93
#, priority:240
msgid "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:92
+#: en/merge-options.txt:96
#, priority:240
msgid "With -n or --no-stat do not show a diffstat at the end of the merge."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:93
+#: en/merge-options.txt:97
#, ignore-same, no-wrap, priority:240
msgid "--squash"
msgstr "--squash"
#. type: Labeled list
-#: en/merge-options.txt:94
+#: en/merge-options.txt:98
#, ignore-same, no-wrap, priority:240
msgid "--no-squash"
msgstr "--no-squash"
#. type: Plain text
-#: en/merge-options.txt:102
+#: en/merge-options.txt:106
#, priority:240
msgid "Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:105
+#: en/merge-options.txt:109
#, priority:240
msgid "With --no-squash perform the merge and commit the result. This option can be used to override --squash."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:107
+#: en/merge-options.txt:111
#, priority:240
msgid "With --squash, --commit is not allowed, and will fail."
msgstr ""
@@ -55547,71 +55811,77 @@ msgstr ""
#. type: Plain text
#: en/merge-options.txt:115
#, priority:240
+msgid "This option bypasses the pre-merge and commit-msg hooks. See also linkgit:githooks[5]."
+msgstr ""
+
+#. type: Plain text
+#: en/merge-options.txt:123
+#, priority:240
msgid "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise)."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:116
+#: en/merge-options.txt:124
#, no-wrap, priority:240
msgid "-X <option>"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:120
+#: en/merge-options.txt:128
#, priority:240
msgid "Pass merge strategy specific option through to the merge strategy."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:121
+#: en/merge-options.txt:129
#, ignore-same, no-wrap, priority:240
msgid "--verify-signatures"
msgstr "--verify-signatures"
#. type: Labeled list
-#: en/merge-options.txt:122
+#: en/merge-options.txt:130
#, ignore-same, no-wrap, priority:240
msgid "--no-verify-signatures"
msgstr "--no-verify-signatures"
#. type: Plain text
-#: en/merge-options.txt:128
+#: en/merge-options.txt:136
#, priority:240
msgid "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:130
+#: en/merge-options.txt:138
#, ignore-same, no-wrap, priority:240
msgid "--no-summary"
msgstr "--no-summary"
#. type: Plain text
-#: en/merge-options.txt:133
+#: en/merge-options.txt:141
#, priority:240
msgid "Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:138
+#: en/merge-options.txt:146
#, priority:240
msgid "Operate quietly. Implies --no-progress."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:149
+#: en/merge-options.txt:157
#, priority:240
msgid "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:152
+#: en/merge-options.txt:160
#, ignore-same, no-wrap, priority:240
msgid "--allow-unrelated-histories"
msgstr "--allow-unrelated-histories"
#. type: Plain text
-#: en/merge-options.txt:158
+#: en/merge-options.txt:166
#, priority:240
msgid "By default, `git merge` command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added."
msgstr ""
@@ -56934,7 +57204,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:215
#, priority:260
-msgid "minutes ago`}; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -59312,263 +59582,281 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:762
#, priority:260
+msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:771
+#, ignore-ellipsis, priority:260
+msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:775
+#, priority:260
+msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:778
+#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:779
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:766
+#: en/rev-list-options.txt:782
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:773
+#: en/rev-list-options.txt:789
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:781
+#: en/rev-list-options.txt:797
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:800
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:791
+#: en/rev-list-options.txt:807
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:793
+#: en/rev-list-options.txt:809
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:801
+#: en/rev-list-options.txt:817
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:802
+#: en/rev-list-options.txt:818
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:804
+#: en/rev-list-options.txt:820
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:822
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:812
+#: en/rev-list-options.txt:828
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:832
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:818
+#: en/rev-list-options.txt:834
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:819
+#: en/rev-list-options.txt:835
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:826
+#: en/rev-list-options.txt:842
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:847
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:833
+#: en/rev-list-options.txt:849
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:852
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:838
+#: en/rev-list-options.txt:854
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:839
+#: en/rev-list-options.txt:855
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:840
+#: en/rev-list-options.txt:856
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:859
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:846
+#: en/rev-list-options.txt:862
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:864
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:873
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:864
+#: en/rev-list-options.txt:880
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:868
+#: en/rev-list-options.txt:884
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:875
+#: en/rev-list-options.txt:891
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:894
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:880
+#: en/rev-list-options.txt:896
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:882
+#: en/rev-list-options.txt:898
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:884
+#: en/rev-list-options.txt:900
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:887
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:892
+#: en/rev-list-options.txt:908
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:909
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:896
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:898
+#: en/rev-list-options.txt:914
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:902
+#: en/rev-list-options.txt:918
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:907
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:925
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:932
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -59579,19 +59867,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:919
+#: en/rev-list-options.txt:935
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:922
+#: en/rev-list-options.txt:938
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:929
+#: en/rev-list-options.txt:945
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -59603,85 +59891,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:931
+#: en/rev-list-options.txt:947
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:937
+#: en/rev-list-options.txt:953
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:939
+#: en/rev-list-options.txt:955
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:942
+#: en/rev-list-options.txt:958
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:943
+#: en/rev-list-options.txt:959
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:949
+#: en/rev-list-options.txt:965
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:959
+#: en/rev-list-options.txt:975
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:963
+#: en/rev-list-options.txt:979
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:984
#, priority:260
msgid "Listed below are options that control the formatting of diff output. Some of them are specific to linkgit:git-rev-list[1], however other diff options may be given. See linkgit:git-diff-files[1] for more options."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:991
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:981
+#: en/rev-list-options.txt:997
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:1012
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1015
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1018
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.id.po b/po/documentation.id.po
index bf16c7e6355d30a6760d90e3e5b7e71eed8c4cad..dc870671c4d037d2deada8bc66a8675f971634d0 100644
--- a/po/documentation.id.po
+++ b/po/documentation.id.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-08-27 18:53+0200\n"
+"POT-Creation-Date: 2019-12-08 16:35+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -28,7 +28,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:319 en/git-fsck.txt:38 en/git-rebase.txt:471
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:321 en/git-fsck.txt:38 en/git-rebase.txt:493
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -88,7 +88,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1000
+#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1016
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -124,7 +124,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:433 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -466,7 +466,7 @@ msgid "Get and set repository or global options."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1505
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1528
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-export[1]"
msgstr "linkgit:git-fast-export[1]"
@@ -478,7 +478,7 @@ msgid "Git data exporter."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:243
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-import[1]"
msgstr "linkgit:git-fast-import[1]"
@@ -2259,95 +2259,95 @@ msgstr ""
msgid "Example"
msgstr ""
-#. type: Plain text
-#: en/config.txt:185
+#. type: delimited block -
+#: en/config.txt:186
#, no-wrap, priority:100
msgid ""
-"\t# Core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"# Core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:190
+#. type: delimited block -
+#: en/config.txt:191
#, no-wrap, priority:100
msgid ""
-"\t# Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"# Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:194
+#. type: delimited block -
+#: en/config.txt:195
#, no-wrap, priority:100
msgid ""
-"\t[branch \"devel\"]\n"
-"\t\tremote = origin\n"
-"\t\tmerge = refs/heads/devel\n"
+"[branch \"devel\"]\n"
+"\tremote = origin\n"
+"\tmerge = refs/heads/devel\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:199
+#. type: delimited block -
+#: en/config.txt:200
#, no-wrap, priority:100
msgid ""
-"\t# Proxy settings\n"
-"\t[core]\n"
-"\t\tgitProxy=\"ssh\" for \"kernel.org\"\n"
-"\t\tgitProxy=default-proxy ; for the rest\n"
+"# Proxy settings\n"
+"[core]\n"
+"\tgitProxy=\"ssh\" for \"kernel.org\"\n"
+"\tgitProxy=default-proxy ; for the rest\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:204
+#. type: delimited block -
+#: en/config.txt:205
#, no-wrap, priority:100
msgid ""
-"\t[include]\n"
-"\t\tpath = /path/to/foo.inc ; include by absolute path\n"
-"\t\tpath = foo.inc ; find \"foo.inc\" relative to the current file\n"
-"\t\tpath = ~/foo.inc ; find \"foo.inc\" in your `$HOME` directory\n"
+"[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: Plain text
-#: en/config.txt:208
+#. type: delimited block -
+#: en/config.txt:209
#, no-wrap, priority:100
msgid ""
-"\t; include if $GIT_DIR is /path/to/foo/.git\n"
-"\t[includeIf \"gitdir:/path/to/foo/.git\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; 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: Plain text
-#: en/config.txt:212
+#. type: delimited block -
+#: en/config.txt:213
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside /path/to/group\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside /path/to/group\n"
+"[includeIf \"gitdir:/path/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:216
+#. type: delimited block -
+#: en/config.txt:217
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside $HOME/to/group\n"
-"\t[includeIf \"gitdir:~/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside $HOME/to/group\n"
+"[includeIf \"gitdir:~/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:222
+#. type: delimited block -
+#: en/config.txt:223
#, no-wrap, priority:100
msgid ""
-"\t; relative paths are always relative to the including\n"
-"\t; file (if the condition is true); their location is not\n"
-"\t; affected by the condition\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = foo.inc\n"
+"; 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:227
+#: en/config.txt:229
#, no-wrap, priority:100
msgid ""
"\t; include only if we are in a worktree where foo-branch is\n"
@@ -2357,43 +2357,43 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/config.txt:229
+#: en/config.txt:231
#, no-wrap, priority:100
msgid "Values"
msgstr ""
#. type: Plain text
-#: en/config.txt:234
+#: 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:235
+#: en/config.txt:237
#, no-wrap, priority:100
msgid "boolean"
msgstr ""
#. type: Plain text
-#: en/config.txt:240
+#: 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:241
+#: en/config.txt:243
#, no-wrap, priority:100
msgid "true"
msgstr ""
#. type: Plain text
-#: en/config.txt:242
+#: en/config.txt:244
#, priority:100
msgid "Boolean true literals are `yes`, `on`, `true`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:244
+#: en/config.txt:246
#, no-wrap, priority:100
msgid ""
"and `1`. Also, a variable defined without `= <value>`\n"
@@ -2401,109 +2401,109 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/config.txt:245
+#: en/config.txt:247
#, no-wrap, priority:100
msgid "false"
msgstr ""
#. type: Plain text
-#: en/config.txt:246
+#: en/config.txt:248
#, priority:100
msgid "Boolean false literals are `no`, `off`, `false`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:247
+#: en/config.txt:249
#, no-wrap, priority:100
msgid "`0` and the empty string.\n"
msgstr ""
#. type: Plain text
-#: en/config.txt:251
+#: 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:252
+#: en/config.txt:254
#, no-wrap, priority:100
msgid "integer"
msgstr ""
#. type: Plain text
-#: en/config.txt:256
+#: 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:257 en/diff-options.txt:356 en/git-for-each-ref.txt:177
+#: 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:261
+#: 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:265
+#: en/config.txt:267
#, 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."
msgstr ""
#. type: Plain text
-#: en/config.txt:270
+#: en/config.txt:272
#, 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:277
+#: en/config.txt:279
#, 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:280
+#: en/config.txt:282
#, 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:289
+#: en/config.txt:291
#, 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:290
+#: en/config.txt:292
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:296
+#: en/config.txt:298
#, 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:299 en/git-imap-send.txt:58
+#: en/config.txt:301 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:304
+#: en/config.txt:306
#, 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:309
+#: en/config.txt:311
#, 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 ""
@@ -3241,53 +3241,53 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
#, no-wrap, priority:260
-msgid "Generating patches with -p"
+msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:10
+#: en/diff-generate-patch.txt:14
#, priority:260
-msgid "When \"git-diff-index\", \"git-diff-tree\", or \"git-diff-files\" are run with a `-p` option, \"git diff\" without the `--raw` option, or \"git log\" with the \"-p\" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
+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:13
+#: 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:15
+#: 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:17
+#: 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:21
+#: 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:25
+#: 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:27
+#: 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:39
+#: en/diff-generate-patch.txt:43
#, no-wrap, priority:260
msgid ""
"old mode <mode>\n"
@@ -3304,43 +3304,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:42
+#: 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:44
+#: 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:51
+#: 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:55
+#: en/diff-generate-patch.txt:59
#, priority:260
-msgid "The index line includes the SHA-1 checksum 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."
+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:59
+#: 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:64
+#: 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:71
+#: en/diff-generate-patch.txt:75
#, no-wrap, priority:260
msgid ""
"diff --git a/a b/b\n"
@@ -3352,25 +3352,25 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/diff-generate-patch.txt:74
+#: en/diff-generate-patch.txt:78
#, no-wrap, priority:260
-msgid "combined diff format"
+msgid "Combined diff format"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:82
+#: 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:84
+#: en/diff-generate-patch.txt:88
#, priority:260
-msgid "A 'combined diff' format looks like this:"
+msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:93
+#: en/diff-generate-patch.txt:97
#, no-wrap, priority:260
msgid ""
"diff --combined describe.c\n"
@@ -3383,7 +3383,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:103
+#: en/diff-generate-patch.txt:107
#, no-wrap, priority:260
msgid ""
"- static void describe(char *arg)\n"
@@ -3398,7 +3398,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:113
+#: en/diff-generate-patch.txt:117
#, no-wrap, priority:260
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
@@ -3413,37 +3413,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:117
+#: en/diff-generate-patch.txt:121
#, priority:260
-msgid "It is preceded with a \"git diff\" header, that looks like this (when `-c` option is used):"
+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:119
+#: en/diff-generate-patch.txt:123
#, no-wrap, priority:260
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:121
+#: en/diff-generate-patch.txt:125
#, priority:260
-msgid "or like this (when `--cc` option is used):"
+msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:123
+#: en/diff-generate-patch.txt:127
#, no-wrap, priority:260
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:126
+#: 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:131
+#: en/diff-generate-patch.txt:135
#, no-wrap, priority:260
msgid ""
"index <hash>,<hash>..<hash>\n"
@@ -3453,91 +3453,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:137
+#: 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:139
+#: 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:141 en/diff-generate-patch.txt:152 en/diff-generate-patch.txt:153 en/diff-generate-patch.txt:154
+#: 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:142 en/diff-generate-patch.txt:155
+#: 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:146
+#: 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:150
+#: 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:159
+#: 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:165
+#: 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 for apply. The change is similar to the change in the extended 'index' header:"
+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:167
+#: 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:170
+#: 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:179
+#: 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:185
+#: 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:191
+#: 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:197
+#: 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:327 en/merge-options.txt:86
+#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3549,7 +3549,7 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:186 en/git-add.txt:111 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/diff-options.txt:23 en/fetch-options.txt:198 en/git-add.txt:111 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
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
@@ -3573,7 +3573,7 @@ msgid "\tThis is the default.\n"
msgstr ""
#. 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:117 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
+#: 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:118 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"
@@ -3992,7 +3992,7 @@ msgid "Synonym for --dirstat=files,param1,param2..."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:129
+#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--summary"
msgstr "--summary"
@@ -4016,7 +4016,7 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:122 en/git-update-index.txt:168
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:168
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4425,7 +4425,7 @@ msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:402 en/git-status.txt:139
+#: en/diff-options.txt:402 en/git-status.txt:143
#, ignore-same, no-wrap, priority:280
msgid "--no-renames"
msgstr "--no-renames"
@@ -4529,7 +4529,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:463
#, priority:280
-msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
+msgid "It affects the way a change that amounts to a total rewrite of a file does not appear as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
msgstr ""
#. type: Plain text
@@ -4545,7 +4545,7 @@ msgid "-M[<n>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:473 en/git-status.txt:143
+#: en/diff-options.txt:473 en/git-status.txt:147
#, no-wrap, priority:280
msgid "--find-renames[=<n>]"
msgstr ""
@@ -4968,7 +4968,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:203 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:52 en/git-clone.txt:120 en/git-commit.txt:314 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:301 en/git-gc.txt:68 en/git-grep.txt:296 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:315 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:255 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:136 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:215 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:316 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:302 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:256 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5022,7 +5022,7 @@ msgid "Allow (or disallow) external text conversion filters to be run when compa
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:85
+#: en/diff-options.txt:722 en/git-status.txt:87
#, no-wrap, priority:280
msgid "--ignore-submodules[=<when>]"
msgstr ""
@@ -5100,7 +5100,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:265 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:266 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5232,7 +5232,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:48 en/git-commit.txt:317 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:50 en/git-commit.txt:319 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5244,13 +5244,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:34 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:195 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:347 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:278 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:279 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:35 en/git-fast-import.txt:37 en/git-filter-branch.txt:196 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:279 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:280 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5282,7 +5282,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:112 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:113 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5360,7 +5360,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:47 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:97 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:326 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:301 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:85
+#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:98 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:302 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5426,187 +5426,211 @@ msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:167
+#: en/fetch-options.txt:164
+#, priority:220
+msgid "Number of parallel children to be used for all forms of fetching."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:169
+#, priority:220
+msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:172
#, priority:220
-msgid "Number of parallel children to be used for fetching submodules. Each will fetch from different submodules, such that fetching many submodules will be faster. By default submodules will be fetched one at a time."
+msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:168 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:173 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:171
+#: en/fetch-options.txt:176
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:172
+#: en/fetch-options.txt:177 en/git-branch.txt:225 en/git-push.txt:349
+#, ignore-same, no-wrap, priority:240
+msgid "--set-upstream"
+msgstr "--set-upstream"
+
+#. type: Plain text
+#: en/fetch-options.txt:183
+#, priority:220
+msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:184
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:188
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177
+#: en/fetch-options.txt:189
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:184
+#: en/fetch-options.txt:196
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:199
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:194
+#: en/fetch-options.txt:206
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:195 en/git-clone.txt:182
+#: en/fetch-options.txt:207 en/git-clone.txt:182
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:212
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:202 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:51 en/git-clone.txt:119 en/git-commit.txt:313 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:300 en/git-grep.txt:295 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:314 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:254 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:135
+#: en/fetch-options.txt:214 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:315 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:301 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:255 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:207
+#: en/fetch-options.txt:219
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:208 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:298 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:318 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:139
+#: en/fetch-options.txt:220 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:300 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:209 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:299 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:319 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:140
+#: en/fetch-options.txt:221 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:301 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:211 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:142
+#: en/fetch-options.txt:223 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:213 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:326 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:258 en/git-switch.txt:144 en/merge-options.txt:143
+#: en/fetch-options.txt:225 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:328 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:259 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:218 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:230 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:219 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:231 en/git-ls-remote.txt:73 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:220 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:232 en/git-clone.txt:135 en/git-ls-remote.txt:74
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-clone.txt:142
+#: en/fetch-options.txt:239 en/git-clone.txt:142
#, priority:300
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:240
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:233
+#: en/fetch-options.txt:245
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:234
+#: en/fetch-options.txt:246
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:240
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:241 en/git-push.txt:398
+#: en/fetch-options.txt:253 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:242 en/git-push.txt:399
+#: en/fetch-options.txt:254 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:244 en/git-push.txt:401
+#: en/fetch-options.txt:256 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:245 en/git-push.txt:402
+#: en/fetch-options.txt:257 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:246 en/git-push.txt:403
+#: en/fetch-options.txt:258 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:247 en/git-push.txt:405
+#: en/fetch-options.txt:259 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5646,7 +5670,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:20 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:67 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
+#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr ""
@@ -5688,13 +5712,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr ""
#. type: Title -
-#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:83 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:85 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:115 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:253 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:86 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:254 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:52 en/git-grep.txt:308 en/git-status.txt:148
+#: en/git-add.txt:52 en/git-grep.txt:325 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
@@ -5706,7 +5730,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:67 en/git-grep.txt:314
+#: en/git-add.txt:67 en/git-grep.txt:331
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -5724,13 +5748,13 @@ msgid "Allow adding otherwise ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:42 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:394 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:43 en/git-rebase.txt:395 en/git-rebase.txt:536 en/git-svn.txt:297
+#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5754,7 +5778,7 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:275 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
@@ -5844,7 +5868,7 @@ msgid "This option is primarily to help users who are used to older versions of
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:146 en/git-format-patch.txt:101 en/git-submodule.txt:340
+#: en/git-add.txt:146 en/git-format-patch.txt:102 en/git-submodule.txt:341
#, no-wrap, priority:300
msgid "-N"
msgstr ""
@@ -5934,7 +5958,7 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:343 en/git-grep.txt:304 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
+#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:345 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr ""
@@ -5946,7 +5970,7 @@ msgid "This option can be used to separate command-line options from the list of
msgstr ""
#. type: Title -
-#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:357 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:153 en/git-fetch.txt:242 en/git-filter-branch.txt:234 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:634 en/git-grep.txt:316 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:206 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:359 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:638 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr ""
@@ -5988,7 +6012,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:221 en/git-rebase.txt:591
+#: en/git-add.txt:221 en/git-rebase.txt:613
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr ""
@@ -6000,7 +6024,7 @@ msgid "When the command enters the interactive mode, it shows the output of the
msgstr ""
#. type: Plain text
-#: en/git-add.txt:230 en/git-clean.txt:83
+#: en/git-add.txt:230 en/git-clean.txt:85
#, priority:300
msgid "The command loop shows the list of subcommands available, and gives a prompt \"What now> \". In general, when the prompt ends with a single '>', you can pick only one of the choices given and type return, like this:"
msgstr ""
@@ -6300,7 +6324,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:135 en/git-commit-tree.txt:118 en/git-commit.txt:487 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:241 en/git-fast-import.txt:1503 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:679 en/git-gc.txt:154 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:112 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:247 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:519 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:292 en/git-status.txt:434 en/git-submodule.txt:436 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
+#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:489 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1526 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:683 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:437 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
@@ -6312,13 +6336,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:139 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:495 en/git-config.txt:492 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:245 en/git-fast-import.txt:1507 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:480 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:683 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:334 en/git-gui.txt:126 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:116 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:230 en/git-merge-file.txt:94 en/git-merge-index.txt:78 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1052 en/git-receive-pack.txt:251 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:123 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:523 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:300 en/git-status.txt:438 en/git-stripspace.txt:93 en/git-submodule.txt:440 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
+#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:497 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1530 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:693 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:687 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:441 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
#, no-wrap, priority:300
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:140 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:496 en/git-config.txt:493 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:246 en/git-fast-import.txt:1508 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:481 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:684 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:335 en/git-gui.txt:127 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:117 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:231 en/git-merge-file.txt:95 en/git-merge-index.txt:79 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1053 en/git-receive-pack.txt:252 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:124 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:524 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:301 en/git-status.txt:439 en/git-stripspace.txt:94 en/git-submodule.txt:441 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
+#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:498 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1531 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:694 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:688 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:442 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6368,7 +6392,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:118 en/git-rebase.txt:387 en/git-revert.txt:98 en/merge-options.txt:73
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:119 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6410,7 +6434,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:969
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:985
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6440,7 +6464,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:267 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:989
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1005
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6532,37 +6556,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:303 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:304 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:307 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:373 en/git-rebase.txt:524
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:374
+#: en/git-am.txt:109 en/git-rebase.txt:396
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:337
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6622,7 +6646,7 @@ msgid "Run interactively."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:380 en/git-rebase.txt:521
+#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6634,7 +6658,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:381 en/git-rebase.txt:522
+#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6646,7 +6670,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:256 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6658,31 +6682,31 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:333 en/git-rebase.txt:308 en/git-revert.txt:91 en/merge-options.txt:58
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:335 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:334 en/git-rebase.txt:309 en/git-revert.txt:92 en/merge-options.txt:59
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:336 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:338 en/git-rebase.txt:313 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:340 en/git-rebase.txt:331 en/git-revert.txt:96
#, priority:280
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:228 en/sequencer.txt:1
+#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:246 en/sequencer.txt:1
#, ignore-same, no-wrap, priority:240
msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:406 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:997
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1013
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6712,7 +6736,7 @@ msgid "When a patch failure occurs, <msg> will be printed to the screen before e
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:231 en/sequencer.txt:15
+#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:249 en/sequencer.txt:15
#, ignore-same, no-wrap, priority:240
msgid "--abort"
msgstr "--abort"
@@ -6724,7 +6748,7 @@ msgid "Restore the original branch and abort the patching operation."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:238 en/sequencer.txt:10
+#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:256 en/sequencer.txt:10
#, ignore-same, no-wrap, priority:240
msgid "--quit"
msgstr "--quit"
@@ -6736,7 +6760,7 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:262
+#: en/git-am.txt:179 en/git-rebase.txt:280
#, ignore-same, no-wrap, priority:100
msgid "--show-current-patch"
msgstr "--show-current-patch"
@@ -6748,7 +6772,7 @@ msgid "Show the patch being applied when \"git am\" is stopped because of confli
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:451 en/git-format-patch.txt:351 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:188 en/git-tag.txt:231
+#: en/git-am.txt:184 en/git-commit.txt:453 en/git-format-patch.txt:355 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
@@ -6832,7 +6856,7 @@ msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the curren
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:471 en/git-gc.txt:147
+#: en/git-am.txt:234 en/git-commit.txt:473 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
@@ -6930,7 +6954,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:322 en/merge-options.txt:84
+#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -6972,7 +6996,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:291
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:292
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7044,7 +7068,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:342
+#: en/git-apply.txt:134 en/git-rebase.txt:360
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7260,7 +7284,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:330 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:398 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:332 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -9182,7 +9206,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:525
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9218,13 +9242,13 @@ msgid "Sorting and filtering branches are case insensitive."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:153 en/git-status.txt:126 en/git-tag.txt:134
+#: en/git-branch.txt:153 en/git-status.txt:130 en/git-tag.txt:134
#, no-wrap, priority:280
msgid "--column[=<options>]"
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:154 en/git-status.txt:127 en/git-tag.txt:135
+#: en/git-branch.txt:154 en/git-status.txt:131 en/git-tag.txt:135
#, ignore-same, no-wrap, priority:280
msgid "--no-column"
msgstr "--no-column"
@@ -9349,12 +9373,6 @@ msgstr "--no-track"
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
-#. type: Labeled list
-#: en/git-branch.txt:225 en/git-push.txt:349
-#, ignore-same, no-wrap, priority:240
-msgid "--set-upstream"
-msgstr "--set-upstream"
-
#. type: Plain text
#: en/git-branch.txt:228
#, priority:240
@@ -9624,7 +9642,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-filter-branch.txt:449 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10244,7 +10262,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:152 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10893,7 +10911,7 @@ msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will al
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:226
+#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
@@ -11090,7 +11108,7 @@ msgid "Only meaningful with `--stdin`; paths are separated with NUL character in
msgstr ""
#. type: Plain text
-#: en/git-checkout-index.txt:73 en/git-commit.txt:345 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
+#: en/git-checkout-index.txt:73 en/git-commit.txt:347 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
#, priority:280
msgid "Do not interpret any more arguments as options."
msgstr ""
@@ -11411,7 +11429,7 @@ msgid "Quiet, suppress feedback messages."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:144
+#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:152
#, ignore-same, no-wrap, priority:240
msgid "--no-progress"
msgstr "--no-progress"
@@ -11597,7 +11615,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:241 en/git-rebase.txt:268 en/git-rebase.txt:529 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:354 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
+#: en/git-checkout.txt:241 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:355 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11717,7 +11735,7 @@ msgid "In the default overlay mode, `git checkout` never removes files from the
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:312 en/git-rebase.txt:225 en/git-switch.txt:36
+#: en/git-checkout.txt:312 en/git-rebase.txt:243 en/git-switch.txt:36
#, no-wrap, priority:240
msgid "<branch>"
msgstr ""
@@ -12423,7 +12441,7 @@ msgid "This option determines how the commit message will be cleaned up before b
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:65 en/git-clean.txt:61
+#: en/git-cherry-pick.txt:65 en/git-clean.txt:63
#, ignore-same, no-wrap, priority:100
msgid "-x"
msgstr "-x"
@@ -12507,7 +12525,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:249 en/git-rebase.txt:532
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:267 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12531,7 +12549,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:282 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:109
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12549,7 +12567,7 @@ msgid "-X<option>"
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:125
#, no-wrap, priority:240
msgid "--strategy-option=<option>"
msgstr ""
@@ -12745,7 +12763,7 @@ msgid "Show the commit subjects next to the SHA1s."
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:32 en/git-rebase.txt:220
+#: en/git-cherry.txt:32 en/git-rebase.txt:238
#, no-wrap, priority:100
msgid "<upstream>"
msgstr ""
@@ -12763,7 +12781,7 @@ msgid "<head>"
msgstr ""
#. type: Plain text
-#: en/git-cherry.txt:38 en/git-rebase.txt:227
+#: en/git-cherry.txt:38 en/git-rebase.txt:245
#, priority:100
msgid "Working branch; defaults to HEAD."
msgstr ""
@@ -12976,85 +12994,85 @@ msgid "If any optional `<path>...` arguments are given, only those paths are aff
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:33
+#: en/git-clean.txt:35
#, priority:100
-msgid "Remove untracked directories in addition to untracked files. If an untracked directory is managed by a different Git repository, it is not removed by default. Use -f option twice if you really want to remove such a directory."
+msgid "Normally, when no <path> is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. If any paths are specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under `--force`) will be removed."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:41
+#: en/git-clean.txt:43
#, priority:100
-msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f, -n or -i. Git will refuse to delete directories with .git sub directory or file unless a second -f is given."
+msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f or -i. Git will refuse to modify untracked nested git repositories (directories with a .git subdirectory) unless a second -f is given."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:46
+#: en/git-clean.txt:48
#, priority:100
msgid "Show what would be done and clean files interactively. See ``Interactive mode'' for details."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:50
+#: en/git-clean.txt:52
#, priority:100
msgid "Don't actually remove anything, just show what would be done."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:55
+#: en/git-clean.txt:57
#, priority:100
msgid "Be quiet, only report errors, but not the files that are successfully removed."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:56
+#: en/git-clean.txt:58
#, no-wrap, priority:100
msgid "-e <pattern>"
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:57 en/git-ls-files.txt:85 en/git-name-rev.txt:33
+#: en/git-clean.txt:59 en/git-ls-files.txt:85 en/git-name-rev.txt:33
#, no-wrap, priority:100
msgid "--exclude=<pattern>"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:60
+#: en/git-clean.txt:62
#, priority:100
msgid "Use the given exclude pattern in addition to the standard ignore rules (see linkgit:gitignore[5])."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:68
+#: en/git-clean.txt:70
#, priority:100
msgid "Don't use the standard ignore rules (see linkgit:gitignore[5]), but still use the ignore rules given with `-e` options from the command line. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git restore' or 'git reset') to create a pristine working directory to test a clean build."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:69
+#: en/git-clean.txt:71
#, no-wrap, priority:100
msgid "-X"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:72
+#: en/git-clean.txt:74
#, priority:100
msgid "Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files."
msgstr ""
#. type: Title -
-#: en/git-clean.txt:74
+#: en/git-clean.txt:76
#, no-wrap, priority:100
msgid "Interactive mode"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:78
+#: en/git-clean.txt:80
#, priority:100
msgid "When the command enters the interactive mode, it shows the files and directories to be cleaned, and goes into its interactive command loop."
msgstr ""
#. type: delimited block -
-#: en/git-clean.txt:89
+#: en/git-clean.txt:91
#, no-wrap, priority:100
msgid ""
" *** Commands ***\n"
@@ -13064,91 +13082,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:92
+#: en/git-clean.txt:94
#, priority:100
msgid "You also could say `c` or `clean` above as long as the choice is unique."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:94
+#: en/git-clean.txt:96
#, priority:100
msgid "The main command loop has 6 subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:95
+#: en/git-clean.txt:97
#, no-wrap, priority:100
msgid "clean"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:98
+#: en/git-clean.txt:100
#, priority:100
msgid "Start cleaning files and directories, and then quit."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:99
+#: en/git-clean.txt:101
#, no-wrap, priority:100
msgid "filter by pattern"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:107
+#: en/git-clean.txt:109
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Input ignore patterns>>\" prompt. You can input space-separated patterns to exclude files and directories from deletion. E.g. \"*.c *.h\" will excludes files end with \".c\" and \".h\" from deletion. When you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:108
+#: en/git-clean.txt:110
#, no-wrap, priority:100
msgid "select by numbers"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:119
+#: en/git-clean.txt:121
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Select items to delete>>\" prompt. When the prompt ends with double '>>' like this, you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything. Also when you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:120
+#: en/git-clean.txt:122
#, no-wrap, priority:100
msgid "ask each"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:125
+#: en/git-clean.txt:127
#, priority:100
msgid "This will start to clean, and you must confirm one by one in order to delete items. Please note that this action is not as efficient as the above two actions."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:126
+#: en/git-clean.txt:128
#, no-wrap, priority:100
msgid "quit"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:129
+#: en/git-clean.txt:131
#, priority:100
msgid "This lets you quit without do cleaning."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:130
+#: en/git-clean.txt:132
#, no-wrap, priority:100
msgid "help"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:133
+#: en/git-clean.txt:135
#, priority:100
msgid "Show brief usage of interactive git-clean."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:137 en/git-status.txt:436
+#: en/git-clean.txt:139 en/git-status.txt:440
#, ignore-same, priority:280
msgid "linkgit:gitignore[5]"
msgstr "linkgit:gitignore[5]"
@@ -13287,7 +13305,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:108 en/git-submodule.txt:392
+#: en/git-clone.txt:108 en/git-submodule.txt:393
#, ignore-same, no-wrap, priority:300
msgid "--dissociate"
msgstr "--dissociate"
@@ -13533,13 +13551,13 @@ msgid "Instead of placing the cloned repository where it is supposed to be, plac
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:277 en/git-submodule.txt:416
+#: en/git-clone.txt:277 en/git-submodule.txt:417
#, no-wrap, priority:300
msgid "-j <n>"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:278 en/git-submodule.txt:417
+#: en/git-clone.txt:278 en/git-submodule.txt:418
#, no-wrap, priority:300
msgid "--jobs <n>"
msgstr ""
@@ -13897,7 +13915,7 @@ msgid "Read the commit log message from the given file. Use `-` to read from the
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:68 en/git-commit.txt:339
+#: en/git-commit-tree.txt:68 en/git-commit.txt:341
#, ignore-same, no-wrap, priority:280
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
@@ -13981,7 +13999,7 @@ msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:477 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:428 en/git-svn.txt:1156
+#: en/git-commit-tree.txt:114 en/git-commit.txt:479 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:429 en/git-svn.txt:1156
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
@@ -14287,13 +14305,13 @@ msgid "When editing the commit message, start the editor with the contents in th
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:173 en/merge-options.txt:81
+#: en/git-commit.txt:173 en/merge-options.txt:85
#, priority:280
msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:175 en/git-rebase.txt:330
+#: en/git-commit.txt:175 en/git-rebase.txt:348 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14500,115 +14518,115 @@ msgid "Show untracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:288
+#: en/git-commit.txt:289
#, priority:280
msgid "The mode parameter is optional (defaults to 'all'), and is used to specify the handling of untracked files; when -u is not used, the default is 'normal', i.e. show untracked files and directories."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:290 en/git-status.txt:67 en/git-status.txt:107
+#: en/git-commit.txt:291 en/git-status.txt:68 en/git-status.txt:110
#, priority:280
msgid "The possible options are:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:292
+#: en/git-commit.txt:293
#, no-wrap, priority:280
msgid "'no' - Show no untracked files\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:293
+#: en/git-commit.txt:294
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:294 en/git-status.txt:71
+#: en/git-commit.txt:295 en/git-status.txt:72
#, no-wrap, priority:280
msgid "'all' - Also shows individual files in untracked directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:297 en/git-status.txt:84
+#: en/git-commit.txt:298 en/git-status.txt:85
#, priority:280
msgid "The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:308
+#: en/git-commit.txt:310
#, priority:280
msgid "Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template to help the user describe the commit by reminding what changes the commit has. Note that this diff output doesn't have its lines prefixed with '#'. This diff will not be a part of the commit message. See the `commit.verbose` configuration variable in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:312
+#: en/git-commit.txt:314
#, priority:280
msgid "If specified twice, show in addition the unified diff between what would be committed and the worktree files, i.e. the unstaged changes to tracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:316
+#: en/git-commit.txt:318
#, priority:280
msgid "Suppress commit summary message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:321
+#: en/git-commit.txt:323
#, priority:280
msgid "Do not create a commit, but show a list of paths that are to be committed, paths with local changes that will be left uncommitted and paths that are untracked."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:322
+#: en/git-commit.txt:324
#, ignore-same, no-wrap, priority:280
msgid "--status"
msgstr "--status"
#. type: Plain text
-#: en/git-commit.txt:327
+#: en/git-commit.txt:329
#, priority:280
msgid "Include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the commit message. Defaults to on, but can be used to override configuration variable commit.status."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:328
+#: en/git-commit.txt:330
#, ignore-same, no-wrap, priority:280
msgid "--no-status"
msgstr "--no-status"
#. type: Plain text
-#: en/git-commit.txt:332
+#: en/git-commit.txt:334
#, priority:280
msgid "Do not include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the default commit message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:342
+#: en/git-commit.txt:344
#, priority:280
msgid "Countermand `commit.gpgSign` configuration variable that is set to force each and every commit to be signed."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:346 en/git-rm.txt:29
+#: en/git-commit.txt:348 en/git-rm.txt:29
#, ignore-ellipsis, no-wrap, priority:280
msgid "<file>..."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:352
+#: en/git-commit.txt:354
#, priority:280
msgid "When files are given on the command line, the command commits the contents of the named files, without recording the changes already staged. The contents of these files are also staged for the next commit on top of what have been staged before."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:369
+#: en/git-commit.txt:371
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:375
+#: en/git-commit.txt:377
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14618,13 +14636,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:383
+#: en/git-commit.txt:385
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:388
+#: en/git-commit.txt:390
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14633,19 +14651,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:393
+#: en/git-commit.txt:395
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:398
+#: en/git-commit.txt:400
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:404
+#: en/git-commit.txt:406
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14655,31 +14673,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:411
+#: en/git-commit.txt:413
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:414 en/git-commit.txt:440
+#: en/git-commit.txt:416 en/git-commit.txt:442
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:418
+#: en/git-commit.txt:420
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:426
+#: en/git-commit.txt:428
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:432
+#: en/git-commit.txt:434
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14689,55 +14707,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:437
+#: en/git-commit.txt:439
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:448
+#: en/git-commit.txt:450
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:460
+#: en/git-commit.txt:462
#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:464
+#: en/git-commit.txt:466
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:469
+#: en/git-commit.txt:471
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:475
+#: en/git-commit.txt:477
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:479
+#: en/git-commit.txt:481
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:485
+#: en/git-commit.txt:487
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:493
+#: en/git-commit.txt:495
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -15405,211 +15423,211 @@ msgstr ""
msgid "Given a .git/config like this:"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:347
+#. type: delimited block -
+#: en/git-config.txt:348
#, no-wrap, priority:100
msgid ""
-"\t#\n"
-"\t# This is the config file, and\n"
-"\t# a '#' or ';' character indicates\n"
-"\t# a comment\n"
-"\t#\n"
+"#\n"
+"# This is the config file, and\n"
+"# a '#' or ';' character indicates\n"
+"# a comment\n"
+"#\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:352
+#. type: delimited block -
+#: en/git-config.txt:353 en/git.txt:310
#, no-wrap, priority:100
msgid ""
-"\t; core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"; core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:357
+#. type: delimited block -
+#: en/git-config.txt:358
#, no-wrap, priority:100
msgid ""
-"\t; Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"; Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:362
+#. type: delimited block -
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
-"\t; Proxy settings\n"
-"\t[core]\n"
-"\t\tgitproxy=proxy-command for kernel.org\n"
-"\t\tgitproxy=default-proxy ; for all the rest\n"
+"; Proxy settings\n"
+"[core]\n"
+"\tgitproxy=proxy-command for kernel.org\n"
+"\tgitproxy=default-proxy ; for all the rest\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:369
+#. type: delimited block -
+#: en/git-config.txt:370
#, no-wrap, priority:100
msgid ""
-"\t; HTTP\n"
-"\t[http]\n"
-"\t\tsslVerify\n"
-"\t[http \"https://weak.example.com\"]\n"
-"\t\tsslVerify = false\n"
-"\t\tcookieFile = /tmp/cookie.txt\n"
+"; HTTP\n"
+"[http]\n"
+"\tsslVerify\n"
+"[http \"https://weak.example.com\"]\n"
+"\tsslVerify = false\n"
+"\tcookieFile = /tmp/cookie.txt\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:371
+#: en/git-config.txt:373
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:374
+#: en/git-config.txt:376
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:379
+#: en/git-config.txt:381
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:382
+#: en/git-config.txt:384
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:385
+#: en/git-config.txt:387
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:389
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:390
+#: en/git-config.txt:392
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:394
+#: en/git-config.txt:396
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:398
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:399
+#: en/git-config.txt:401
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:402 en/git-gui.txt:120 en/git-merge-index.txt:64
+#: en/git-config.txt:404 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:407
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:410
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:413
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:414
+#: en/git-config.txt:416
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:417
+#: en/git-config.txt:419
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:421
+#: en/git-config.txt:423
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:424
+#: en/git-config.txt:426
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:428
+#: en/git-config.txt:430
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:431
+#: en/git-config.txt:433
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:434
+#: en/git-config.txt:436
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:437
+#: en/git-config.txt:439
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:440
+#: en/git-config.txt:442
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:443
+#: en/git-config.txt:445
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:447
+#: en/git-config.txt:449
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:453
+#: en/git-config.txt:455
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15619,13 +15637,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:457
+#: en/git-config.txt:459
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:466
+#: en/git-config.txt:468
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15638,19 +15656,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:471 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1029 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
+#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:476
+#: en/git-config.txt:478
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:482
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15658,13 +15676,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:483
+#: en/git-config.txt:485
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:488
+#: en/git-config.txt:490
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -17027,7 +17045,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
msgstr ""
#. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:234
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
#, no-wrap, priority:100
msgid "LIMITATIONS"
msgstr ""
@@ -18532,7 +18550,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:976
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:992
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19084,7 +19102,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:422
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:423
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -19180,13 +19198,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:982
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:998
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:988
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1004
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -19541,9 +19559,9 @@ msgid "This program dumps the given revisions in a form suitable to be piped int
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:22
+#: en/git-fast-export.txt:23
#, priority:100
-msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a kind of an interactive 'git filter-branch'."
+msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
@@ -19630,146 +19648,158 @@ msgstr ""
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
+#. type: Labeled list
+#: en/git-fast-export.txt:79
+#, ignore-same, no-wrap, priority:100
+msgid "--mark-tags"
+msgstr "--mark-tags"
+
+#. type: Plain text
+#: en/git-fast-export.txt:87
+#, priority:100
+msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
+msgstr ""
+
#. type: Plain text
-#: en/git-fast-export.txt:83
+#: en/git-fast-export.txt:92
#, priority:100
-msgid "Any commits that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
+msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:84
+#: en/git-fast-export.txt:93
#, ignore-same, no-wrap, priority:100
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
-#: en/git-fast-export.txt:89
+#: en/git-fast-export.txt:98
#, priority:100
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:90
+#: en/git-fast-export.txt:99
#, ignore-same, no-wrap, priority:100
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
-#: en/git-fast-export.txt:93
+#: en/git-fast-export.txt:102
#, priority:100
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:94
+#: en/git-fast-export.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
-#: en/git-fast-export.txt:101
+#: en/git-fast-export.txt:110
#, priority:100
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
+#: en/git-fast-export.txt:111 en/git-ls-tree.txt:72
#, ignore-same, no-wrap, priority:100
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
-#: en/git-fast-export.txt:107
+#: en/git-fast-export.txt:116
#, priority:100
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:108
+#: en/git-fast-export.txt:117
#, ignore-same, no-wrap, priority:100
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
-#: en/git-fast-export.txt:112
+#: en/git-fast-export.txt:121
#, priority:100
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:113
+#: en/git-fast-export.txt:122
#, ignore-same, no-wrap, priority:100
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
-#: en/git-fast-export.txt:124
+#: en/git-fast-export.txt:133
#, priority:100
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:125
+#: en/git-fast-export.txt:134
#, ignore-same, no-wrap, priority:100
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
-#: en/git-fast-export.txt:131
+#: en/git-fast-export.txt:140
#, priority:100
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:132
+#: en/git-fast-export.txt:141
#, no-wrap, priority:100
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:138
+#: en/git-fast-export.txt:147
#, priority:100
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be reencoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:139
+#: en/git-fast-export.txt:148
#, ignore-same, no-wrap, priority:100
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
-#: en/git-fast-export.txt:142
+#: en/git-fast-export.txt:151
#, priority:100
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:143
+#: en/git-fast-export.txt:152
#, ignore-ellipsis, no-wrap, priority:100
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:160
#, priority:100
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:157
+#: en/git-fast-export.txt:166
#, no-wrap, priority:100
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:162
+#: en/git-fast-export.txt:171
#, priority:100
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:167
+#: en/git-fast-export.txt:176
#, no-wrap, priority:100
msgid ""
"$ git fast-export master~5..master |\n"
@@ -19778,55 +19808,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:180
#, priority:100
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:175
+#: en/git-fast-export.txt:184
#, priority:100
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
-#: en/git-fast-export.txt:178
+#: en/git-fast-export.txt:187
#, no-wrap, priority:100
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:186
+#: en/git-fast-export.txt:195
#, priority:100
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:198
+#: en/git-fast-export.txt:207
#, priority:100
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:201
+#: en/git-fast-export.txt:210
#, priority:100
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:204
+#: en/git-fast-export.txt:213
#, no-wrap, priority:100
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:209
+#: en/git-fast-export.txt:218
#, priority:100
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:215
+#: en/git-fast-export.txt:224
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git init anon-repo\n"
@@ -19836,25 +19866,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:222
+#: en/git-fast-export.txt:231
#, priority:100
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:225
+#: en/git-fast-export.txt:234
#, no-wrap, priority:100
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:240
#, priority:100
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:239
+#: en/git-fast-export.txt:248
#, priority:100
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
@@ -20088,7 +20118,7 @@ msgid "See linkgit:git-config[1]"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:144 en/git-p4.txt:507
+#: en/git-fast-import.txt:144 en/git-filter-branch.txt:463 en/git-p4.txt:507
#, no-wrap, priority:100
msgid "PERFORMANCE"
msgstr ""
@@ -20322,7 +20352,7 @@ msgid "fast-import accepts several commands to update the current repository and
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:319 en/git-fast-import.txt:381
+#: en/git-fast-import.txt:319 en/git-fast-import.txt:388
#, ignore-same, no-wrap, priority:100
msgid "`commit`"
msgstr "`commit`"
@@ -20334,7 +20364,7 @@ msgid "Creates a new branch or updates an existing branch by creating a new comm
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:324 en/git-fast-import.txt:771
+#: en/git-fast-import.txt:324 en/git-fast-import.txt:778
#, ignore-same, no-wrap, priority:100
msgid "`tag`"
msgstr "`tag`"
@@ -20346,7 +20376,7 @@ msgid "Creates an annotated tag object from an existing commit or branch. Light
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:330 en/git-fast-import.txt:815
+#: en/git-fast-import.txt:330 en/git-fast-import.txt:823
#, ignore-same, no-wrap, priority:100
msgid "`reset`"
msgstr "`reset`"
@@ -20358,7 +20388,7 @@ msgid "Reset an existing branch (or a new branch) to a specific revision. This
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:335 en/git-fast-import.txt:844
+#: en/git-fast-import.txt:335 en/git-fast-import.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`blob`"
msgstr "`blob`"
@@ -20370,109 +20400,121 @@ msgid "Convert raw file data into a blob, for future use in a `commit` command.
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:340 en/git-fast-import.txt:917
+#: en/git-fast-import.txt:340 en/git-fast-import.txt:925
+#, ignore-same, no-wrap, priority:100
+msgid "`alias`"
+msgstr "`alias`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:346
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
+msgstr ""
+
+#. type: Title ~
+#: en/git-fast-import.txt:347 en/git-fast-import.txt:940
#, ignore-same, no-wrap, priority:100
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
-#: en/git-fast-import.txt:345
+#: en/git-fast-import.txt:352
#, priority:100
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:346 en/git-fast-import.txt:945
+#: en/git-fast-import.txt:353 en/git-fast-import.txt:968
#, ignore-same, no-wrap, priority:100
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
-#: en/git-fast-import.txt:350
+#: en/git-fast-import.txt:357
#, priority:100
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:351 en/git-fast-import.txt:1152
+#: en/git-fast-import.txt:358 en/git-fast-import.txt:1175
#, ignore-same, no-wrap, priority:100
msgid "`done`"
msgstr "`done`"
#. type: Plain text
-#: en/git-fast-import.txt:355
+#: en/git-fast-import.txt:362
#, priority:100
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:356 en/git-fast-import.txt:970
+#: en/git-fast-import.txt:363 en/git-fast-import.txt:993
#, ignore-same, no-wrap, priority:100
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
-#: en/git-fast-import.txt:360
+#: en/git-fast-import.txt:367
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:361 en/git-fast-import.txt:985
+#: en/git-fast-import.txt:368 en/git-fast-import.txt:1008
#, ignore-same, no-wrap, priority:100
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
-#: en/git-fast-import.txt:365
+#: en/git-fast-import.txt:372
#, priority:100
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:366 en/git-fast-import.txt:1016
+#: en/git-fast-import.txt:373 en/git-fast-import.txt:1039
#, ignore-same, no-wrap, priority:100
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
-#: en/git-fast-import.txt:370
+#: en/git-fast-import.txt:377
#, priority:100
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:371 en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:378 en/git-fast-import.txt:1092
#, ignore-same, no-wrap, priority:100
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
#, priority:100
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:1124
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:1147
#, ignore-same, no-wrap, priority:100
msgid "`option`"
msgstr "`option`"
#. type: Plain text
-#: en/git-fast-import.txt:379
+#: en/git-fast-import.txt:386
#, priority:100
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:384
+#: en/git-fast-import.txt:391
#, priority:100
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
#, no-wrap, priority:100
msgid ""
"\t'commit' SP <ref> LF\n"
@@ -20483,247 +20525,247 @@ msgid ""
"\t('encoding' SP <encoding>)?\n"
"\tdata\n"
"\t('from' SP <commit-ish> LF)?\n"
-"\t('merge' SP <commit-ish> LF)?\n"
+"\t('merge' SP <commit-ish> LF)*\n"
"\t(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*\n"
"\tLF?\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:405
+#: en/git-fast-import.txt:412
#, priority:100
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:411
+#: en/git-fast-import.txt:418
#, priority:100
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:417
+#: en/git-fast-import.txt:424
#, priority:100
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:425
+#: en/git-fast-import.txt:432
#, priority:100
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:432
+#: en/git-fast-import.txt:439
#, priority:100
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:434
+#: en/git-fast-import.txt:441
#, ignore-same, no-wrap, priority:100
msgid "`author`"
msgstr "`author`"
#. type: Plain text
-#: en/git-fast-import.txt:440
+#: en/git-fast-import.txt:447
#, priority:100
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:442
+#: en/git-fast-import.txt:449
#, ignore-same, no-wrap, priority:100
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
-#: en/git-fast-import.txt:445
+#: en/git-fast-import.txt:452
#, priority:100
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
#, priority:100
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:458
+#: en/git-fast-import.txt:465
#, priority:100
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:460
+#: en/git-fast-import.txt:467
#, ignore-same, no-wrap, priority:100
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
-#: en/git-fast-import.txt:464
+#: en/git-fast-import.txt:471
#, priority:100
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:466
+#: en/git-fast-import.txt:473
#, ignore-same, no-wrap, priority:100
msgid "`from`"
msgstr "`from`"
#. type: Plain text
-#: en/git-fast-import.txt:472
+#: en/git-fast-import.txt:479
#, priority:100
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
#, priority:100
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:485
+#: en/git-fast-import.txt:492
#, priority:100
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
#, priority:100
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:491
+#: en/git-fast-import.txt:498
#, priority:100
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:493
+#: en/git-fast-import.txt:500
#, priority:100
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:499
+#: en/git-fast-import.txt:506
#, priority:100
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:501
+#: en/git-fast-import.txt:508
#, priority:100
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:503
+#: en/git-fast-import.txt:510
#, priority:100
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
#, priority:100
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:509
+#: en/git-fast-import.txt:516
#, priority:100
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:512
+#: en/git-fast-import.txt:519
#, priority:100
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
#, no-wrap, priority:100
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:521
+#: en/git-fast-import.txt:528
#, priority:100
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:523
+#: en/git-fast-import.txt:530
#, ignore-same, no-wrap, priority:100
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
-#: en/git-fast-import.txt:531
+#: en/git-fast-import.txt:538
#, priority:100
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:534
+#: en/git-fast-import.txt:541
#, priority:100
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:536
+#: en/git-fast-import.txt:543
#, ignore-same, no-wrap, priority:100
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:540
+#: en/git-fast-import.txt:547
#, priority:100
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:541 en/git-fast-import.txt:708
+#: en/git-fast-import.txt:548 en/git-fast-import.txt:715
#, no-wrap, priority:100
msgid "External data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:544
+#: en/git-fast-import.txt:551
#, priority:100
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:547
+#: en/git-fast-import.txt:554
#, no-wrap, priority:100
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
#, priority:100
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:555 en/git-fast-import.txt:721
+#: en/git-fast-import.txt:562 en/git-fast-import.txt:728
#, no-wrap, priority:100
msgid "Inline data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:559
+#: en/git-fast-import.txt:566
#, priority:100
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
#, no-wrap, priority:100
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -20731,259 +20773,259 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:566 en/git-fast-import.txt:732
+#: en/git-fast-import.txt:573 en/git-fast-import.txt:739
#, priority:100
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:569
+#: en/git-fast-import.txt:576
#, priority:100
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
#, priority:100
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:574
+#: en/git-fast-import.txt:581
#, priority:100
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:575
+#: en/git-fast-import.txt:582
#, priority:100
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
#, priority:100
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:580
+#: en/git-fast-import.txt:587
#, priority:100
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:583
+#: en/git-fast-import.txt:590
#, priority:100
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:587
+#: en/git-fast-import.txt:594
#, priority:100
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:594
+#: en/git-fast-import.txt:601
#, priority:100
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
#, priority:100
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:598
+#: en/git-fast-import.txt:605
#, priority:100
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:599
+#: en/git-fast-import.txt:606
#, priority:100
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:600
+#: en/git-fast-import.txt:607
#, priority:100
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:602
+#: en/git-fast-import.txt:609
#, priority:100
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:604
+#: en/git-fast-import.txt:611
#, priority:100
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:606
+#: en/git-fast-import.txt:613
#, priority:100
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:608
+#: en/git-fast-import.txt:615
#, ignore-same, no-wrap, priority:100
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
-#: en/git-fast-import.txt:614
+#: en/git-fast-import.txt:621
#, priority:100
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
#, no-wrap, priority:100
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
#, priority:100
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:624
+#: en/git-fast-import.txt:631
#, ignore-same, no-wrap, priority:100
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
#, priority:100
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:632
+#: en/git-fast-import.txt:639
#, no-wrap, priority:100
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:638 en/git-fast-import.txt:658
+#: en/git-fast-import.txt:645 en/git-fast-import.txt:665
#, priority:100
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:643
+#: en/git-fast-import.txt:650
#, priority:100
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:645
+#: en/git-fast-import.txt:652
#, ignore-same, no-wrap, priority:100
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
-#: en/git-fast-import.txt:649
+#: en/git-fast-import.txt:656
#, priority:100
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:652
+#: en/git-fast-import.txt:659
#, no-wrap, priority:100
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:663
+#: en/git-fast-import.txt:670
#, priority:100
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:672
+#: en/git-fast-import.txt:679
#, priority:100
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
-#: en/git-fast-import.txt:679
+#: en/git-fast-import.txt:686
#, priority:100
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:682
+#: en/git-fast-import.txt:689
#, no-wrap, priority:100
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:688
+#: en/git-fast-import.txt:695
#, priority:100
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:696
+#: en/git-fast-import.txt:703
#, priority:100
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:698
+#: en/git-fast-import.txt:705
#, ignore-same, no-wrap, priority:100
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:707
+#: en/git-fast-import.txt:714
#, priority:100
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:712
+#: en/git-fast-import.txt:719
#, priority:100
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:715
+#: en/git-fast-import.txt:722
#, no-wrap, priority:100
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:720
+#: en/git-fast-import.txt:727
#, priority:100
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:725
+#: en/git-fast-import.txt:732
#, priority:100
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:729
+#: en/git-fast-import.txt:736
#, no-wrap, priority:100
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -20991,76 +21033,77 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:735
+#: en/git-fast-import.txt:742
#, priority:100
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:737
+#: en/git-fast-import.txt:744
#, ignore-same, no-wrap, priority:100
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
-#: en/git-fast-import.txt:743
+#: en/git-fast-import.txt:750
#, priority:100
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:746
+#: en/git-fast-import.txt:753
#, no-wrap, priority:100
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:752
+#: en/git-fast-import.txt:759
#, priority:100
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:756
+#: en/git-fast-import.txt:763
#, priority:100
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:758
+#: en/git-fast-import.txt:765
#, ignore-same, no-wrap, priority:100
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
-#: en/git-fast-import.txt:763
+#: en/git-fast-import.txt:770
#, priority:100
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:766
+#: en/git-fast-import.txt:773
#, no-wrap, priority:100
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:769
+#: en/git-fast-import.txt:776
#, priority:100
msgid "where `<object-identifer>` is any string not containing LF."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:774
+#: en/git-fast-import.txt:781
#, priority:100
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:781
+#: en/git-fast-import.txt:789
#, no-wrap, priority:100
msgid ""
"\t'tag' SP <name> LF\n"
+"\tmark?\n"
"\t'from' SP <commit-ish> LF\n"
"\toriginal-oid?\n"
"\t'tagger' (SP <name>)? SP LT <email> GT SP <when> LF\n"
@@ -21068,55 +21111,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:784
+#: en/git-fast-import.txt:792
#, priority:100
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:789
+#: en/git-fast-import.txt:797
#, priority:100
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:793
+#: en/git-fast-import.txt:801
#, priority:100
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:796
+#: en/git-fast-import.txt:804
#, priority:100
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:799
+#: en/git-fast-import.txt:807
#, priority:100
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:813
#, priority:100
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:813
+#: en/git-fast-import.txt:821
#, priority:100
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:820
+#: en/git-fast-import.txt:828
#, priority:100
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:825
+#: en/git-fast-import.txt:833
#, no-wrap, priority:100
msgid ""
"\t'reset' SP <ref> LF\n"
@@ -21125,25 +21168,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:829
+#: en/git-fast-import.txt:837
#, priority:100
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:831 en/git-fast-import.txt:943
+#: en/git-fast-import.txt:839 en/git-fast-import.txt:966
#, priority:100
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:834
+#: en/git-fast-import.txt:842
#, priority:100
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:838
+#: en/git-fast-import.txt:846
#, no-wrap, priority:100
msgid ""
"\treset refs/tags/938\n"
@@ -21151,19 +21194,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:850
#, priority:100
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:849
+#: en/git-fast-import.txt:857
#, priority:100
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:855
+#: en/git-fast-import.txt:863
#, no-wrap, priority:100
msgid ""
"\t'blob' LF\n"
@@ -21173,43 +21216,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:861
+#: en/git-fast-import.txt:869
#, priority:100
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:871
#, ignore-same, no-wrap, priority:100
msgid "`data`"
msgstr "`data`"
#. type: Plain text
-#: en/git-fast-import.txt:870
+#: en/git-fast-import.txt:878
#, priority:100
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:875
+#: en/git-fast-import.txt:883
#, priority:100
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:876
+#: en/git-fast-import.txt:884
#, no-wrap, priority:100
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:878
+#: en/git-fast-import.txt:886
#, priority:100
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:882
+#: en/git-fast-import.txt:890
#, no-wrap, priority:100
msgid ""
"\t'data' SP <count> LF\n"
@@ -21217,31 +21260,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:888
+#: en/git-fast-import.txt:896
#, priority:100
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:893
+#: en/git-fast-import.txt:901
#, priority:100
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:894
+#: en/git-fast-import.txt:902
#, no-wrap, priority:100
msgid "Delimited format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:899
+#: en/git-fast-import.txt:907
#, priority:100
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:905
+#: en/git-fast-import.txt:913
#, no-wrap, priority:100
msgid ""
"\t'data' SP '<<' <delim> LF\n"
@@ -21251,25 +21294,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:921
#, priority:100
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:915
+#: en/git-fast-import.txt:923
#, priority:100
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:920
+#: en/git-fast-import.txt:928
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object."
+msgstr ""
+
+#. type: delimited block .
+#: en/git-fast-import.txt:934
+#, no-wrap, priority:100
+msgid ""
+"\t'alias' LF\n"
+"\tmark\n"
+"\t'to' SP <commit-ish> LF\n"
+"\tLF?\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:937
+#, priority:100
+msgid "For a detailed description of `<commit-ish>` see above under `from`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:943
#, priority:100
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:924
+#: en/git-fast-import.txt:947
#, no-wrap, priority:100
msgid ""
"\t'checkpoint' LF\n"
@@ -21277,31 +21342,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:930
+#: en/git-fast-import.txt:953
#, priority:100
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:935
+#: en/git-fast-import.txt:958
#, priority:100
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:941
+#: en/git-fast-import.txt:964
#, priority:100
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:950
+#: en/git-fast-import.txt:973
#, priority:100
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:954
+#: en/git-fast-import.txt:977
#, no-wrap, priority:100
msgid ""
"\t'progress' SP <any> LF\n"
@@ -21309,67 +21374,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:960
+#: en/git-fast-import.txt:983
#, priority:100
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:986
#, no-wrap, priority:100
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:968
+#: en/git-fast-import.txt:991
#, priority:100
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:976
+#: en/git-fast-import.txt:999
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:979
+#: en/git-fast-import.txt:1002
#, no-wrap, priority:100
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:983 en/git-fast-import.txt:1014 en/git-fast-import.txt:1067
+#: en/git-fast-import.txt:1006 en/git-fast-import.txt:1037 en/git-fast-import.txt:1090
#, priority:100
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:991
+#: en/git-fast-import.txt:1014
#, priority:100
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:994
+#: en/git-fast-import.txt:1017
#, no-wrap, priority:100
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1022
#, priority:100
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:1024
#, priority:100
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1005
+#: en/git-fast-import.txt:1028
#, no-wrap, priority:100
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21377,283 +21442,283 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1011
+#: en/git-fast-import.txt:1034
#, priority:100
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1022
+#: en/git-fast-import.txt:1045
#, priority:100
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1025
+#: en/git-fast-import.txt:1048
#, priority:100
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1049
#, no-wrap, priority:100
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1030
+#: en/git-fast-import.txt:1053
#, priority:100
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1033
+#: en/git-fast-import.txt:1056
#, no-wrap, priority:100
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1035
+#: en/git-fast-import.txt:1058
#, no-wrap, priority:100
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1041
+#: en/git-fast-import.txt:1064
#, priority:100
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1044
+#: en/git-fast-import.txt:1067
#, no-wrap, priority:100
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1047
+#: en/git-fast-import.txt:1070
#, priority:100
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1072
#, priority:100
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1075
#, no-wrap, priority:100
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1080
#, priority:100
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1060
+#: en/git-fast-import.txt:1083
#, priority:100
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1086
#, no-wrap, priority:100
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1072
+#: en/git-fast-import.txt:1095
#, priority:100
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1075
+#: en/git-fast-import.txt:1098
#, no-wrap, priority:100
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1078
+#: en/git-fast-import.txt:1101
#, priority:100
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1079 en/git-fast-import.txt:1146
+#: en/git-fast-import.txt:1102 en/git-fast-import.txt:1169
#, no-wrap, priority:100
msgid "date-format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1080 en/git-fast-import.txt:1148
+#: en/git-fast-import.txt:1103 en/git-fast-import.txt:1171
#, no-wrap, priority:100
msgid "export-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1081
+#: en/git-fast-import.txt:1104
#, no-wrap, priority:100
msgid "relative-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1082
+#: en/git-fast-import.txt:1105
#, no-wrap, priority:100
msgid "no-relative-marks"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1083 en/git-fast-import.txt:1150
+#: en/git-fast-import.txt:1106 en/git-fast-import.txt:1173
#, no-wrap, priority:100
msgid "force"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1087
+#: en/git-fast-import.txt:1110
#, priority:100
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1088 en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1111 en/git-fast-import.txt:1170
#, no-wrap, priority:100
msgid "import-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1089
+#: en/git-fast-import.txt:1112
#, no-wrap, priority:100
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1097
+#: en/git-fast-import.txt:1120
#, priority:100
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1098
+#: en/git-fast-import.txt:1121
#, no-wrap, priority:100
msgid "get-mark"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1122
#, no-wrap, priority:100
msgid "cat-blob"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1100
+#: en/git-fast-import.txt:1123
#, no-wrap, priority:100
msgid "ls"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1108
+#: en/git-fast-import.txt:1131
#, priority:100
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1109
+#: en/git-fast-import.txt:1132
#, no-wrap, priority:100
msgid "notes"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1114
+#: en/git-fast-import.txt:1137
#, priority:100
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1138
#, no-wrap, priority:100
msgid "done"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1122
+#: en/git-fast-import.txt:1145
#, priority:100
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1129
+#: en/git-fast-import.txt:1152
#, priority:100
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1132
+#: en/git-fast-import.txt:1155
#, no-wrap, priority:100
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1137
+#: en/git-fast-import.txt:1160
#, priority:100
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1141
+#: en/git-fast-import.txt:1164
#, priority:100
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1144
+#: en/git-fast-import.txt:1167
#, priority:100
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1149
+#: en/git-fast-import.txt:1172
#, priority:100
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1178
#, priority:100
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1159
+#: en/git-fast-import.txt:1182
#, priority:100
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1161
+#: en/git-fast-import.txt:1184
#, no-wrap, priority:100
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1168
+#: en/git-fast-import.txt:1191
#, priority:100
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1175
+#: en/git-fast-import.txt:1198
#, priority:100
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1203
#, no-wrap, priority:100
msgid ""
"\tmkfifo fast-import-output\n"
@@ -21662,49 +21727,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1184
+#: en/git-fast-import.txt:1207
#, priority:100
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1188
+#: en/git-fast-import.txt:1211
#, priority:100
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1213
#, no-wrap, priority:100
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1196
+#: en/git-fast-import.txt:1219
#, priority:100
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1203
+#: en/git-fast-import.txt:1226
#, priority:100
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1211
+#: en/git-fast-import.txt:1234
#, priority:100
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1236
#, priority:100
msgid "An example crash:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1229
+#: en/git-fast-import.txt:1252
#, no-wrap, priority:100
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
@@ -21724,7 +21789,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1256
#, no-wrap, priority:100
msgid ""
"\t$ git fast-import <in\n"
@@ -21733,7 +21798,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1239
+#: en/git-fast-import.txt:1262
#, no-wrap, priority:100
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
@@ -21744,13 +21809,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1241
+#: en/git-fast-import.txt:1264
#, no-wrap, priority:100
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1251
+#: en/git-fast-import.txt:1274
#, no-wrap, priority:100
msgid ""
"\tMost Recent Commands Before Crash\n"
@@ -21765,13 +21830,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1252
+#: en/git-fast-import.txt:1275
#, no-wrap, priority:100
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1255
+#: en/git-fast-import.txt:1278
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
@@ -21779,25 +21844,25 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1256
+#: en/git-fast-import.txt:1279
#, no-wrap, priority:100
msgid "active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1259
+#: en/git-fast-import.txt:1282
#, priority:100
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1260
+#: en/git-fast-import.txt:1283
#, priority:100
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1264
+#: en/git-fast-import.txt:1287
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
@@ -21806,7 +21871,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1270
+#: en/git-fast-import.txt:1293
#, no-wrap, priority:100
msgid ""
"status : active loaded dirty\n"
@@ -21818,307 +21883,307 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1274
+#: en/git-fast-import.txt:1297
#, priority:100
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1277
+#: en/git-fast-import.txt:1300
#, no-wrap, priority:100
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1280
+#: en/git-fast-import.txt:1303
#, priority:100
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1282
+#: en/git-fast-import.txt:1305
#, no-wrap, priority:100
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1290
+#: en/git-fast-import.txt:1313
#, priority:100
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1294
+#: en/git-fast-import.txt:1317
#, priority:100
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1296
+#: en/git-fast-import.txt:1319
#, no-wrap, priority:100
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1301
+#: en/git-fast-import.txt:1324
#, priority:100
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1305
+#: en/git-fast-import.txt:1328
#, priority:100
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1307
+#: en/git-fast-import.txt:1330
#, no-wrap, priority:100
msgid "Handling Renames"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1312
+#: en/git-fast-import.txt:1335
#, priority:100
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1337
#, no-wrap, priority:100
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1341
#, priority:100
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1325
+#: en/git-fast-import.txt:1348
#, priority:100
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1331
+#: en/git-fast-import.txt:1354
#, priority:100
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1337
+#: en/git-fast-import.txt:1360
#, priority:100
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1363
#, priority:100
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1342
+#: en/git-fast-import.txt:1365
#, no-wrap, priority:100
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1346
+#: en/git-fast-import.txt:1369
#, priority:100
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1353
+#: en/git-fast-import.txt:1376
#, priority:100
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1358
+#: en/git-fast-import.txt:1381
#, priority:100
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1360
+#: en/git-fast-import.txt:1383
#, no-wrap, priority:100
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1367
+#: en/git-fast-import.txt:1390
#, priority:100
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1369
+#: en/git-fast-import.txt:1392
#, no-wrap, priority:100
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1399
#, priority:100
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1379
+#: en/git-fast-import.txt:1402
#, no-wrap, priority:100
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1385
+#: en/git-fast-import.txt:1408
#, priority:100
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1393
+#: en/git-fast-import.txt:1416
#, priority:100
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1423
#, priority:100
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1407
+#: en/git-fast-import.txt:1430
#, priority:100
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1415
+#: en/git-fast-import.txt:1438
#, priority:100
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1417
+#: en/git-fast-import.txt:1440
#, no-wrap, priority:100
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1423
+#: en/git-fast-import.txt:1446
#, priority:100
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1448
#, no-wrap, priority:100
msgid "per object"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1432
+#: en/git-fast-import.txt:1455
#, priority:100
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1438
+#: en/git-fast-import.txt:1461
#, priority:100
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1440
+#: en/git-fast-import.txt:1463
#, no-wrap, priority:100
msgid "per mark"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1446
+#: en/git-fast-import.txt:1469
#, priority:100
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1448
+#: en/git-fast-import.txt:1471
#, no-wrap, priority:100
msgid "per branch"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1474
#, priority:100
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1457
+#: en/git-fast-import.txt:1480
#, priority:100
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1464
+#: en/git-fast-import.txt:1487
#, priority:100
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1468
+#: en/git-fast-import.txt:1491
#, priority:100
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1496
#, priority:100
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1498
#, no-wrap, priority:100
msgid "per active tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1480
+#: en/git-fast-import.txt:1503
#, priority:100
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1482
+#: en/git-fast-import.txt:1505
#, no-wrap, priority:100
msgid "per active file entry"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1488
+#: en/git-fast-import.txt:1511
#, priority:100
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1493
+#: en/git-fast-import.txt:1516
#, priority:100
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1495
+#: en/git-fast-import.txt:1518
#, no-wrap, priority:100
msgid "SIGNALS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1501
+#: en/git-fast-import.txt:1524
#, priority:100
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -22679,7 +22744,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1041
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -22795,20 +22860,32 @@ msgid ""
"\t[--state-branch <branch>] [--] [<rev-list options>...]\n"
msgstr ""
+#. type: Title -
+#: en/git-filter-branch.txt:20
+#, no-wrap, priority:100
+msgid "WARNING"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:31
+#, priority:100
+msgid "'git filter-branch' has a plethora of pitfalls that can produce non-obvious manglings of the intended history rewrite (and can leave you with little time to investigate such problems since it has such abysmal performance). These safety and performance issues cannot be backward compatibly fixed and as such, its use is not recommended. Please use an alternative history filtering tool such as https://github.com/newren/git-filter-repo/[git filter-repo]. If you still need to use 'git filter-branch', please carefully read <<SAFETY>> (and <<PERFORMANCE>>) to learn about the land mines of filter-branch, and then vigilantly avoid as many of the hazards listed there as reasonably possible."
+msgstr ""
+
#. type: Plain text
-#: en/git-filter-branch.txt:27
+#: en/git-filter-branch.txt:40
#, priority:100
msgid "Lets you rewrite Git revision history by rewriting the branches mentioned in the <rev-list options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge information) will be preserved."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:34
+#: en/git-filter-branch.txt:47
#, priority:100
msgid "The command will only rewrite the _positive_ refs mentioned in the command line (e.g. if you pass 'a..b', only 'b' will be rewritten). If you specify no filters, the commits will be recommitted without any changes, which would normally have no effect. Nevertheless, this may be useful in the future for compensating for some Git bugs or such, therefore such a usage is permitted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:39
+#: en/git-filter-branch.txt:52
#, no-wrap, priority:100
msgid ""
"*NOTE*: This command honors `.git/info/grafts` file and refs in\n"
@@ -22818,7 +22895,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:48
+#: en/git-filter-branch.txt:61
#, no-wrap, priority:100
msgid ""
"*WARNING*! The rewritten history will have different object names for all\n"
@@ -22832,337 +22909,337 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:52
+#: en/git-filter-branch.txt:65
#, priority:100
msgid "Always verify that the rewritten version is correct: The original refs, if different from the rewritten ones, will be stored in the namespace 'refs/original/'."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:56
+#: en/git-filter-branch.txt:69
#, priority:100
msgid "Note that since this operation is very I/O expensive, it might be a good idea to redirect the temporary directory off-disk with the `-d` option, e.g. on tmpfs. Reportedly the speedup is very noticeable."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:59
+#: en/git-filter-branch.txt:72
#, no-wrap, priority:100
msgid "Filters"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:71
+#: en/git-filter-branch.txt:84
#, priority:100
msgid "The filters are applied in the order as listed below. The <command> argument is always evaluated in the shell context using the 'eval' command (with the notable exception of the commit filter, for technical reasons). Prior to that, the `$GIT_COMMIT` environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, and GIT_COMMITTER_DATE are taken from the current commit and exported to the environment, in order to affect the author and committer identities of the replacement commit created by linkgit:git-commit-tree[1] after the filters have run."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:74
+#: en/git-filter-branch.txt:87
#, priority:100
msgid "If any evaluation of <command> returns a non-zero exit status, the whole operation will be aborted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:80
+#: en/git-filter-branch.txt:93
#, priority:100
msgid "A 'map' function is available that takes an \"original sha1 id\" argument and outputs a \"rewritten sha1 id\" if the commit has been already rewritten, and \"original sha1 id\" otherwise; the 'map' function can return several ids on separate lines if your commit filter emitted multiple commits."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:85
+#: en/git-filter-branch.txt:98
#, no-wrap, priority:100
msgid "--setup <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:91
+#: en/git-filter-branch.txt:104
#, priority:100
msgid "This is not a real filter executed for each commit but a one time setup just before the loop. Therefore no commit-specific variables are defined yet. Functions or variables defined here can be used or modified in the following filter steps except the commit filter, for technical reasons."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:92
+#: en/git-filter-branch.txt:105
#, no-wrap, priority:100
msgid "--subdirectory-filter <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:96
+#: en/git-filter-branch.txt:109
#, priority:100
msgid "Only look at the history which touches the given subdirectory. The result will contain that directory (and only that) as its project root. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:97
+#: en/git-filter-branch.txt:110
#, no-wrap, priority:100
msgid "--env-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:102
+#: en/git-filter-branch.txt:115
#, priority:100
msgid "This filter may be used if you only need to modify the environment in which the commit will be performed. Specifically, you might want to rewrite the author/committer name/email/time environment variables (see linkgit:git-commit-tree[1] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:103
+#: en/git-filter-branch.txt:116
#, no-wrap, priority:100
msgid "--tree-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:110
+#: en/git-filter-branch.txt:123
#, priority:100
msgid "This is the filter for rewriting the tree and its contents. The argument is evaluated in shell with the working directory set to the root of the checked out tree. The new tree is then used as-is (new files are auto-added, disappeared files are auto-removed - neither .gitignore files nor any other ignore rules *HAVE ANY EFFECT*!)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:111
+#: en/git-filter-branch.txt:124
#, no-wrap, priority:100
msgid "--index-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:117
+#: en/git-filter-branch.txt:130
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the index. It is similar to the tree filter but does not check out the tree, which makes it much faster. Frequently used with `git rm --cached --ignore-unmatch ...`, see EXAMPLES below. For hairy cases, see linkgit:git-update-index[1]."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:118
+#: en/git-filter-branch.txt:131
#, no-wrap, priority:100
msgid "--parent-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:125
+#: en/git-filter-branch.txt:138
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the commit's parent list. It will receive the parent string on stdin and shall output the new parent string on stdout. The parent string is in the format described in linkgit:git-commit-tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and \"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:126
+#: en/git-filter-branch.txt:139
#, no-wrap, priority:100
msgid "--msg-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:131
+#: en/git-filter-branch.txt:144
#, priority:100
msgid "This is the filter for rewriting the commit messages. The argument is evaluated in the shell with the original commit message on standard input; its standard output is used as the new commit message."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:132
+#: en/git-filter-branch.txt:145
#, no-wrap, priority:100
msgid "--commit-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:138
+#: en/git-filter-branch.txt:151
#, ignore-ellipsis, priority:100
msgid "This is the filter for performing the commit. If this filter is specified, it will be called instead of the 'git commit-tree' command, with arguments of the form \"<TREE_ID> [(-p <PARENT_COMMIT_ID>)...]\" and the log message on stdin. The commit id is expected on stdout."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:142
+#: en/git-filter-branch.txt:155
#, priority:100
msgid "As a special extension, the commit filter may emit multiple commit ids; in that case, the rewritten children of the original commit will have all of them as parents."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:147
+#: en/git-filter-branch.txt:160
#, priority:100
msgid "You can use the 'map' convenience function in this filter, and other convenience functions, too. For example, calling 'skip_commit \"$@\"' will leave out the current commit (but not its changes! If you want that, use 'git rebase' instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:151
+#: en/git-filter-branch.txt:164
#, priority:100
msgid "You can also use the `git_commit_non_empty_tree \"$@\"` instead of `git commit-tree \"$@\"` if you don't wish to keep commits with a single parent and that makes no change to the tree."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:152
+#: en/git-filter-branch.txt:165
#, no-wrap, priority:100
msgid "--tag-name-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:158
+#: en/git-filter-branch.txt:171
#, priority:100
msgid "This is the filter for rewriting tag names. When passed, it will be called for every tag ref that points to a rewritten object (or to a tag object which points to a rewritten object). The original tag name is passed via standard input, and the new tag name is expected on standard output."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:163
+#: en/git-filter-branch.txt:176
#, priority:100
msgid "The original tags are not deleted, but can be overwritten; use \"--tag-name-filter cat\" to simply update the tags. In this case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:174
+#: en/git-filter-branch.txt:187
#, priority:100
msgid "Nearly proper rewriting of tag objects is supported. If the tag has a message attached, a new tag object will be created with the same message, author, and timestamp. If the tag has a signature attached, the signature will be stripped. It is by definition impossible to preserve signatures. The reason this is \"nearly\" proper, is because ideally if the tag did not change (points to the same object, has the same name, etc.) it should retain any signature. That is not the case, signatures will always be removed, buyer beware. There is also no support for changing the author or timestamp (or the tag message for that matter). Tags which point to other tags will be rewritten to point to the underlying commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:175
+#: en/git-filter-branch.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--prune-empty"
msgstr "--prune-empty"
#. type: Plain text
-#: en/git-filter-branch.txt:182
+#: en/git-filter-branch.txt:195
#, priority:100
msgid "Some filters will generate empty commits that leave the tree untouched. This option instructs git-filter-branch to remove such commits if they have exactly one or zero non-pruned parents; merge commits will therefore remain intact. This option cannot be used together with `--commit-filter`, though the same effect can be achieved by using the provided `git_commit_non_empty_tree` function in a commit filter."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:183
+#: en/git-filter-branch.txt:196
#, no-wrap, priority:100
msgid "--original <namespace>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:186
+#: en/git-filter-branch.txt:199
#, priority:100
msgid "Use this option to set the namespace where the original commits will be stored. The default value is 'refs/original'."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:187
+#: en/git-filter-branch.txt:200
#, no-wrap, priority:100
msgid "-d <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:194
+#: en/git-filter-branch.txt:207
#, priority:100
msgid "Use this option to set the path to the temporary directory used for rewriting. When applying a tree filter, the command needs to temporarily check out the tree to some directory, which may consume considerable space in case of large projects. By default it does this in the `.git-rewrite/` directory but you can override that choice by this parameter."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:200
+#: en/git-filter-branch.txt:213
#, priority:100
msgid "'git filter-branch' refuses to start with an existing temporary directory or when there are already refs starting with 'refs/original/', unless forced."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:201
+#: en/git-filter-branch.txt:214
#, no-wrap, priority:100
msgid "--state-branch <branch>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:206
+#: en/git-filter-branch.txt:219
#, priority:100
msgid "This option will cause the mapping from old to new objects to be loaded from named branch upon startup and saved as a new commit to that branch upon exit, enabling incremental of large trees. If '<branch>' does not exist it will be created."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:207
+#: en/git-filter-branch.txt:220
#, ignore-ellipsis, no-wrap, priority:100
msgid "<rev-list options>..."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:212
+#: en/git-filter-branch.txt:225
#, priority:100
msgid "Arguments for 'git rev-list'. All positive refs included by these options are rewritten. You may also specify options such as `--all`, but you must use `--` to separate them from the 'git filter-branch' options. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:216
+#: en/git-filter-branch.txt:229
#, no-wrap, priority:100
msgid "Remap to ancestor"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:223
+#: en/git-filter-branch.txt:236
#, priority:100
msgid "By using linkgit:git-rev-list[1] arguments, e.g., path limiters, you can limit the set of revisions which get rewritten. However, positive refs on the command line are distinguished: we don't let them be excluded by such limiters. For this purpose, they are instead rewritten to point at the nearest ancestor that was not excluded."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:231
+#: en/git-filter-branch.txt:244
#, priority:100
msgid "On success, the exit status is `0`. If the filter can't find any commits to rewrite, the exit status is `2`. On any other error, the exit status may be any other non-zero value."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:238
+#: en/git-filter-branch.txt:251
#, priority:100
msgid "Suppose you want to remove a file (containing confidential information or copyright violation) from all commits:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:241
+#: en/git-filter-branch.txt:254
#, no-wrap, priority:100
msgid "git filter-branch --tree-filter 'rm filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:246
+#: en/git-filter-branch.txt:259
#, priority:100
msgid "However, if the file is absent from the tree of some commit, a simple `rm filename` will fail for that tree and commit. Thus you may instead want to use `rm -f filename` as the script."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:252
+#: en/git-filter-branch.txt:265
#, priority:100
msgid "Using `--index-filter` with 'git rm' yields a significantly faster version. Like with using `rm filename`, `git rm --cached filename` will fail if the file is absent from the tree of a commit. If you want to \"completely forget\" a file, it does not matter when it entered history, so we also add `--ignore-unmatch`:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:255
+#: en/git-filter-branch.txt:268
#, no-wrap, priority:100
msgid "git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:258
+#: en/git-filter-branch.txt:271
#, priority:100
msgid "Now, you will get the rewritten history saved in HEAD."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:261
+#: en/git-filter-branch.txt:274
#, priority:100
msgid "To rewrite the repository to look as if `foodir/` had been its project root, and discard all other history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:264
+#: en/git-filter-branch.txt:277
#, no-wrap, priority:100
msgid "git filter-branch --subdirectory-filter foodir -- --all\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:269
+#: en/git-filter-branch.txt:282
#, priority:100
msgid "Thus you can, e.g., turn a library subdirectory into a repository of its own. Note the `--` that separates 'filter-branch' options from revision options, and the `--all` to rewrite all branches and tags."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:273
+#: en/git-filter-branch.txt:286
#, priority:100
msgid "To set a commit (which typically is at the tip of another history) to be the parent of the current initial commit, in order to paste the other history behind the current history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:276
+#: en/git-filter-branch.txt:289
#, no-wrap, priority:100
msgid "git filter-branch --parent-filter 'sed \"s/^\\$/-p <graft-id>/\"' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:282
+#: en/git-filter-branch.txt:295
#, priority:100
msgid "(if the parent string is empty - which happens when we are dealing with the initial commit - add graftcommit as a parent). Note that this assumes history with a single root (that is, no merge without common ancestors happened). If this is not the case, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:286
+#: en/git-filter-branch.txt:299
#, no-wrap, priority:100
msgid ""
"git filter-branch --parent-filter \\\n"
@@ -23170,13 +23247,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:289
+#: en/git-filter-branch.txt:302
#, priority:100
msgid "or even simpler:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:293
+#: en/git-filter-branch.txt:306
#, no-wrap, priority:100
msgid ""
"git replace --graft $commit-id $graft-id\n"
@@ -23184,13 +23261,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:296
+#: en/git-filter-branch.txt:309
#, priority:100
msgid "To remove commits authored by \"Darl McBribe\" from the history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:305
+#: en/git-filter-branch.txt:318
#, no-wrap, priority:100
msgid ""
"git filter-branch --commit-filter '\n"
@@ -23203,13 +23280,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:308
+#: en/git-filter-branch.txt:321
#, priority:100
msgid "The function 'skip_commit' is defined as follows:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:320
+#: en/git-filter-branch.txt:333
#, no-wrap, priority:100
msgid ""
"skip_commit()\n"
@@ -23225,13 +23302,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:327
+#: en/git-filter-branch.txt:340
#, priority:100
msgid "The shift magic first throws away the tree id and then the -p parameters. Note that this handles merges properly! In case Darl committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 as their parents instead of the merge commit."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:332
+#: en/git-filter-branch.txt:345
#, no-wrap, priority:100
msgid ""
"*NOTE* the changes introduced by the commits, and which are not reverted\n"
@@ -23241,13 +23318,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:336
+#: en/git-filter-branch.txt:349
#, priority:100
msgid "You can rewrite the commit log messages using `--msg-filter`. For example, 'git svn-id' strings in a repository created by 'git svn' can be removed this way:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:341
+#: en/git-filter-branch.txt:354
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23256,13 +23333,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:345
+#: en/git-filter-branch.txt:358
#, priority:100
msgid "If you need to add 'Acked-by' lines to, say, the last 10 commits (none of which is a merge), use this command:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:351
+#: en/git-filter-branch.txt:364
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23272,13 +23349,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:357
+#: en/git-filter-branch.txt:370
#, priority:100
msgid "The `--env-filter` option can be used to modify committer and/or author identity. For example, if you found out that your commits have the wrong identity due to a misconfigured user.email, you can make a correction, before publishing the project, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:369
+#: en/git-filter-branch.txt:382
#, no-wrap, priority:100
msgid ""
"git filter-branch --env-filter '\n"
@@ -23294,19 +23371,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:375
+#: en/git-filter-branch.txt:388
#, priority:100
msgid "To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will point to the top-most revision that a 'git rev-list' of this range will print."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:377
+#: en/git-filter-branch.txt:390
#, priority:100
msgid "Consider this history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:382
+#: en/git-filter-branch.txt:395
#, no-wrap, priority:100
msgid ""
" D--E--F--G--H\n"
@@ -23315,25 +23392,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:385
+#: en/git-filter-branch.txt:398
#, priority:100
msgid "To rewrite only commits D,E,F,G,H, but leave A, B and C alone, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:388
+#: en/git-filter-branch.txt:401
#, ignore-ellipsis, no-wrap, priority:100
msgid "git filter-branch ... C..H\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:391
+#: en/git-filter-branch.txt:404
#, priority:100
msgid "To rewrite commits E,F,G,H, use one of these:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:395
+#: en/git-filter-branch.txt:408
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"git filter-branch ... C..H --not D\n"
@@ -23341,13 +23418,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:398
+#: en/git-filter-branch.txt:411
#, priority:100
msgid "To move the whole tree into a subdirectory, or remove it from there:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:405
+#: en/git-filter-branch.txt:418
#, no-wrap, priority:100
msgid ""
"git filter-branch --index-filter \\\n"
@@ -23358,87 +23435,279 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-filter-branch.txt:410
+#: en/git-filter-branch.txt:423
#, no-wrap, priority:100
msgid "CHECKLIST FOR SHRINKING A REPOSITORY"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:418
+#: en/git-filter-branch.txt:431
#, priority:100
msgid "git-filter-branch can be used to get rid of a subset of files, usually with some combination of `--index-filter` and `--subdirectory-filter`. People expect the resulting repository to be smaller than the original, but you need a few more steps to actually make it smaller, because Git tries hard not to lose your objects until you tell it to. First make sure that:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:422
+#: en/git-filter-branch.txt:435
#, priority:100
msgid "You really removed all variants of a filename, if a blob was moved over its lifetime. `git log --name-only --follow --all -- filename` can help you find renames."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:425
+#: en/git-filter-branch.txt:438
#, priority:100
msgid "You really filtered all refs: use `--tag-name-filter cat -- --all` when calling git-filter-branch."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:428
+#: en/git-filter-branch.txt:441
#, priority:100
msgid "Then there are two ways to get a smaller repository. A safer way is to clone, that keeps your original intact."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:432
+#: en/git-filter-branch.txt:445
#, priority:100
msgid "Clone it with `git clone file:///path/to/repo`. The clone will not have the removed objects. See linkgit:git-clone[1]. (Note that cloning with a plain path just hardlinks everything!)"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:437
+#: en/git-filter-branch.txt:450
#, priority:100
msgid "If you really don't want to clone it, for whatever reasons, check the following points instead (in this order). This is a very destructive approach, so *make a backup* or go back to cloning it. You have been warned."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:441
+#: en/git-filter-branch.txt:454
#, priority:100
msgid "Remove the original refs backed up by git-filter-branch: say `git for-each-ref --format=\"%(refname)\" refs/original/ | xargs -n 1 git update-ref -d`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:443
+#: en/git-filter-branch.txt:456
#, priority:100
msgid "Expire all reflogs with `git reflog expire --expire=now --all`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:447
+#: en/git-filter-branch.txt:460
#, priority:100
msgid "Garbage collect all unreferenced objects with `git gc --prune=now` (or if your git-gc is not new enough to support arguments to `--prune`, use `git repack -ad; git prune` instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:459
+#: en/git-filter-branch.txt:467
#, priority:100
-msgid "git-filter-branch allows you to make complex shell-scripted rewrites of your Git history, but you probably don't need this flexibility if you're simply _removing unwanted data_ like large files or passwords. For those operations you may want to consider http://rtyley.github.io/bfg-repo-cleaner/[The BFG Repo-Cleaner], a JVM-based alternative to git-filter-branch, typically at least 10-50x faster for those use-cases, and with quite different characteristics:"
+msgid "The performance of git-filter-branch is glacially slow; its design makes it impossible for a backward-compatible implementation to ever be fast:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:467
+#: en/git-filter-branch.txt:473
#, priority:100
-msgid "Any particular version of a file is cleaned exactly _once_. The BFG, unlike git-filter-branch, does not give you the opportunity to handle a file differently based on where or when it was committed within your history. This constraint gives the core performance benefit of The BFG, and is well-suited to the task of cleansing bad data - you don't care _where_ the bad data is, you just want it _gone_."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:473
+#: en/git-filter-branch.txt:476
+#, priority:100
+msgid "If you try and cheat and try to make git-filter-branch only work on files modified in a commit, then two things happen"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:482
+#, priority:100
+msgid "you run into problems with deletions whenever the user is simply trying to rename files (because attempting to delete files that don't exist looks like a no-op; it takes some chicanery to remap deletes across file renames when the renames happen via arbitrary user-provided shell)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:488
+#, priority:100
+msgid "even if you succeed at the map-deletes-for-renames chicanery, you still technically violate backward compatibility because users are allowed to filter files in ways that depend upon topology of commits instead of filtering solely based on file contents or names (though this has not been observed in the wild)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:494
+#, priority:100
+msgid "Even if you don't need to edit files but only want to e.g. rename or remove some and thus can avoid checking out each file (i.e. you can use --index-filter), you still are passing shell snippets for your filters. This means that for every commit, you have to have a prepared git repo where those filters can be run. That's a significant setup."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:505
+#, priority:100
+msgid "Further, several additional files are created or updated per commit by git-filter-branch. Some of these are for supporting the convenience functions provided by git-filter-branch (such as map()), while others are for keeping track of internal state (but could have also been accessed by user filters; one of git-filter-branch's regression tests does so). This essentially amounts to using the filesystem as an IPC mechanism between git-filter-branch and the user-provided filters. Disks tend to be a slow IPC mechanism, and writing these files also effectively represents a forced synchronization point between separate processes that we hit with every commit."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:511
+#, priority:100
+msgid "The user-provided shell commands will likely involve a pipeline of commands, resulting in the creation of many processes per commit. Creating and running another process takes a widely varying amount of time between operating systems, but on any platform it is very slow relative to invoking a function."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:517
+#, priority:100
+msgid "git-filter-branch itself is written in shell, which is kind of slow. This is the one performance issue that could be backward-compatibly fixed, but compared to the above problems that are intrinsic to the design of git-filter-branch, the language of the tool itself is a relatively minor issue."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:528
+#, priority:100
+msgid "Side note: Unfortunately, people tend to fixate on the written-in-shell aspect and periodically ask if git-filter-branch could be rewritten in another language to fix the performance issues. Not only does that ignore the bigger intrinsic problems with the design, it'd help less than you'd expect: if git-filter-branch itself were not shell, then the convenience functions (map(), skip_commit(), etc) and the `--setup` argument could no longer be executed once at the beginning of the program but would instead need to be prepended to every user filter (and thus re-executed with every commit)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:539
+#, priority:100
+msgid "The https://github.com/newren/git-filter-repo/[git filter-repo] tool is an alternative to git-filter-branch which does not suffer from these performance problems or the safety problems (mentioned below). For those with existing tooling which relies upon git-filter-branch, 'git repo-filter' also provides https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], a drop-in git-filter-branch replacement (with a few caveats). While filter-lamely suffers from all the same safety issues as git-filter-branch, it at least ameloriates the performance issues a little."
+msgstr ""
+
+#. type: Title -
+#: en/git-filter-branch.txt:542
+#, no-wrap, priority:100
+msgid "SAFETY"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:547
+#, priority:100
+msgid "git-filter-branch is riddled with gotchas resulting in various ways to easily corrupt repos or end up with a mess worse than what you started with:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:560
+#, priority:100
+msgid "Someone can have a set of \"working and tested filters\" which they document or provide to a coworker, who then runs them on a different OS where the same commands are not working/tested (some examples in the git-filter-branch manpage are also affected by this). BSD vs. GNU userland differences can really bite. If lucky, error messages are spewed. But just as likely, the commands either don't do the filtering requested, or silently corrupt by making some unwanted change. The unwanted change may only affect a few commits, so it's not necessarily obvious either. (The fact that problems won't necessarily be obvious means they are likely to go unnoticed until the rewritten history is in use for quite a while, at which point it's really hard to justify another flag-day for another rewrite.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:570
+#, priority:100
+msgid "Filenames with spaces are often mishandled by shell snippets since they cause problems for shell pipelines. Not everyone is familiar with find -print0, xargs -0, git-ls-files -z, etc. Even people who are familiar with these may assume such flags are not relevant because someone else renamed any such files in their repo back before the person doing the filtering joined the project. And often, even those familiar with handling arguments with spaces may not do so just because they aren't in the mindset of thinking about everything that could possibly go wrong."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:580
+#, priority:100
+msgid "Non-ascii filenames can be silently removed despite being in a desired directory. Keeping only wanted paths is often done using pipelines like `git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`. ls-files will only quote filenames if needed, so folks may not notice that one of the files didn't match the regex (at least not until it's much too late). Yes, someone who knows about core.quotePath can avoid this (unless they have other special characters like \\t, \\n, or \"), and people who use ls-files -z with something other than grep can avoid this, but that doesn't mean they will."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:586
+#, priority:100
+msgid "Similarly, when moving files around, one can find that filenames with non-ascii or special characters end up in a different directory, one that includes a double quote character. (This is technically the same issue as above with quoting, but perhaps an interesting different way that it can and has manifested as a problem.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:594
+#, priority:100
+msgid "It's far too easy to accidentally mix up old and new history. It's still possible with any tool, but git-filter-branch almost invites it. If lucky, the only downside is users getting frustrated that they don't know how to shrink their repo and remove the old stuff. If unlucky, they merge old and new history and end up with multiple \"copies\" of each commit, some of which have unwanted or sensitive files and others which don't. This comes about in multiple different ways:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:597
+#, priority:100
+msgid "the default to only doing a partial history rewrite ('--all' is not the default and few examples show it)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:599
+#, priority:100
+msgid "the fact that there's no automatic post-run cleanup"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:602
+#, priority:100
+msgid "the fact that --tag-name-filter (when used to rename tags) doesn't remove the old tags but just adds new ones with the new name"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:611
+#, priority:100
+msgid "the fact that little educational information is provided to inform users of the ramifications of a rewrite and how to avoid mixing old and new history. For example, this man page discusses how users need to understand that they need to rebase their changes for all their branches on top of new history (or delete and reclone), but that's only one of multiple concerns to consider. See the \"DISCUSSION\" section of the git filter-repo manual page for more details."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:614
+#, priority:100
+msgid "Annotated tags can be accidentally converted to lightweight tags, due to either of two issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:619
+#, priority:100
+msgid "Someone can do a history rewrite, realize they messed up, restore from the backups in refs/original/, and then redo their git-filter-branch command. (The backup in refs/original/ is not a real backup; it dereferences tags first.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:624
+#, priority:100
+msgid "Running git-filter-branch with either --tags or --all in your <rev-list options>. In order to retain annotated tags as annotated, you must use --tag-name-filter (and must not have restored from refs/original/ in a previously botched rewrite)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:629
#, priority:100
-msgid "By default The BFG takes full advantage of multi-core machines, cleansing commit file-trees in parallel. git-filter-branch cleans commits sequentially (i.e. in a single-threaded manner), though it _is_ possible to write filters that include their own parallelism, in the scripts executed against each commit."
+msgid "Any commit messages that specify an encoding will become corrupted by the rewrite; git-filter-branch ignores the encoding, takes the original bytes, and feeds it to commit-tree without telling it the proper encoding. (This happens whether or not --msg-filter is used.)"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:478
+#: en/git-filter-branch.txt:633
#, priority:100
-msgid "The http://rtyley.github.io/bfg-repo-cleaner/#examples[command options] are much more restrictive than git-filter branch, and dedicated just to the tasks of removing unwanted data- e.g: `--strip-blobs-bigger-than 1M`."
+msgid "Commit messages (even if they are all UTF-8) by default become corrupted due to not being updated -- any references to other commit hashes in commit messages will now refer to no-longer-extant commits."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:644
+#, priority:100
+msgid "There are no facilities for helping users find what unwanted crud they should delete, which means they are much more likely to have incomplete or partial cleanups that sometimes result in confusion and people wasting time trying to understand. (For example, folks tend to just look for big files to delete instead of big directories or extensions, and once they do so, then sometime later folks using the new repository who are going through history will notice a build artifact directory that has some files but not others, or a cache of dependencies (node_modules or similar) which couldn't have ever been functional since it's missing some files.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:647
+#, priority:100
+msgid "If --prune-empty isn't specified, then the filtering process can create hoards of confusing empty commits"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:651
+#, priority:100
+msgid "If --prune-empty is specified, then intentionally placed empty commits from before the filtering operation are also pruned instead of just pruning commits that became empty due to filtering rules."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:654
+#, ignore-ellipsis, priority:100
+msgid "If --prune empty is specified, sometimes empty commits are missed and left around anyway (a somewhat rare bug, but it happens...)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:658
+#, priority:100
+msgid "A minor issue, but users who have a goal to update all names and emails in a repository may be led to --env-filter which will only update authors and committers, missing taggers."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:664
+#, priority:100
+msgid "If the user provides a --tag-name-filter that maps multiple tags to the same name, no warning or error is provided; git-filter-branch simply overwrites each tag in some undocumented pre-defined order resulting in only one tag at the end. (A git-filter-branch regression test requires this surprising behavior.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:667
+#, priority:100
+msgid "Also, the poor performance of git-filter-branch often leads to safety issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:683
+#, priority:100
+msgid "Coming up with the correct shell snippet to do the filtering you want is sometimes difficult unless you're just doing a trivial modification such as deleting a couple files. Unfortunately, people often learn if the snippet is right or wrong by trying it out, but the rightness or wrongness can vary depending on special circumstances (spaces in filenames, non-ascii filenames, funny author names or emails, invalid timezones, presence of grafts or replace objects, etc.), meaning they may have to wait a long time, hit an error, then restart. The performance of git-filter-branch is so bad that this cycle is painful, reducing the time available to carefully re-check (to say nothing about what it does to the patience of the person doing the rewrite even if they do technically have more time available). This problem is extra compounded because errors from broken filters may not be shown for a long time and/or get lost in a sea of output. Even worse, broken filters often just result in silent incorrect rewrites."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:691
+#, priority:100
+msgid "To top it all off, even when users finally find working commands, they naturally want to share them. But they may be unaware that their repo didn't have some special cases that someone else's does. So, when someone else with a different repository runs the same commands, they get hit by the problems above. Or, the user just runs commands that really were vetted for special cases, but they run it on a different OS where it doesn't work, as noted above."
msgstr ""
#. type: Title =
@@ -23474,7 +23743,7 @@ msgid "This command is intended mostly for internal use by scripts automatically
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:64
+#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:68
#, no-wrap, priority:240
msgid "--log[=<n>]"
msgstr ""
@@ -23486,7 +23755,7 @@ msgid "In addition to branch names, populate the log message with one-line descr
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:65
+#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:69
#, ignore-same, no-wrap, priority:240
msgid "--no-log"
msgstr "--no-log"
@@ -24156,9 +24425,9 @@ msgid ""
"\t\t [--signature-file=<file>]\n"
"\t\t [-n | --numbered | -N | --no-numbered]\n"
"\t\t [--start-number <n>] [--numbered-files]\n"
-"\t\t [--in-reply-to=Message-Id] [--suffix=.<sfx>]\n"
+"\t\t [--in-reply-to=<message id>] [--suffix=.<sfx>]\n"
"\t\t [--ignore-if-in-upstream]\n"
-"\t\t [--rfc] [--subject-prefix=Subject-Prefix]\n"
+"\t\t [--rfc] [--subject-prefix=<subject prefix>]\n"
"\t\t [(--reroll-count|-v) <n>]\n"
"\t\t [--to=<email>] [--cc=<email>]\n"
"\t\t [--[no-]cover-letter] [--quiet]\n"
@@ -24207,523 +24476,524 @@ msgid "By default, each output file is numbered sequentially from 1, and uses th
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:70
+#: en/git-format-patch.txt:71
#, priority:100
-msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`."
+msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`. All directory components will be created."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:74
+#: en/git-format-patch.txt:75
#, priority:100
msgid "By default, the subject of a single patch is \"[PATCH] \" followed by the concatenation of lines from the commit message up to the first blank line (see the DISCUSSION section of linkgit:git-commit[1])."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:78
+#: en/git-format-patch.txt:79
#, priority:100
msgid "When multiple patches are output, the subject prefix will instead be \"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. To omit patch numbers from the subject, use `-N`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:83
+#: en/git-format-patch.txt:84
#, priority:100
msgid "If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a `Message-Id` header to reference."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:89
+#: en/git-format-patch.txt:90
#, no-wrap, priority:100
msgid "-<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:91
+#: en/git-format-patch.txt:92
#, priority:100
msgid "Prepare patches from the topmost <n> commits."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:92
+#: en/git-format-patch.txt:93
#, no-wrap, priority:100
msgid "-o <dir>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:93
+#: en/git-format-patch.txt:94
#, no-wrap, priority:100
msgid "--output-directory <dir>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:96
+#: en/git-format-patch.txt:97
#, priority:100
msgid "Use <dir> to store the resulting files, instead of the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:98 en/git-shortlog.txt:30
+#: en/git-format-patch.txt:99 en/git-shortlog.txt:30
#, ignore-same, no-wrap, priority:260
msgid "--numbered"
msgstr "--numbered"
#. type: Plain text
-#: en/git-format-patch.txt:100
+#: en/git-format-patch.txt:101
#, priority:100
msgid "Name output in '[PATCH n/m]' format, even with a single patch."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:102
+#: en/git-format-patch.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-numbered"
msgstr "--no-numbered"
#. type: Plain text
-#: en/git-format-patch.txt:104
+#: en/git-format-patch.txt:105
#, priority:100
msgid "Name output in '[PATCH]' format."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:105
+#: en/git-format-patch.txt:106
#, no-wrap, priority:100
msgid "--start-number <n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:107
+#: en/git-format-patch.txt:108
#, priority:100
msgid "Start numbering the patches at <n> instead of 1."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:108
+#: en/git-format-patch.txt:109
#, ignore-same, no-wrap, priority:100
msgid "--numbered-files"
msgstr "--numbered-files"
#. type: Plain text
-#: en/git-format-patch.txt:111
+#: en/git-format-patch.txt:112
#, priority:100
msgid "Output file names will be a simple number sequence without the default first line of the commit appended."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:113
+#: en/git-format-patch.txt:114
#, ignore-same, no-wrap, priority:100
msgid "--keep-subject"
msgstr "--keep-subject"
#. type: Plain text
-#: en/git-format-patch.txt:116
+#: en/git-format-patch.txt:117
#, priority:100
msgid "Do not strip/add '[PATCH]' from the first line of the commit log message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:122
+#: en/git-format-patch.txt:123
#, priority:100
msgid "Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:123 en/git-pack-objects.txt:59
+#: en/git-format-patch.txt:124 en/git-pack-objects.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--stdout"
msgstr "--stdout"
#. type: Plain text
-#: en/git-format-patch.txt:126
+#: en/git-format-patch.txt:127
#, priority:100
msgid "Print all commits to the standard output in mbox format, instead of creating a file for each one."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:127
+#: en/git-format-patch.txt:128
#, no-wrap, priority:100
msgid "--attach[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:131
+#: en/git-format-patch.txt:132
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: attachment`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:132
+#: en/git-format-patch.txt:133
#, ignore-same, no-wrap, priority:100
msgid "--no-attach"
msgstr "--no-attach"
#. type: Plain text
-#: en/git-format-patch.txt:135
+#: en/git-format-patch.txt:136
#, priority:100
msgid "Disable the creation of an attachment, overriding the configuration setting."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:136
+#: en/git-format-patch.txt:137
#, no-wrap, priority:100
msgid "--inline[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:140
+#: en/git-format-patch.txt:141
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: inline`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:141
+#: en/git-format-patch.txt:142
#, no-wrap, priority:100
msgid "--thread[=<style>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:142
+#: en/git-format-patch.txt:143
#, ignore-same, no-wrap, priority:100
msgid "--no-thread"
msgstr "--no-thread"
#. type: Plain text
-#: en/git-format-patch.txt:147
+#: en/git-format-patch.txt:148
#, priority:100
msgid "Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the first. Also controls generation of the `Message-Id` header to reference."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:153
+#: en/git-format-patch.txt:154
#, priority:100
msgid "The optional <style> argument can be either `shallow` or `deep`. 'shallow' threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order. 'deep' threading makes every mail a reply to the previous one."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:157
+#: en/git-format-patch.txt:158
#, priority:100
msgid "The default is `--no-thread`, unless the `format.thread` configuration is set. If `--thread` is specified without a style, it defaults to the style specified by `format.thread` if any, or else `shallow`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:161
+#: en/git-format-patch.txt:162
#, priority:100
msgid "Beware that the default for 'git send-email' is to thread emails itself. If you want `git format-patch` to take care of threading, you will want to ensure that threading is disabled for `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:162
-#, no-wrap, priority:100
-msgid "--in-reply-to=Message-Id"
-msgstr ""
+#: en/git-format-patch.txt:163
+#, fuzzy, no-wrap, priority:100
+#| msgid "--no-message-id"
+msgid "--in-reply-to=<message id>"
+msgstr "--no-message-id"
#. type: Plain text
-#: en/git-format-patch.txt:166
+#: en/git-format-patch.txt:167
#, priority:100
-msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given Message-Id, which avoids breaking threads to provide a new patch series."
+msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given <message id>, which avoids breaking threads to provide a new patch series."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:167
+#: en/git-format-patch.txt:168
#, ignore-same, no-wrap, priority:100
msgid "--ignore-if-in-upstream"
msgstr "--ignore-if-in-upstream"
#. type: Plain text
-#: en/git-format-patch.txt:173
+#: en/git-format-patch.txt:174
#, priority:100
msgid "Do not include a patch that matches a commit in <until>..<since>. This will examine all patches reachable from <since> but not from <until> and compare them with the patches being generated, and any patch that matches is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:174
+#: en/git-format-patch.txt:175
#, no-wrap, priority:100
-msgid "--subject-prefix=<Subject-Prefix>"
+msgid "--subject-prefix=<subject prefix>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:179
+#: en/git-format-patch.txt:180
#, priority:100
-msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<Subject-Prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
+msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<subject prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:180
+#: en/git-format-patch.txt:181
#, ignore-same, no-wrap, priority:100
msgid "--rfc"
msgstr "--rfc"
#. type: Plain text
-#: en/git-format-patch.txt:184
+#: en/git-format-patch.txt:185
#, priority:100
msgid "Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For Comments\"; use this when sending an experimental patch for discussion rather than application."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:185
+#: en/git-format-patch.txt:186
#, no-wrap, priority:100
msgid "-v <n>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:186
+#: en/git-format-patch.txt:187
#, no-wrap, priority:100
msgid "--reroll-count=<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:193
+#: en/git-format-patch.txt:194
#, priority:100
msgid "Mark the series as the <n>-th iteration of the topic. The output filenames have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default, but configurable via the `--subject-prefix` option) has ` v<n>` appended to it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:194
+#: en/git-format-patch.txt:195
#, no-wrap, priority:100
msgid "--to=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:199
+#: en/git-format-patch.txt:200
#, priority:100
msgid "Add a `To:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-to` discards all `To:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:200
+#: en/git-format-patch.txt:201
#, no-wrap, priority:100
msgid "--cc=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:205
+#: en/git-format-patch.txt:206
#, priority:100
msgid "Add a `Cc:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-cc` discards all `Cc:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:206
+#: en/git-format-patch.txt:207
#, ignore-same, no-wrap, priority:100
msgid "--from"
msgstr "--from"
#. type: Labeled list
-#: en/git-format-patch.txt:207
+#: en/git-format-patch.txt:208
#, no-wrap, priority:100
msgid "--from=<ident>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:213
+#: en/git-format-patch.txt:214
#, priority:100
msgid "Use `ident` in the `From:` header of each commit email. If the author ident of the commit is not textually identical to the provided `ident`, place a `From:` header in the body of the message with the original author. If no `ident` is given, use the committer ident."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:220
+#: en/git-format-patch.txt:221
#, priority:100
msgid "Note that this option is only useful if you are actually sending the emails and want to identify yourself as the sender, but retain the original author (and `git am` will correctly pick up the in-body header). Note also that `git send-email` already handles this transformation for you, and this option should not be used if you are feeding the result to `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:221
+#: en/git-format-patch.txt:222
#, no-wrap, priority:100
msgid "--add-header=<header>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:228
+#: en/git-format-patch.txt:229
#, priority:100
msgid "Add an arbitrary header to the email headers. This is in addition to any configured headers, and may be used multiple times. For example, `--add-header=\"Organization: git-foo\"`. The negated form `--no-add-header` discards *all* (`To:`, `Cc:`, and custom) headers added so far from config or command line."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:229
+#: en/git-format-patch.txt:230
#, ignore-same, no-wrap, priority:100
msgid "--[no-]cover-letter"
msgstr "--[no-]cover-letter"
#. type: Plain text
-#: en/git-format-patch.txt:233
+#: en/git-format-patch.txt:234
#, priority:100
msgid "In addition to the patches, generate a cover letter file containing the branch description, shortlog and the overall diffstat. You can fill in a description in the file before sending it out."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:234
+#: en/git-format-patch.txt:235
#, no-wrap, priority:100
msgid "--interdiff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:242
+#: en/git-format-patch.txt:243
#, priority:100
msgid "As a reviewer aid, insert an interdiff into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` is a single revision naming the tip of the previous series which shares a common base with the series being formatted (for example `git format-patch --cover-letter --interdiff=feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:243
+#: en/git-format-patch.txt:244
#, no-wrap, priority:100
msgid "--range-diff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:254
+#: en/git-format-patch.txt:255
#, priority:100
msgid "As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1]) into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` can be a single revision naming the tip of the previous series if it shares a common base with the series being formatted (for example `git format-patch --cover-letter --range-diff=feature/v1 -3 feature/v2`), or a revision range if the two versions of the series are disjoint (for example `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:259
+#: en/git-format-patch.txt:260
#, priority:100
msgid "Note that diff options passed to the command affect how the primary product of `format-patch` is generated, and they are not passed to the underlying `range-diff` machinery used to generate the cover-letter material (this may change in the future)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:260
+#: en/git-format-patch.txt:261
#, no-wrap, priority:100
msgid "--creation-factor=<percent>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:265
+#: en/git-format-patch.txt:266
#, priority:100
msgid "Used with `--range-diff`, tweak the heuristic which matches up commits between the previous and current series of patches by adjusting the creation/deletion cost fudge factor. See linkgit:git-range-diff[1]) for details."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:266
+#: en/git-format-patch.txt:267
#, no-wrap, priority:100
msgid "--notes[=<ref>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:267 en/pretty-options.txt:81
+#: en/git-format-patch.txt:268 en/pretty-options.txt:81
#, ignore-same, no-wrap, priority:260
msgid "--no-notes"
msgstr "--no-notes"
#. type: Plain text
-#: en/git-format-patch.txt:270
+#: en/git-format-patch.txt:271
#, priority:100
msgid "Append the notes (see linkgit:git-notes[1]) for the commit after the three-dash line."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:278
+#: en/git-format-patch.txt:279
#, priority:100
msgid "The expected use case of this is to write supporting explanation for the commit that does not belong to the commit log message proper, and include it with the patch submission. While one can simply write these explanations after `format-patch` has run but before sending, keeping them as Git notes allows them to be maintained between versions of the patch series (but see the discussion of the `notes.rewrite` configuration options in linkgit:git-notes[1] to use this workflow)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:281
+#: en/git-format-patch.txt:282
#, priority:100
msgid "The default is `--no-notes`, unless the `format.notes` configuration is set."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:282
+#: en/git-format-patch.txt:283
#, no-wrap, priority:100
msgid "--[no-]signature=<signature>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:287
+#: en/git-format-patch.txt:288
#, priority:100
msgid "Add a signature to each message produced. Per RFC 3676 the signature is separated from the body by a line with '-- ' on it. If the signature option is omitted the signature defaults to the Git version number."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:288
+#: en/git-format-patch.txt:289
#, no-wrap, priority:100
msgid "--signature-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:290
+#: en/git-format-patch.txt:291
#, priority:100
msgid "Works just like --signature except the signature is read from a file."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:291
+#: en/git-format-patch.txt:292
#, no-wrap, priority:100
msgid "--suffix=.<sfx>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:296
+#: en/git-format-patch.txt:297
#, priority:100
msgid "Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is `--suffix=.txt`. Leaving this empty will remove the `.patch` suffix."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:299
+#: en/git-format-patch.txt:300
#, priority:100
msgid "Note that the leading character does not have to be a dot; for example, you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:303
+#: en/git-format-patch.txt:304
#, priority:100
msgid "Do not print the names of the generated files to standard output."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:304
+#: en/git-format-patch.txt:305
#, ignore-same, no-wrap, priority:100
msgid "--no-binary"
msgstr "--no-binary"
#. type: Plain text
-#: en/git-format-patch.txt:309
+#: en/git-format-patch.txt:310
#, priority:100
msgid "Do not output contents of changes in binary files, instead display a notice that those files changed. Patches generated using this option cannot be applied properly, but they are still useful for code review."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:310
+#: en/git-format-patch.txt:311
#, ignore-same, no-wrap, priority:100
msgid "--zero-commit"
msgstr "--zero-commit"
#. type: Plain text
-#: en/git-format-patch.txt:313
+#: en/git-format-patch.txt:314
#, priority:100
msgid "Output an all-zero hash in each patch's From header instead of the hash of the commit."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:314
+#: en/git-format-patch.txt:315
#, no-wrap, priority:100
msgid "--base=<commit>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:318
+#: en/git-format-patch.txt:320
#, priority:100
-msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details."
+msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details. If <commit> is \"auto\", a base commit is automatically chosen."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:325
+#: en/git-format-patch.txt:327
#, priority:100
msgid "Treat the revision argument as a <revision range>, even if it is just a single commit (that would normally be treated as a <since>). Note that root commits included in the specified range are always formatted as creation patches, independently of this flag."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:328
+#: en/git-format-patch.txt:330
#, priority:100
msgid "Show progress reports on stderr as patches are generated."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:335
+#: en/git-format-patch.txt:338
#, priority:100
-msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To\" or \"Cc:\" headers, configure attachments, and sign off patches with configuration variables."
+msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To:\" or \"Cc:\" headers, configure attachments, change the patch output directory, and sign off patches with configuration variables."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:347
+#: en/git-format-patch.txt:351
#, no-wrap, priority:100
msgid ""
"[format]\n"
@@ -24735,17 +25005,18 @@ msgid ""
"\tcc = <email>\n"
"\tattach [ = mime-boundary-string ]\n"
"\tsignOff = true\n"
-"\tcoverletter = auto\n"
+"\toutputDirectory = <directory>\n"
+"\tcoverLetter = auto\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:356
+#: en/git-format-patch.txt:360
#, priority:100
msgid "The patch produced by 'git format-patch' is in UNIX mailbox format, with a fixed \"magic\" time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:366
+#: en/git-format-patch.txt:370
#, no-wrap, priority:100
msgid ""
"From 8f72bad1baf19a53459661343e21d6491c3908d3 Mon Sep 17 00:00:00 2001\n"
@@ -24759,7 +25030,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:369
+#: en/git-format-patch.txt:373
#, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -24767,7 +25038,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:372
+#: en/git-format-patch.txt:376
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"Do the same for ia64 so we can have sleek & trim looking\n"
@@ -24775,19 +25046,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:380
+#: en/git-format-patch.txt:384
#, ignore-ellipsis, priority:100
msgid "Typically it will be placed in a MUA's drafts folder, edited to add timely commentary that should not go in the changelog after the three dashes, and then sent as a message whose body, in our example, starts with \"arch/arm config files were...\". On the receiving end, readers can save interesting patches in a UNIX mailbox and apply them with linkgit:git-am[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:386
+#: en/git-format-patch.txt:390
#, priority:100
msgid "When a patch is part of an ongoing discussion, the patch generated by 'git format-patch' can be tweaked to take advantage of the 'git am --scissors' feature. After your response to the discussion comes a line that consists solely of \"`-- >8 --`\" (scissors and perforation), followed by the patch with unnecessary header fields removed:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:390
+#: en/git-format-patch.txt:394
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"...\n"
@@ -24795,13 +25066,13 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:392
+#: en/git-format-patch.txt:396
#, no-wrap, priority:100
msgid "Makes sense to me. How about this patch?\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:395
+#: en/git-format-patch.txt:399
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
@@ -24809,7 +25080,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:398
+#: en/git-format-patch.txt:402
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -24817,61 +25088,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:406
+#: en/git-format-patch.txt:410
#, priority:100
msgid "When sending a patch this way, most often you are sending your own patch, so in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit `From:` and `Date:` lines from the patch file. The patch title is likely to be different from the subject of the discussion the patch is in response to, so it is likely that you would want to keep the Subject: line, like the example above."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:408
+#: en/git-format-patch.txt:412
#, no-wrap, priority:100
msgid "Checking for patch corruption"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:411
+#: en/git-format-patch.txt:415
#, priority:100
msgid "Many mailers if not set up properly will corrupt whitespace. Here are two common types of corruption:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:413
+#: en/git-format-patch.txt:417
#, priority:100
msgid "Empty context lines that do not have _any_ whitespace."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:416
+#: en/git-format-patch.txt:420
#, priority:100
msgid "Non-empty context lines that have one extra whitespace at the beginning."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:418
+#: en/git-format-patch.txt:422
#, priority:100
msgid "One way to test if your MUA is set up correctly is:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:422
+#: en/git-format-patch.txt:426
#, priority:100
msgid "Send the patch to yourself, exactly the way you would, except with To: and Cc: lines that do not contain the list and maintainer address."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:425
+#: en/git-format-patch.txt:429
#, priority:100
msgid "Save that patch to a file in UNIX mailbox format. Call it a.patch, say."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:427
+#: en/git-format-patch.txt:431
#, priority:100
msgid "Apply it:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:432
+#: en/git-format-patch.txt:436
#, no-wrap, priority:100
msgid ""
"$ git fetch <project> master:test-apply\n"
@@ -24881,175 +25152,175 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:434
+#: en/git-format-patch.txt:438
#, priority:100
msgid "If it does not apply correctly, there can be various reasons."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:439
+#: en/git-format-patch.txt:443
#, priority:100
msgid "The patch itself does not apply cleanly. That is _bad_ but does not have much to do with your MUA. You might want to rebase the patch with linkgit:git-rebase[1] before regenerating it in this case."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:444
+#: en/git-format-patch.txt:448
#, priority:100
msgid "The MUA corrupted your patch; \"am\" would complain that the patch does not apply. Look in the .git/rebase-apply/ subdirectory and see what 'patch' file contains and check for the common corruption patterns mentioned above."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:452
+#: en/git-format-patch.txt:456
#, priority:100
msgid "While at it, check the 'info' and 'final-commit' files as well. If what is in 'final-commit' is not exactly what you would want to see in the commit log message, it is very likely that the receiver would end up hand editing the log message when applying your patch. Things like \"Hi, this is my first patch.\\n\" in the patch e-mail should come after the three-dash line that signals the end of the commit message."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:454
+#: en/git-format-patch.txt:458
#, no-wrap, priority:100
msgid "MUA-SPECIFIC HINTS"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:457
+#: en/git-format-patch.txt:461
#, priority:100
msgid "Here are some hints on how to successfully submit patches inline using various mailers."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:459
+#: en/git-format-patch.txt:463
#, no-wrap, priority:100
msgid "GMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:465
+#: en/git-format-patch.txt:469
#, priority:100
msgid "GMail does not have any way to turn off line wrapping in the web interface, so it will mangle any emails that you send. You can however use \"git send-email\" and send your patches through the GMail SMTP server, or use any IMAP email client to connect to the google IMAP server and forward the emails through that."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:468
+#: en/git-format-patch.txt:472
#, priority:100
msgid "For hints on using 'git send-email' to send your patches through the GMail SMTP server, see the EXAMPLE section of linkgit:git-send-email[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:471
+#: en/git-format-patch.txt:475
#, priority:100
msgid "For hints on submission using the IMAP interface, see the EXAMPLE section of linkgit:git-imap-send[1]."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:473
+#: en/git-format-patch.txt:477
#, no-wrap, priority:100
msgid "Thunderbird"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:477
+#: en/git-format-patch.txt:481
#, priority:100
msgid "By default, Thunderbird will both wrap emails as well as flag them as being 'format=flowed', both of which will make the resulting email unusable by Git."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:481
+#: en/git-format-patch.txt:485
#, priority:100
msgid "There are three different approaches: use an add-on to turn off line wraps, configure Thunderbird to not mangle patches, or use an external editor to keep Thunderbird from mangling the patches."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:483
+#: en/git-format-patch.txt:487
#, no-wrap, priority:100
msgid "Approach #1 (add-on)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:491
+#: en/git-format-patch.txt:495
#, priority:100
msgid "Install the Toggle Word Wrap add-on that is available from https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you can tick off. Now you can compose the message as you otherwise do (cut + paste, 'git format-patch' | 'git imap-send', etc), but you have to insert line breaks manually in any text that you type."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:493
+#: en/git-format-patch.txt:497
#, no-wrap, priority:100
msgid "Approach #2 (configuration)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:495
+#: en/git-format-patch.txt:499
#, priority:100
msgid "Three steps:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:499
+#: en/git-format-patch.txt:503
#, ignore-ellipsis, priority:100
msgid "Configure your mail server composition as plain text: Edit...Account Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:501
+#: en/git-format-patch.txt:505
#, priority:100
msgid "Configure your general composition window to not wrap."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:504
+#: en/git-format-patch.txt:508
#, priority:100
msgid "In Thunderbird 2: Edit..Preferences..Composition, wrap plain text messages at 0"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:510
+#: en/git-format-patch.txt:514
#, priority:100
msgid "In Thunderbird 3: Edit..Preferences..Advanced..Config Editor. Search for \"mail.wrap_long_lines\". Toggle it to make sure it is set to `false`. Also, search for \"mailnews.wraplength\" and set the value to 0."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:515
+#: en/git-format-patch.txt:519
#, priority:100
msgid "Disable the use of format=flowed: Edit..Preferences..Advanced..Config Editor. Search for \"mailnews.send_plaintext_flowed\". Toggle it to make sure it is set to `false`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:519
+#: en/git-format-patch.txt:523
#, priority:100
msgid "After that is done, you should be able to compose email as you otherwise would (cut + paste, 'git format-patch' | 'git imap-send', etc), and the patches will not be mangled."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:521
+#: en/git-format-patch.txt:525
#, no-wrap, priority:100
msgid "Approach #3 (external editor)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:526
+#: en/git-format-patch.txt:530
#, priority:100
msgid "The following Thunderbird extensions are needed: AboutConfig from http://aboutconfig.mozdev.org/ and External Editor from http://globs.org/articles.php?lng=en&pg=8"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:528
+#: en/git-format-patch.txt:532
#, priority:100
msgid "Prepare the patch as a text file using your method of choice."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:533
+#: en/git-format-patch.txt:537
#, priority:100
msgid "Before opening a compose window, use Edit->Account Settings to uncheck the \"Compose messages in HTML format\" setting in the \"Composition & Addressing\" panel of the account to be used to send the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:537
+#: en/git-format-patch.txt:541
#, priority:100
msgid "In the main Thunderbird window, 'before' you open the compose window for the patch, use Tools->about:config to set the following to the indicated values:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:541
+#: en/git-format-patch.txt:545
#, no-wrap, priority:100
msgid ""
"\tmailnews.send_plaintext_flowed => false\n"
@@ -25057,25 +25328,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:544
+#: en/git-format-patch.txt:548
#, priority:100
msgid "Open a compose window and click the external editor icon."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:547
+#: en/git-format-patch.txt:551
#, priority:100
msgid "In the external editor window, read in the patch file and exit the editor normally."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:550
+#: en/git-format-patch.txt:554
#, priority:100
msgid "Side note: it may be possible to do step 2 with about:config and the following settings but no one's tried yet."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:555
+#: en/git-format-patch.txt:559
#, no-wrap, priority:100
msgid ""
"\tmail.html_compose => false\n"
@@ -25084,91 +25355,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:560
+#: en/git-format-patch.txt:564
#, priority:100
msgid "There is a script in contrib/thunderbird-patch-inline which can help you include patches with Thunderbird in an easy way. To use it, do the steps above and then use the script as the external editor."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:562
+#: en/git-format-patch.txt:566
#, no-wrap, priority:100
msgid "KMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:564
+#: en/git-format-patch.txt:568
#, priority:100
msgid "This should help you to submit patches inline using KMail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:566
+#: en/git-format-patch.txt:570
#, priority:100
msgid "Prepare the patch as a text file."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:568
+#: en/git-format-patch.txt:572
#, priority:100
msgid "Click on New Mail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:571
+#: en/git-format-patch.txt:575
#, priority:100
msgid "Go under \"Options\" in the Composer window and be sure that \"Word wrap\" is not set."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:573
+#: en/git-format-patch.txt:577
#, ignore-ellipsis, priority:100
msgid "Use Message -> Insert file... and insert the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:576
+#: en/git-format-patch.txt:580
#, priority:100
msgid "Back in the compose window: add whatever other text you wish to the message, complete the addressing and subject fields, and press send."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:578
+#: en/git-format-patch.txt:582
#, no-wrap, priority:100
msgid "BASE TREE INFORMATION"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:587
+#: en/git-format-patch.txt:591
#, priority:100
msgid "The base tree information block is used for maintainers or third party testers to know the exact state the patch series applies to. It consists of the 'base commit', which is a well-known commit that is part of the stable part of the project history everybody else works off of, and zero or more 'prerequisite patches', which are well-known patches in flight that is not yet part of the 'base commit' that need to be applied on top of 'base commit' in topological order before the patches can be applied."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:593
+#: en/git-format-patch.txt:597
#, priority:100
msgid "The 'base commit' is shown as \"base-commit: \" followed by the 40-hex of the commit object name. A 'prerequisite patch' is shown as \"prerequisite-patch-id: \" followed by the 40-hex 'patch id', which can be obtained by passing the patch through the `git patch-id --stable` command."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:597
+#: en/git-format-patch.txt:601
#, priority:100
msgid "Imagine that on top of the public commit P, you applied well-known patches X, Y and Z from somebody else, and then built your three-patch series A, B, C, the history would be like:"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:600
+#: en/git-format-patch.txt:604
#, no-wrap, priority:100
msgid "---P---X---Y---Z---A---B---C\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:607
+#: en/git-format-patch.txt:611
#, priority:100
msgid "With `git format-patch --base=P -3 C` (or variants thereof, e.g. with `--cover-letter` or using `Z..C` instead of `-3 C` to specify the range), the base tree information block is shown at the end of the first message the command outputs (either the first patch, or the cover letter), like this:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:613
+#: en/git-format-patch.txt:617
#, no-wrap, priority:100
msgid ""
"base-commit: P\n"
@@ -25178,13 +25449,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:616
+#: en/git-format-patch.txt:620
#, priority:100
msgid "For non-linear topology, such as"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:621
+#: en/git-format-patch.txt:625
#, no-wrap, priority:100
msgid ""
"---P---X---A---M---C\n"
@@ -25193,91 +25464,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:626
+#: en/git-format-patch.txt:630
#, priority:100
msgid "You can also use `git format-patch --base=P -3 C` to generate patches for A, B and C, and the identifiers for P, X, Y, Z are appended at the end of the first message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:632
+#: en/git-format-patch.txt:636
#, priority:100
msgid "If set `--base=auto` in cmdline, it will track base commit automatically, the base commit will be the merge base of tip commit of the remote-tracking branch and revision-range specified in cmdline. For a local branch, you need to track a remote branch by `git branch --set-upstream-to` before using this option."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:638
+#: en/git-format-patch.txt:642
#, priority:100
msgid "Extract commits between revisions R1 and R2, and apply them on top of the current branch using 'git am' to cherry-pick them:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:641
+#: en/git-format-patch.txt:645
#, no-wrap, priority:100
msgid "$ git format-patch -k --stdout R1..R2 | git am -3 -k\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:645
+#: en/git-format-patch.txt:649
#, priority:100
msgid "Extract all commits which are in the current branch but not in the origin branch:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:648
+#: en/git-format-patch.txt:652
#, no-wrap, priority:100
msgid "$ git format-patch origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:651
+#: en/git-format-patch.txt:655
#, priority:100
msgid "For each commit a separate file is created in the current directory."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:654
+#: en/git-format-patch.txt:658
#, priority:100
msgid "Extract all commits that lead to 'origin' since the inception of the project:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:657
+#: en/git-format-patch.txt:661
#, no-wrap, priority:100
msgid "$ git format-patch --root origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:660
+#: en/git-format-patch.txt:664
#, priority:100
msgid "The same as the previous one:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:663
+#: en/git-format-patch.txt:667
#, no-wrap, priority:100
msgid "$ git format-patch -M -B origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:670
+#: en/git-format-patch.txt:674
#, priority:100
msgid "Additionally, it detects and handles renames and complete rewrites intelligently to produce a renaming patch. A renaming patch reduces the amount of text output, and generally makes it easier to review. Note that non-Git \"patch\" programs won't understand renaming patches, so use it only when you know the recipient uses Git to apply your patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:673
+#: en/git-format-patch.txt:677
#, priority:100
msgid "Extract three topmost commits from the current branch and format them as e-mailable patches:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:676
+#: en/git-format-patch.txt:680
#, no-wrap, priority:100
msgid "$ git format-patch -3\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:681
+#: en/git-format-patch.txt:685
#, ignore-same, priority:100
msgid "linkgit:git-am[1], linkgit:git-send-email[1]"
msgstr "linkgit:git-am[1], linkgit:git-send-email[1]"
@@ -25773,43 +26044,43 @@ msgid "The below documentation is the same as what's found in linkgit:git-config
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:127
+#: en/git-gc.txt:126
#, priority:100
-msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, refs saved by 'git filter-branch' in refs/original/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
+msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, notes saved by 'git notes' under refs/notes/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:134
+#: en/git-gc.txt:133
#, priority:100
msgid "On the other hand, when 'git gc' runs concurrently with another process, there is a risk of it deleting an object that the other process is using but hasn't created a reference to. This may just cause the other process to fail or may corrupt the repository if the other process later adds a reference to the deleted object. Git has two features that significantly mitigate this problem:"
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:137
+#: en/git-gc.txt:136
#, priority:100
msgid "Any object with modification time newer than the `--prune` date is kept, along with everything reachable from it."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:141
+#: en/git-gc.txt:140
#, priority:100
msgid "Most operations that add an object to the database update the modification time of the object if it is already present so that #1 applies."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:145
+#: en/git-gc.txt:144
#, priority:100
msgid "However, these features fall short of a complete solution, so users who run commands concurrently have to live with some risk of corruption (which seems to be low in practice)."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:151
+#: en/git-gc.txt:150
#, priority:100
msgid "The 'git gc --auto' command will run the 'pre-auto-gc' hook. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:159
+#: en/git-gc.txt:158
#, ignore-same, priority:100
msgid "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
msgstr "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
@@ -26075,7 +26346,7 @@ msgid "For each <pathspec> given on command line, descend at most <depth> levels
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:399
+#: en/git-grep.txt:128 en/git-submodule.txt:400
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
@@ -26291,7 +26562,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:951
+#: en/git-grep.txt:217 en/rev-list-options.txt:967
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -26441,127 +26712,151 @@ msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:280
+#: en/git-grep.txt:277
+#, priority:100
+msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:282
+#, priority:100
+msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:287
+#, priority:100
+msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:291
+#, priority:100
+msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:297
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:281
+#: en/git-grep.txt:298
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:282
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:283 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:284
+#: en/git-grep.txt:301
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:289
+#: en/git-grep.txt:306
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:290 en/rev-list-options.txt:65
+#: en/git-grep.txt:307 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:294
+#: en/git-grep.txt:311
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:299
+#: en/git-grep.txt:316
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:300
+#: en/git-grep.txt:317
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:303
+#: en/git-grep.txt:320
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:307
+#: en/git-grep.txt:324
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:328
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:318
+#: en/git-grep.txt:335
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:321
+#: en/git-grep.txt:338
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:322
+#: en/git-grep.txt:339
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:325
+#: en/git-grep.txt:342
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:326
+#: en/git-grep.txt:343
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:329
+#: en/git-grep.txt:346
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:330
+#: en/git-grep.txt:347
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:332
+#: en/git-grep.txt:349
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
@@ -26779,25 +27074,13 @@ msgstr ""
#. type: Plain text
#: en/git-gui.txt:116
#, priority:100
-msgid "A 'git gui' development repository can be obtained from:"
+msgid "The official repository of the 'git gui' project can be found at:"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:118
#, no-wrap, priority:100
-msgid " git clone git://repo.or.cz/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:122
-#, no-wrap, priority:100
-msgid " git clone http://repo.or.cz/r/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:124
-#, priority:100
-msgid "or browsed online at http://repo.or.cz/w/git-gui.git/[]."
+msgid " https://github.com/prati0100/git-gui.git/\n"
msgstr ""
#. type: Title =
@@ -30409,29 +30692,29 @@ msgstr ""
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
-#. type: Plain text
-#: en/git-ls-remote.txt:110
+#. type: delimited block -
+#: en/git-ls-remote.txt:111
#, no-wrap, priority:100
msgid ""
-"\t$ git ls-remote --tags ./.\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"\t$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
-"\t5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"\tc781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
-"\t$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
-"\t$ git ls-remote --tags korg v\\*\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"$ git ls-remote --tags ./.\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
+"$ git ls-remote --tags korg v\\*\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:114
+#: en/git-ls-remote.txt:116
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -30939,7 +31222,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:358
+#: en/git-merge-base.txt:60 en/git-rebase.txt:376
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -30968,235 +31251,235 @@ msgstr ""
msgid "For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:86
+#. type: delimited block .
+#: en/git-merge-base.txt:87
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---B\n"
-"\t /\n"
-"\t---o---1---o---o---o---A\n"
+"\t o---o---o---B\n"
+"\t/\n"
+"---o---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:88
+#: en/git-merge-base.txt:90
#, priority:100
msgid "the merge base between 'A' and 'B' is '1'."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:92
+#: en/git-merge-base.txt:94
#, priority:100
msgid "Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the merge base between 'A' and a hypothetical commit 'M', which is a merge between 'B' and 'C'. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:98
+#. type: delimited block .
+#: en/git-merge-base.txt:101
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---C\n"
-"\t /\n"
-"\t / o---o---o---B\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---C\n"
+" /\n"
+" / o---o---o---B\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:101
+#: en/git-merge-base.txt:105
#, priority:100
msgid "the result of `git merge-base A B C` is '1'. This is because the equivalent topology with a merge commit 'M' between 'B' and 'C' is:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:108
+#. type: delimited block .
+#: en/git-merge-base.txt:113
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---o\n"
-"\t / \\\n"
-"\t / o---o---o---o---M\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---o\n"
+" / \\\n"
+" / o---o---o---o---M\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:112
+#: en/git-merge-base.txt:118
#, priority:100
msgid "and the result of `git merge-base A M` is '1'. Commit '2' is also a common ancestor between 'A' and 'M', but '1' is a better common ancestor, because '2' is an ancestor of '1'. Hence, '2' is not a merge base."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:115
+#: en/git-merge-base.txt:121
#, priority:100
msgid "The result of `git merge-base --octopus A B C` is '2', because '2' is the best common ancestor of all commits."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:118
+#: en/git-merge-base.txt:124
#, priority:100
msgid "When the history involves criss-cross merges, there can be more than one 'best' common ancestor for two commits. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:124
+#. type: delimited block .
+#: en/git-merge-base.txt:131
#, no-wrap, priority:100
msgid ""
-"\t---1---o---A\n"
-"\t \\ /\n"
-"\t X\n"
-"\t / \\\n"
-"\t---2---o---o---B\n"
+"---1---o---A\n"
+" \\ /\n"
+" X\n"
+" / \\\n"
+"---2---o---o---B\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:128
+#: en/git-merge-base.txt:136
#, priority:100
msgid "both '1' and '2' are merge-bases of A and B. Neither one is better than the other (both are 'best' merge bases). When the `--all` option is not given, it is unspecified which best one is output."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:133
+#: en/git-merge-base.txt:141
#, priority:100
msgid "A common idiom to check \"fast-forward-ness\" between two commits A and B is (or at least used to be) to compute the merge base between A and B, and check if it is the same as A, in which case, A is an ancestor of B. You will see this idiom used often in older scripts."
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:139
+#. type: delimited block .
+#: en/git-merge-base.txt:148
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tA=$(git rev-parse --verify A)\n"
-"\tif test \"$A\" = \"$(git merge-base A B)\"\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"A=$(git rev-parse --verify A)\n"
+"if test \"$A\" = \"$(git merge-base A B)\"\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:141
+#: en/git-merge-base.txt:151
#, priority:100
msgid "In modern git, you can say this in a more direct way:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:146
+#. type: delimited block .
+#: en/git-merge-base.txt:157
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tif git merge-base --is-ancestor A B\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"if git merge-base --is-ancestor A B\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:148
+#: en/git-merge-base.txt:160
#, priority:100
msgid "instead."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:150
+#: en/git-merge-base.txt:162
#, no-wrap, priority:100
msgid "Discussion on fork-point mode"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:156
+#: en/git-merge-base.txt:168
#, priority:100
msgid "After working on the `topic` branch created with `git switch -c topic origin/master`, the history of remote-tracking branch `origin/master` may have been rewound and rebuilt, leading to a history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:164
+#. type: delimited block .
+#: en/git-merge-base.txt:177
#, no-wrap, priority:100
msgid ""
-"\t o---B2\n"
-"\t /\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t \\\n"
-"\t B0\n"
-"\t \\\n"
-"\t D0---D1---D (topic)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\\n"
+"\t B0\n"
+"\t \\\n"
+"\t D0---D1---D (topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:170
+#: en/git-merge-base.txt:184
#, priority:100
msgid "where `origin/master` used to point at commits B0, B1, B2 and now it points at B, and your `topic` branch was started on top of it back when `origin/master` was at B0, and you built three commits, D0, D1, and D, on top of it. Imagine that you now want to rebase the work you did on the topic on top of the updated origin/master."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:176
+#: en/git-merge-base.txt:190
#, priority:100
msgid "In such a case, `git merge-base origin/master topic` would return the parent of B0 in the above picture, but B0^..D is *not* the range of commits you would want to replay on top of B (it includes B0, which is not what you wrote; it is a commit the other side discarded when it moved its tip from B0 to B1)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:184
+#: en/git-merge-base.txt:198
#, priority:100
msgid "`git merge-base --fork-point origin/master topic` is designed to help in such a case. It takes not only B but also B0, B1, and B2 (i.e. old tips of the remote-tracking branches your repository's reflog knows about) into account to see on which commit your topic branch was built and finds B0, allowing you to replay only the commits on your topic, excluding the commits the other side later discarded."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:186
+#: en/git-merge-base.txt:200
#, priority:100
msgid "Hence"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:188
+#: en/git-merge-base.txt:202
#, no-wrap, priority:100
msgid " $ fork_point=$(git merge-base --fork-point origin/master topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:190
+#: en/git-merge-base.txt:204
#, priority:100
msgid "will find B0, and"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:192
+#: en/git-merge-base.txt:206
#, no-wrap, priority:100
msgid " $ git rebase --onto origin/master $fork_point topic\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:195
+#: en/git-merge-base.txt:209
#, priority:100
msgid "will replay D0, D1 and D on top of B to create a new history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:203
+#. type: delimited block .
+#: en/git-merge-base.txt:218
#, no-wrap, priority:100
msgid ""
-"\t\t\t o---B2\n"
-"\t\t\t/\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t\t\\ \\\n"
-"\t\t B0 D0'--D1'--D' (topic - updated)\n"
-"\t\t \\\n"
-"\t\t D0---D1---D (topic - old)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\ \\\n"
+"\t B0 D0'--D1'--D' (topic - updated)\n"
+"\t \\\n"
+"\t D0---D1---D (topic - old)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:210
+#: en/git-merge-base.txt:226
#, priority:100
msgid "A caveat is that older reflog entries in your repository may be expired by `git gc`. If B0 no longer appears in the reflog of the remote-tracking branch `origin/master`, the `--fork-point` mode obviously cannot find it and fails, avoiding to give a random and useless result (such as the parent of B0, like the same command without the `--fork-point` option gives)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:221
+#: en/git-merge-base.txt:237
#, priority:100
msgid "Also, the remote-tracking branch you use the `--fork-point` mode with must be the one your topic forked from its tip. If you forked from an older commit than the tip, this mode would not find the fork point (imagine in the above sample history B0 did not exist, origin/master started at B1, moved to B2 and then B, and you forked your topic at origin/master^ when origin/master was B1; the shape of the history would be the same as above, without B0, and the parent of B1 is what `git merge-base origin/master topic` correctly finds, but the `--fork-point` mode will not, because it is not one of the commits that used to be at the tip of origin/master)."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:224
+#: en/git-merge-base.txt:240
#, no-wrap, priority:100
msgid "See also"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:228
+#: en/git-merge-base.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
msgstr "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
@@ -31407,31 +31690,31 @@ msgstr ""
msgid "Examples:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:62
+#. type: delimited block -
+#: en/git-merge-index.txt:63
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
-" This is MM from the original tree.\t\t\t# original\n"
-" This is modified MM in the branch A.\t\t\t# merge1\n"
-" This is modified MM in the branch B.\t\t\t# merge2\n"
-" This is modified MM in the branch B.\t\t\t# current contents\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
+"This is MM from the original tree.\t\t# original\n"
+"This is modified MM in the branch A.\t\t# merge1\n"
+"This is modified MM in the branch B.\t\t# merge2\n"
+"This is modified MM in the branch B.\t\t# current contents\n"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:71
+#. type: delimited block -
+#: en/git-merge-index.txt:74
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
-" cat: : No such file or directory\n"
-" This is added AA in the branch A.\n"
-" This is added AA in the branch B.\n"
-" This is added AA in the branch B.\n"
-" fatal: merge program failed\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
+"cat: : No such file or directory\n"
+"This is added AA in the branch A.\n"
+"This is added AA in the branch B.\n"
+"This is added AA in the branch B.\n"
+"fatal: merge program failed\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-index.txt:76
+#: en/git-merge-index.txt:80
#, priority:100
msgid "where the latter example shows how 'git merge-index' will stop trying to merge once anything has returned an error (i.e., `cat` returned an error for the AA file, because it didn't exist in the original, and thus 'git merge-index' didn't even try to merge the MM thing)."
msgstr ""
@@ -31729,7 +32012,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n"
-"\t[-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
+"\t[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
"\t[--[no-]allow-unrelated-histories]\n"
"\t[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]\n"
"'git merge' (--continue | --abort | --quit)\n"
@@ -32810,7 +33093,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:281 en/merge-options.txt:108
+#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -33790,7 +34073,7 @@ msgid "Conflicts can occur when applying a commit to p4. When this happens, the
msgstr ""
#. type: Labeled list
-#: en/git-p4.txt:359 en/git-submodule.txt:270
+#: en/git-p4.txt:359 en/git-submodule.txt:271
#, no-wrap, priority:220
msgid "--branch <branch>"
msgstr ""
@@ -34926,7 +35209,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:263 en/rev-list-options.txt:760
+#: en/git-pack-objects.txt:263 en/rev-list-options.txt:776
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -34938,13 +35221,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:266 en/rev-list-options.txt:767
+#: en/git-pack-objects.txt:266 en/rev-list-options.txt:783
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:269 en/rev-list-options.txt:770
+#: en/git-pack-objects.txt:269 en/rev-list-options.txt:786
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -34956,7 +35239,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:276 en/rev-list-options.txt:777
+#: en/git-pack-objects.txt:276 en/rev-list-options.txt:793
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -34968,7 +35251,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:281 en/rev-list-options.txt:785
+#: en/git-pack-objects.txt:281 en/rev-list-options.txt:801
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -35727,13 +36010,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:502
+#: en/git-pull.txt:136 en/git-rebase.txt:524
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:503
+#: en/git-pull.txt:137 en/git-rebase.txt:525
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -37526,8 +37809,8 @@ msgstr ""
#: en/git-rebase.txt:16
#, no-wrap, priority:100
msgid ""
-"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
-"\t[<upstream> [<branch>]]\n"
+"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>]\n"
+"\t[--onto <newbase> | --keep-base] [<upstream> [<branch>]]\n"
"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
"\t--root [<branch>]\n"
"'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch)\n"
@@ -37846,512 +38129,542 @@ msgstr ""
msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:220
+#, ignore-same, no-wrap, priority:100
+msgid "--keep-base"
+msgstr "--keep-base"
+
#. type: Plain text
-#: en/git-rebase.txt:224
+#: en/git-rebase.txt:225
+#, ignore-ellipsis, priority:100
+msgid "Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running 'git rebase --keep-base <upstream> <branch>' is equivalent to running 'git rebase --onto <upstream>... <upstream>'."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:230
+#, priority:100
+msgid "This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:235
+#, priority:100
+msgid "Although both this option and --fork-point find the merge base between <upstream> and <branch>, this option uses the merge base as the _starting point_ on which new commits will be created, whereas --fork-point uses the merge base to determine the _set of commits_ which will be rebased."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#, priority:100
+msgid "See also INCOMPATIBLE OPTIONS below."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:242
#, priority:100
msgid "Upstream branch to compare against. May be any valid commit, not just an existing branch name. Defaults to the configured upstream for the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:230
+#: en/git-rebase.txt:248
#, priority:100
msgid "Restart the rebasing process after having resolved a merge conflict."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237
+#: en/git-rebase.txt:255
#, priority:100
msgid "Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:242
+#: en/git-rebase.txt:260
#, priority:100
msgid "Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:243 en/git-rebase.txt:538
+#: en/git-rebase.txt:261 en/git-rebase.txt:560
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:246
+#: en/git-rebase.txt:264
#, priority:100
msgid "Keep the commits that do not change anything from its parents in the result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:248 en/git-rebase.txt:255 en/git-rebase.txt:280 en/git-rebase.txt:293 en/git-rebase.txt:302 en/git-rebase.txt:344 en/git-rebase.txt:379 en/git-rebase.txt:386 en/git-rebase.txt:393 en/git-rebase.txt:405 en/git-rebase.txt:445 en/git-rebase.txt:470 en/git-rebase.txt:482 en/git-rebase.txt:501
-#, priority:100
-msgid "See also INCOMPATIBLE OPTIONS below."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rebase.txt:253
+#: en/git-rebase.txt:271
#, priority:100
msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:258
+#: en/git-rebase.txt:276
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:259 en/git-rebase.txt:539
+#: en/git-rebase.txt:277 en/git-rebase.txt:561
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:261
+#: en/git-rebase.txt:279
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:266
+#: en/git-rebase.txt:284
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:272
+#: en/git-rebase.txt:290
#, priority:100
msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:278
+#: en/git-rebase.txt:296
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:286
+#: en/git-rebase.txt:304
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:291
+#: en/git-rebase.txt:309
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:294
+#: en/git-rebase.txt:312
#, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:295
+#: en/git-rebase.txt:313
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:300
+#: en/git-rebase.txt:318
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:317
+#: en/git-rebase.txt:335
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:321
+#: en/git-rebase.txt:339
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:325
+#: en/git-rebase.txt:343
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:329
+#: en/git-rebase.txt:347
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:332
+#: en/git-rebase.txt:350
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:333 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:336
+#: en/git-rebase.txt:354
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:345 en/merge-options.txt:47
+#: en/git-rebase.txt:363 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:346
+#: en/git-rebase.txt:364
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:351
+#: en/git-rebase.txt:369
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:357
+#: en/git-rebase.txt:375
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:359
+#: en/git-rebase.txt:377
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:363
+#: en/git-rebase.txt:381
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:387
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:372
+#: en/git-rebase.txt:390
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:394
+#, priority:100
+msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:399
#, priority:100
msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:384
+#: en/git-rebase.txt:406
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:391
+#: en/git-rebase.txt:413
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:421
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:403
+#: en/git-rebase.txt:425
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:407
+#: en/git-rebase.txt:429
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:415
+#: en/git-rebase.txt:437
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:422
+#: en/git-rebase.txt:444
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:426
+#: en/git-rebase.txt:448
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges`, but in contrast to that option works well in interactive rebases: commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:430
+#: en/git-rebase.txt:452
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:432
+#: en/git-rebase.txt:454
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:434 en/git-rebase.txt:535 en/git-svn.txt:680
+#: en/git-rebase.txt:456 en/git-rebase.txt:557 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:439
+#: en/git-rebase.txt:461
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:443
+#: en/git-rebase.txt:465
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:446
+#: en/git-rebase.txt:468
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:447
+#: en/git-rebase.txt:469
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:474
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:455
+#: en/git-rebase.txt:477
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:457
+#: en/git-rebase.txt:479
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:459
+#: en/git-rebase.txt:481
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:483
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:487
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:490
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:480
+#: en/git-rebase.txt:502
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:505
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:484
+#: en/git-rebase.txt:506
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:495
+#: en/git-rebase.txt:517
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:499
+#: en/git-rebase.txt:521
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:509
+#: en/git-rebase.txt:531
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:510
+#: en/git-rebase.txt:532
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:511
+#: en/git-rebase.txt:533
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:514
+#: en/git-rebase.txt:536
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:516
+#: en/git-rebase.txt:538
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:519
+#: en/git-rebase.txt:541
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:523
+#: en/git-rebase.txt:545
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:527
+#: en/git-rebase.txt:549
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:530
+#: en/git-rebase.txt:552
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:553
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:555
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Plain text
-#: en/git-rebase.txt:534
+#: en/git-rebase.txt:556
#, ignore-same, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:537
+#: en/git-rebase.txt:559
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:540
+#: en/git-rebase.txt:562
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:542
+#: en/git-rebase.txt:564
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:544
+#: en/git-rebase.txt:566
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:567
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:546
+#: en/git-rebase.txt:568
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:547
+#: en/git-rebase.txt:569
#, priority:100
-msgid "--rebase-merges and --strategy"
+msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:548
+#: en/git-rebase.txt:570
#, priority:100
-msgid "--rebase-merges and --strategy-option"
+msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:550
+#: en/git-rebase.txt:572
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:575
#, no-wrap, priority:100
msgid "There are some subtle differences how the backends behave.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:556
+#: en/git-rebase.txt:578
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38359,7 +38672,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:561
+#: en/git-rebase.txt:583
#, no-wrap, priority:100
msgid ""
"The am backend drops any \"empty\" commits, regardless of whether the\n"
@@ -38369,7 +38682,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:588
#, no-wrap, priority:100
msgid ""
"The interactive backend drops commits by default that\n"
@@ -38379,7 +38692,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:591
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38387,7 +38700,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:573
+#: en/git-rebase.txt:595
#, no-wrap, priority:100
msgid ""
"Directory rename heuristics are enabled in the merge and interactive\n"
@@ -38396,145 +38709,145 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:597
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:577
+#: en/git-rebase.txt:599
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:582
+#: en/git-rebase.txt:604
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:587
+#: en/git-rebase.txt:609
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:589
+#: en/git-rebase.txt:611
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:596
+#: en/git-rebase.txt:618
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:598
+#: en/git-rebase.txt:620
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:600
+#: en/git-rebase.txt:622
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:601
+#: en/git-rebase.txt:623
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:602
+#: en/git-rebase.txt:624
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:603
+#: en/git-rebase.txt:625
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:605
+#: en/git-rebase.txt:627
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:607
+#: en/git-rebase.txt:629
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:631
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:610
+#: en/git-rebase.txt:632
#, priority:100
msgid "commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:612
+#: en/git-rebase.txt:634
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:614
+#: en/git-rebase.txt:636
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:615
+#: en/git-rebase.txt:637
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:616
+#: en/git-rebase.txt:638
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:644
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:646
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:626
+#: en/git-rebase.txt:648
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:653
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:658
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -38543,73 +38856,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:641
+#: en/git-rebase.txt:663
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:668
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:649
+#: en/git-rebase.txt:671
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:652
+#: en/git-rebase.txt:674
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:655
+#: en/git-rebase.txt:677
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:685
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:667
+#: en/git-rebase.txt:689
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:693
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:696
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:699
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:680
+#: en/git-rebase.txt:702
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:687
+#: en/git-rebase.txt:709
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -38620,25 +38933,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:691
+#: en/git-rebase.txt:713
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:694
+#: en/git-rebase.txt:716
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:701
+#: en/git-rebase.txt:723
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:710
+#: en/git-rebase.txt:732
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -38651,31 +38964,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:715
+#: en/git-rebase.txt:737
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:720
+#: en/git-rebase.txt:742
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:745
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:727
+#: en/git-rebase.txt:749
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:759
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -38689,85 +39002,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:740
+#: en/git-rebase.txt:762
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:746
+#: en/git-rebase.txt:768
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:750
+#: en/git-rebase.txt:772
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:752
+#: en/git-rebase.txt:774
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:756
+#: en/git-rebase.txt:778
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:760
+#: en/git-rebase.txt:782
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:763
+#: en/git-rebase.txt:785
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:765
+#: en/git-rebase.txt:787
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:767
+#: en/git-rebase.txt:789
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:794
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:775
+#: en/git-rebase.txt:797
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:804
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:809
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:816
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38778,13 +39091,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:819
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:826
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38795,13 +39108,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:808
+#: en/git-rebase.txt:830
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:815
+#: en/git-rebase.txt:837
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38812,73 +39125,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:822
+#: en/git-rebase.txt:844
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:824
+#: en/git-rebase.txt:846
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:825
+#: en/git-rebase.txt:847
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:829
+#: en/git-rebase.txt:851
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:836
+#: en/git-rebase.txt:859
#, priority:100
-msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or `filter-branch`."
+msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:839
+#: en/git-rebase.txt:862
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:867
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:848
+#: en/git-rebase.txt:871
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:850
+#: en/git-rebase.txt:873
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:875
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:858
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38889,19 +39202,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:885
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:866
+#: en/git-rebase.txt:889
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:894
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -38911,67 +39224,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:876
+#: en/git-rebase.txt:899
#, priority:100
-msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge-base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
+msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:880
+#: en/git-rebase.txt:903
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:883
+#: en/git-rebase.txt:906
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:886
+#: en/git-rebase.txt:909
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:888
+#: en/git-rebase.txt:911
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:893
+#: en/git-rebase.txt:916
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:895
+#: en/git-rebase.txt:918
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:926
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:907
+#: en/git-rebase.txt:930
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:912
+#: en/git-rebase.txt:935
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:922
+#: en/git-rebase.txt:945
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -38985,25 +39298,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:929
+#: en/git-rebase.txt:952
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:932
+#: en/git-rebase.txt:955
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:935 en/git-rebase.txt:1012
+#: en/git-rebase.txt:958 en/git-rebase.txt:1035
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:941
+#: en/git-rebase.txt:964
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39014,7 +39327,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:946
+#: en/git-rebase.txt:969
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39024,7 +39337,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:950
+#: en/git-rebase.txt:973
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39033,55 +39346,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:954
+#: en/git-rebase.txt:977
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:962
+#: en/git-rebase.txt:985
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:992
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:975
+#: en/git-rebase.txt:998
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:978
+#: en/git-rebase.txt:1001
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1008
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:989
+#: en/git-rebase.txt:1012
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:996
+#: en/git-rebase.txt:1019
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1003
+#: en/git-rebase.txt:1026
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39092,13 +39405,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1009
+#: en/git-rebase.txt:1032
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1015
+#: en/git-rebase.txt:1038
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39106,7 +39419,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1022
+#: en/git-rebase.txt:1045
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39118,7 +39431,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1049
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39127,37 +39440,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1035
+#: en/git-rebase.txt:1058
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1037
+#: en/git-rebase.txt:1060
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1039
+#: en/git-rebase.txt:1062
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1043
+#: en/git-rebase.txt:1066
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1068
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1072
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -39465,117 +39778,118 @@ msgstr ""
msgid "Using this hook, it is easy to generate mails describing the updates to the repository. This example script sends one mail message per ref listing the commits pushed to the repository, and logs the push certificates of signed pushes with good signatures to a logger service:"
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:191
+#. type: delimited block -
+#: en/git-receive-pack.txt:192
#, no-wrap, priority:100
msgid ""
-"\t#!/bin/sh\n"
-"\t# mail out commit update information.\n"
-"\twhile read oval nval ref\n"
-"\tdo\n"
-"\t\tif expr \"$oval\" : '0*$' >/dev/null\n"
-"\t\tthen\n"
-"\t\t\techo \"Created a new ref, with the following commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\"\n"
-"\t\telse\n"
-"\t\t\techo \"New commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
-"\t\tfi |\n"
-"\t\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
-"\tdone\n"
-"\t# log signed push certificate, if any\n"
-"\tif test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"#!/bin/sh\n"
+"# mail out commit update information.\n"
+"while read oval nval ref\n"
+"do\n"
+"\tif expr \"$oval\" : '0*$' >/dev/null\n"
"\tthen\n"
-"\t\t(\n"
-"\t\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
-"\t\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
-"\t\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
-"\tfi\n"
-"\texit 0\n"
+"\t\techo \"Created a new ref, with the following commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\"\n"
+"\telse\n"
+"\t\techo \"New commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
+"\tfi |\n"
+"\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
+"done\n"
+"# log signed push certificate, if any\n"
+"if test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"then\n"
+"\t(\n"
+"\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
+"\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
+"\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
+"fi\n"
+"exit 0\n"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:194
+#: en/git-receive-pack.txt:196
#, priority:100
msgid "The exit code from this hook invocation is ignored, however a non-zero exit code will generate an error message."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:200
+#: en/git-receive-pack.txt:202
#, priority:100
msgid "Note that it is possible for refname to not have sha1-new when this hook runs. This can easily occur if another user modifies the ref after it was updated by 'git-receive-pack', but before the hook was able to evaluate it. It is recommended that hooks rely on sha1-new rather than the current value of refname."
msgstr ""
#. type: Title -
-#: en/git-receive-pack.txt:202
+#: en/git-receive-pack.txt:204
#, no-wrap, priority:100
msgid "POST-UPDATE HOOK"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:207
+#: en/git-receive-pack.txt:209
#, priority:100
msgid "After all other processing, if at least one ref was updated, and if $GIT_DIR/hooks/post-update file exists and is executable, then post-update will be called with the list of refs that have been updated. This can be used to implement any repository wide cleanup tasks."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:211
+#: en/git-receive-pack.txt:213
#, priority:100
msgid "The exit code from this hook invocation is ignored; the only thing left for 'git-receive-pack' to do at that point is to exit itself anyway."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:214
+#: en/git-receive-pack.txt:216
#, priority:100
msgid "This hook can be used, for example, to run `git update-server-info` if the repository is packed and is served via a dumb transport."
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:217
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/git-receive-pack.txt:220
+#, fuzzy, no-wrap, priority:100
+#| msgid "git-update-server-info(1)"
msgid ""
-"\t#!/bin/sh\n"
-"\texec git update-server-info\n"
-msgstr ""
+"#!/bin/sh\n"
+"exec git update-server-info\n"
+msgstr "git-update-server-info(1)"
#. type: Title -
-#: en/git-receive-pack.txt:220
+#: en/git-receive-pack.txt:224
#, no-wrap, priority:100
msgid "QUARANTINE ENVIRONMENT"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:227
+#: en/git-receive-pack.txt:231
#, priority:100
msgid "When `receive-pack` takes in objects, they are placed into a temporary \"quarantine\" directory within the `$GIT_DIR/objects` directory and migrated into the main object store only after the `pre-receive` hook has completed. If the push fails before then, the temporary directory is removed entirely."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:229
+#: en/git-receive-pack.txt:233
#, priority:100
msgid "This has a few user-visible effects and caveats:"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:235
+#: en/git-receive-pack.txt:239
#, priority:100
msgid "Pushes which fail due to problems with the incoming pack, missing objects, or due to the `pre-receive` hook will not leave any on-disk data. This is usually helpful to prevent repeated failed pushes from filling up your disk, but can make debugging more challenging."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:238
+#: en/git-receive-pack.txt:242
#, priority:100
msgid "Any objects created by the `pre-receive` hook will be created in the quarantine directory (and migrated only if it succeeds)."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:244
+#: en/git-receive-pack.txt:248
#, priority:100
msgid "The `pre-receive` hook MUST NOT update any refs to point to quarantined objects. Other programs accessing the repository will not be able to see the objects (and if the pre-receive hook fails, those refs would become corrupted). For safety, any ref updates from within `pre-receive` are automatically rejected."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:249
+#: en/git-receive-pack.txt:253
#, ignore-same, priority:100
msgid "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
msgstr "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
@@ -40903,7 +41217,7 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:131
#, priority:100
-msgid "linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and linkgit:git-rebase[1], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
+msgid "linkgit:git-hash-object[1], linkgit:git-rebase[1], and https://github.com/newren/git-filter-repo[git-filter-repo], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
msgstr ""
#. type: Plain text
@@ -40926,9 +41240,10 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:158
-#, priority:100
-msgid "linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1]"
-msgstr ""
+#, fuzzy, priority:100
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] https://github.com/newren/git-filter-repo[git-filter-repo]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title =
#: en/git-request-pull.txt:2
@@ -41720,7 +42035,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:228 en/git-stash.txt:229
+#: en/git-reset.txt:228 en/git-stash.txt:230
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -42447,102 +42762,49 @@ msgid "git-rev-list - Lists commit objects in reverse chronological order"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:65
+#: en/git-rev-list.txt:13
#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"'git rev-list' [ --max-count=<number> ]\n"
-"\t [ --skip=<number> ]\n"
-"\t [ --max-age=<timestamp> ]\n"
-"\t [ --min-age=<timestamp> ]\n"
-"\t [ --sparse ]\n"
-"\t [ --merges ]\n"
-"\t [ --no-merges ]\n"
-"\t [ --min-parents=<number> ]\n"
-"\t [ --no-min-parents ]\n"
-"\t [ --max-parents=<number> ]\n"
-"\t [ --no-max-parents ]\n"
-"\t [ --first-parent ]\n"
-"\t [ --remove-empty ]\n"
-"\t [ --full-history ]\n"
-"\t [ --not ]\n"
-"\t [ --all ]\n"
-"\t [ --branches[=<pattern>] ]\n"
-"\t [ --tags[=<pattern>] ]\n"
-"\t [ --remotes[=<pattern>] ]\n"
-"\t [ --glob=<glob-pattern> ]\n"
-"\t [ --ignore-missing ]\n"
-"\t [ --stdin ]\n"
-"\t [ --quiet ]\n"
-"\t [ --topo-order ]\n"
-"\t [ --parents ]\n"
-"\t [ --timestamp ]\n"
-"\t [ --left-right ]\n"
-"\t [ --left-only ]\n"
-"\t [ --right-only ]\n"
-"\t [ --cherry-mark ]\n"
-"\t [ --cherry-pick ]\n"
-"\t [ --encoding=<encoding> ]\n"
-"\t [ --(author|committer|grep)=<pattern> ]\n"
-"\t [ --regexp-ignore-case | -i ]\n"
-"\t [ --extended-regexp | -E ]\n"
-"\t [ --fixed-strings | -F ]\n"
-"\t [ --date=<format>]\n"
-"\t [ [ --objects | --objects-edge | --objects-edge-aggressive ]\n"
-"\t [ --unpacked ]\n"
-"\t [ --object-names | --no-object-names ]\n"
-"\t [ --filter=<filter-spec> [ --filter-print-omitted ] ] ]\n"
-"\t [ --missing=<missing-action> ]\n"
-"\t [ --pretty | --header ]\n"
-"\t [ --bisect ]\n"
-"\t [ --bisect-vars ]\n"
-"\t [ --bisect-all ]\n"
-"\t [ --merge ]\n"
-"\t [ --reverse ]\n"
-"\t [ --walk-reflogs ]\n"
-"\t [ --no-walk ] [ --do-walk ]\n"
-"\t [ --count ]\n"
-"\t [ --use-bitmap-index ]\n"
-"\t <commit>... [ \\-- <paths>... ]\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:73
+msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rev-list.txt:21
#, priority:100
msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:80
+#: en/git-rev-list.txt:28
#, priority:100
msgid "You can think of this as a set operation. Commits given on the command line form a set of commits that are reachable from any of them, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:82
+#: en/git-rev-list.txt:30
#, priority:100
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:85
+#: en/git-rev-list.txt:33
#, no-wrap, priority:100
msgid "\t$ git rev-list foo bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:89
+#: en/git-rev-list.txt:37
#, priority:100
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:93
+#: en/git-rev-list.txt:41
#, priority:100
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:97
+#: en/git-rev-list.txt:45
#, no-wrap, priority:100
msgid ""
"\t$ git rev-list origin..HEAD\n"
@@ -42550,13 +42812,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:102
+#: en/git-rev-list.txt:50
#, ignore-ellipsis, priority:100
msgid "Another special notation is \"'<commit1>'...'<commit2>'\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:106
+#: en/git-rev-list.txt:54
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git rev-list A B --not $(git merge-base --all A B)\n"
@@ -42564,7 +42826,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:113
+#: en/git-rev-list.txt:61
#, priority:100
msgid "'rev-list' is a very essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For this reason, it has a lot of different options that enables it to be used by commands as different as 'git bisect' and 'git repack'."
msgstr ""
@@ -44686,31 +44948,31 @@ msgstr ""
msgid "To use 'git send-email' to send your patches through the GMail SMTP server, edit ~/.gitconfig to specify your account settings:"
msgstr ""
-#. type: Plain text
-#: en/git-send-email.txt:494
+#. type: delimited block -
+#: en/git-send-email.txt:495
#, no-wrap, priority:100
msgid ""
-"\t[sendemail]\n"
-"\t\tsmtpEncryption = tls\n"
-"\t\tsmtpServer = smtp.gmail.com\n"
-"\t\tsmtpUser = yourname@gmail.com\n"
-"\t\tsmtpServerPort = 587\n"
+"[sendemail]\n"
+"\tsmtpEncryption = tls\n"
+"\tsmtpServer = smtp.gmail.com\n"
+"\tsmtpUser = yourname@gmail.com\n"
+"\tsmtpServerPort = 587\n"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:498
+#: en/git-send-email.txt:500
#, priority:100
msgid "If you have multifactor authentication setup on your gmail account, you will need to generate an app-specific password for use with 'git send-email'. Visit https://security.google.com/settings/security/apppasswords to create it."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:501
+#: en/git-send-email.txt:503
#, priority:100
msgid "Once your commits are ready to be sent to the mailing list, run the following commands:"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:505
+#: en/git-send-email.txt:507
#, no-wrap, priority:100
msgid ""
"\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -44719,19 +44981,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:510
+#: en/git-send-email.txt:512
#, priority:100
msgid "The first time you run it, you will be prompted for your credentials. Enter the app-specific or your regular password as appropriate. If you have credential helper configured (see linkgit:git-credential[1]), the password will be saved in the credential store so you won't have to type it the next time."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:518
#, priority:100
msgid "Note: the following core Perl modules that may be installed with your distribution of Perl are required: MIME::Base64, MIME::QuotedPrint, Net::Domain and Net::SMTP. These additional Perl modules are also required: Authen::SASL and Mail::Address."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:521
+#: en/git-send-email.txt:523
#, priority:100
msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
msgstr ""
@@ -46320,25 +46582,25 @@ msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--a
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:92
+#: en/git-stash.txt:93
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs, and any non-option arguments form the message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:93
+#: en/git-stash.txt:94
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:100
+#: en/git-stash.txt:101
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:104
+#: en/git-stash.txt:105
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46346,139 +46608,139 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:108
+#: en/git-stash.txt:109
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:109
+#: en/git-stash.txt:110
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:119
+#: en/git-stash.txt:120
#, priority:240
msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:120
+#: en/git-stash.txt:121
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:126
+#: en/git-stash.txt:127
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:130
+#: en/git-stash.txt:131
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:135
+#: en/git-stash.txt:136
#, priority:240
msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:138
+#: en/git-stash.txt:139
#, priority:240
msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:139
+#: en/git-stash.txt:140
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:145
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:145
+#: en/git-stash.txt:146
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:153
+#: en/git-stash.txt:154
#, priority:240
msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:159
+#: en/git-stash.txt:160
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:160
+#: en/git-stash.txt:161
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:164
+#: en/git-stash.txt:165
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:165
+#: en/git-stash.txt:166
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:171
+#: en/git-stash.txt:172
#, priority:240
msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:172 en/git-update-ref.txt:100
+#: en/git-stash.txt:173 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:179
+#: en/git-stash.txt:180
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:180
+#: en/git-stash.txt:181
#, no-wrap, priority:240
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:186
+#: en/git-stash.txt:187
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:195
+#: en/git-stash.txt:196
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:199
+#: en/git-stash.txt:200
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46487,31 +46749,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:203
+#: en/git-stash.txt:204
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:208
+#: en/git-stash.txt:209
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:214
+#: en/git-stash.txt:215
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:219
+#: en/git-stash.txt:220
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:227
+#: en/git-stash.txt:228
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -46523,13 +46785,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:235
+#: en/git-stash.txt:236
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:246
+#: en/git-stash.txt:247
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46544,13 +46806,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:249
+#: en/git-stash.txt:250
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:257
+#: en/git-stash.txt:258
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46562,19 +46824,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:259
+#: en/git-stash.txt:260
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:264
+#: en/git-stash.txt:265
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:275
+#: en/git-stash.txt:276
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46589,19 +46851,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:277
+#: en/git-stash.txt:278
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:283
+#: en/git-stash.txt:284
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:288
+#: en/git-stash.txt:289
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -46610,7 +46872,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:298
+#: en/git-stash.txt:299
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -46688,61 +46950,61 @@ msgid "In addition to the names of files that have been changed, also show the t
msgstr ""
#. type: Plain text
-#: en/git-status.txt:65
+#: en/git-status.txt:66
#, priority:280
msgid "The mode parameter is used to specify the handling of untracked files. It is optional: it defaults to 'all', and if specified, it must be stuck to the option (e.g. `-uno`, but not `-u no`)."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:69
+#: en/git-status.txt:70
#, no-wrap, priority:280
msgid "'no' - Show no untracked files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:70
+#: en/git-status.txt:71
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:81
+#: en/git-status.txt:82
#, priority:280
msgid "When `-u` option is not used, untracked files and directories are shown (i.e. the same as specifying `normal`), to help you avoid forgetting to add newly created files. Because it takes extra work to find untracked files in the filesystem, this mode may take some time in a large working tree. Consider enabling untracked cache and split index if supported (see `git update-index --untracked-cache` and `git update-index --split-index`), Otherwise you can use `no` to have `git status` return more quickly without showing untracked files."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:99
+#: en/git-status.txt:101
#, priority:280
msgid "Ignore changes to submodules when looking for changes. <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 before 1.7.0). Using \"all\" hides all changes to submodules (and suppresses the output of submodule summaries when the config option `status.submoduleSummary` is set)."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:100
+#: en/git-status.txt:102
#, no-wrap, priority:280
msgid "--ignored[=<mode>]"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:102
+#: en/git-status.txt:104
#, priority:280
msgid "Show ignored files as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:105
+#: en/git-status.txt:108
#, priority:280
msgid "The mode parameter is used to specify the handling of ignored files. It is optional: it defaults to 'traditional'."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:109
+#: en/git-status.txt:112
#, priority:280
msgid "'traditional' - Shows ignored files and directories, unless"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:112
+#: en/git-status.txt:115
#, no-wrap, priority:280
msgid ""
"--untracked-files=all is specified, in which case\n"
@@ -46751,109 +47013,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:113
+#: en/git-status.txt:116
#, no-wrap, priority:280
msgid "'no'\t - Show no ignored files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:114
+#: en/git-status.txt:117
#, no-wrap, priority:280
msgid "'matching' - Shows ignored files and directories matching an\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:115
+#: en/git-status.txt:118
#, no-wrap, priority:280
msgid "ignore pattern.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:121
+#: en/git-status.txt:124
#, priority:280
msgid "When 'matching' mode is specified, paths that explicitly match an ignored pattern are shown. If a directory matches an ignore pattern, then it is shown, but not paths contained in the ignored directory. If a directory does not match an ignore pattern, but all contents are ignored, then the directory is not shown, but all contents are shown."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:125
+#: en/git-status.txt:129
#, priority:280
msgid "Terminate entries with NUL, instead of LF. This implies the `--porcelain=v1` output format if no other format is given."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:132
+#: en/git-status.txt:136
#, priority:280
msgid "Display untracked files in columns. See configuration variable column.status for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:133
+#: en/git-status.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--ahead-behind"
msgstr "--ahead-behind"
#. type: Labeled list
-#: en/git-status.txt:134
+#: en/git-status.txt:138
#, ignore-same, no-wrap, priority:280
msgid "--no-ahead-behind"
msgstr "--no-ahead-behind"
#. type: Plain text
-#: en/git-status.txt:137
+#: en/git-status.txt:141
#, priority:280
msgid "Display or do not display detailed ahead/behind counts for the branch relative to its upstream branch. Defaults to true."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:138
+#: en/git-status.txt:142
#, ignore-same, no-wrap, priority:280
msgid "--renames"
msgstr "--renames"
#. type: Plain text
-#: en/git-status.txt:142
+#: en/git-status.txt:146
#, priority:280
msgid "Turn on/off rename detection regardless of user configuration. See also linkgit:git-diff[1] `--no-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:147
+#: en/git-status.txt:151
#, priority:280
msgid "Turn on rename detection, optionally setting the similarity threshold. See also linkgit:git-diff[1] `--find-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:150
+#: en/git-status.txt:154
#, priority:280
msgid "See the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:158
+#: en/git-status.txt:162
#, priority:280
msgid "The output from this command is designed to be used as a commit template comment. The default, long format, is designed to be human readable, verbose and descriptive. Its contents and format are subject to change at any time."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:163
+#: en/git-status.txt:167
#, priority:280
msgid "The paths mentioned in the output, unlike many other Git commands, are made relative to the current directory if you are working in a subdirectory (this is on purpose, to help cutting and pasting). See the status.relativePaths config option below."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:165
+#: en/git-status.txt:169
#, no-wrap, priority:280
msgid "Short Format"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:169
+#: en/git-status.txt:173
#, priority:280
msgid "In the short-format, the status of each path is shown as one of these forms"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:172
+#: en/git-status.txt:176
#, no-wrap, priority:280
msgid ""
"\tXY PATH\n"
@@ -46861,73 +47123,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:176
+#: en/git-status.txt:180
#, priority:280
msgid "where `ORIG_PATH` is where the renamed/copied contents came from. `ORIG_PATH` is only shown when the entry is renamed or copied. The `XY` is a two-letter status code."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:182
+#: en/git-status.txt:186
#, priority:280
msgid "The fields (including the `->`) are separated from each other by a single space. If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash-escaped."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:188
+#: en/git-status.txt:192
#, priority:280
msgid "For paths with merge conflicts, `X` and `Y` show the modification states of each side of the merge. For paths that do not have merge conflicts, `X` shows the status of the index, and `Y` shows the status of the work tree. For untracked paths, `XY` are `??`. Other status codes can be interpreted as follows:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:190
+#: en/git-status.txt:194
#, priority:280
msgid "' ' = unmodified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:191
+#: en/git-status.txt:195
#, priority:280
msgid "'M' = modified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:192
+#: en/git-status.txt:196
#, priority:280
msgid "'A' = added"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:193
+#: en/git-status.txt:197
#, priority:280
msgid "'D' = deleted"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:194
+#: en/git-status.txt:198
#, priority:280
msgid "'R' = renamed"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:195
+#: en/git-status.txt:199
#, priority:280
msgid "'C' = copied"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:196
+#: en/git-status.txt:200
#, priority:280
msgid "'U' = updated but unmerged"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:199
+#: en/git-status.txt:203
#, priority:280
msgid "Ignored files are not listed, unless `--ignored` option is in effect, in which case `XY` are `!!`."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:226
+#: en/git-status.txt:230
#, no-wrap, priority:280
msgid ""
"X Y Meaning\n"
@@ -46958,7 +47220,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:235
+#: en/git-status.txt:239
#, no-wrap, priority:280
msgid ""
"Submodules have more state and instead report\n"
@@ -46971,91 +47233,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:238
+#: en/git-status.txt:242
#, priority:280
msgid "'m' and '?' are applied recursively. For example if a nested submodule in a submodule contains an untracked file, this is reported as '?' as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:240
+#: en/git-status.txt:244
#, priority:280
msgid "If -b is used the short-format status is preceded by a line"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:242
+#: en/git-status.txt:246
#, no-wrap, priority:280
msgid " ## branchname tracking info\n"
msgstr ""
#. type: Title ~
-#: en/git-status.txt:244
+#: en/git-status.txt:248
#, no-wrap, priority:280
msgid "Porcelain Format Version 1"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:251
+#: en/git-status.txt:255
#, priority:280
msgid "Version 1 porcelain format is similar to the short format, but is guaranteed not to change in a backwards-incompatible way between Git versions or based on user configuration. This makes it ideal for parsing by scripts. The description of the short format above also describes the porcelain format, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:254
+#: en/git-status.txt:258
#, priority:280
msgid "The user's color.status configuration is not respected; color will always be off."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:257
+#: en/git-status.txt:261
#, priority:280
msgid "The user's status.relativePaths configuration is not respected; paths shown will always be relative to the repository root."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:267
+#: en/git-status.txt:271
#, priority:280
msgid "There is also an alternate -z format recommended for machine parsing. In that format, the status field is the same, but some other things change. First, the '\\->' is omitted from rename entries and the field order is reversed (e.g 'from \\-> to' becomes 'to from'). Second, a NUL (ASCII 0) follows each filename, replacing space as a field separator and the terminating newline (but a space still separates the status field from the first filename). Third, filenames containing special characters are not specially formatted; no quoting or backslash-escaping is performed."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:269
+#: en/git-status.txt:273
#, priority:280
msgid "Any submodule changes are reported as modified `M` instead of `m` or single `?`."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:271
+#: en/git-status.txt:275
#, no-wrap, priority:280
msgid "Porcelain Format Version 2"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:276
+#: en/git-status.txt:280
#, priority:280
msgid "Version 2 format adds more detailed information about the state of the worktree and changed items. Version 2 also defines an extensible set of easy to parse optional headers."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:280
+#: en/git-status.txt:284
#, priority:280
msgid "Header lines start with \"#\" and are added in response to specific command line arguments. Parsers should ignore headers they don't recognize."
msgstr ""
#. type: Title ^
-#: en/git-status.txt:282
+#: en/git-status.txt:286
#, no-wrap, priority:280
msgid "Branch Headers"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:286
+#: en/git-status.txt:290
#, priority:280
msgid "If `--branch` is given, a series of header lines are printed with information about the current branch."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:296
+#: en/git-status.txt:300
#, no-wrap, priority:280
msgid ""
"Line Notes\n"
@@ -47069,43 +47331,43 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:299
+#: en/git-status.txt:303
#, no-wrap, priority:280
msgid "Changed Tracked Entries"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:306
+#: en/git-status.txt:310
#, priority:280
msgid "Following the headers, a series of lines are printed for tracked entries. One of three different line formats may be used to describe an entry depending on the type of change. Tracked entries are printed in an undefined order; parsers should allow for a mixture of the 3 line types in any order."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:308
+#: en/git-status.txt:312
#, priority:280
msgid "Ordinary changed entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:310
+#: en/git-status.txt:314
#, no-wrap, priority:280
msgid " 1 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:312
+#: en/git-status.txt:316
#, priority:280
msgid "Renamed or copied entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:314
+#: en/git-status.txt:318
#, no-wrap, priority:280
msgid " 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:345
+#: en/git-status.txt:349
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47140,19 +47402,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:349
+#: en/git-status.txt:353
#, priority:280
msgid "Unmerged entries have the following format; the first character is a \"u\" to distinguish from ordinary changed entries."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:351
+#: en/git-status.txt:355
#, no-wrap, priority:280
msgid " u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:368
+#: en/git-status.txt:372
#, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47173,85 +47435,85 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:371
+#: en/git-status.txt:375
#, no-wrap, priority:280
msgid "Other Items"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:376
+#: en/git-status.txt:380
#, priority:280
msgid "Following the tracked entries (and if requested), a series of lines will be printed for untracked and then ignored items found in the worktree."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:378
+#: en/git-status.txt:382
#, priority:280
msgid "Untracked items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:380
+#: en/git-status.txt:384
#, no-wrap, priority:280
msgid " ? <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:382
+#: en/git-status.txt:386
#, priority:280
msgid "Ignored items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:384
+#: en/git-status.txt:388
#, no-wrap, priority:280
msgid " ! <path>\n"
msgstr ""
#. type: Title ^
-#: en/git-status.txt:386
+#: en/git-status.txt:390
#, no-wrap, priority:280
msgid "Pathname Format Notes and -z"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:391
+#: en/git-status.txt:395
#, priority:280
msgid "When the `-z` option is given, pathnames are printed as is and without any quoting and lines are terminated with a NUL (ASCII 0x00) byte."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:395
+#: en/git-status.txt:399
#, 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])."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:404
+#: en/git-status.txt:408
#, priority:280
msgid "The command honors `color.status` (or `status.color` -- they mean the same thing and the latter is kept for backward compatibility) and `color.status.<slot>` configuration variables to colorize its output."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:408
+#: en/git-status.txt:412
#, priority:280
msgid "If the config variable `status.relativePaths` is set to false, then all paths shown are relative to the repository root, not to the current directory."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:419
+#: en/git-status.txt:423
#, priority:280
msgid "If `status.submoduleSummary` is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). Please note that the summary output from the status command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings."
msgstr ""
#. type: Title -
-#: en/git-status.txt:421
+#: en/git-status.txt:425
#, no-wrap, priority:280
msgid "BACKGROUND REFRESH"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:432
+#: en/git-status.txt:436
#, priority:280
msgid "By default, `git status` will automatically refresh the index, updating the cached stat information from the working tree and writing out the result. Writing out the updated index is an optimization that isn't strictly necessary (`status` computes the values for itself, but writing them out is just to save subsequent programs from repeating our computation). When `status` is run in the background, the lock held during the write may conflict with other simultaneous processes, causing them to fail. Scripts running `status` in the background should consider using `git --no-optional-locks status` (see linkgit:git[1] for details)."
msgstr ""
@@ -47695,281 +47957,287 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:176
#, no-wrap, priority:220
-msgid "set-branch ((-d|--default)|(-b|--branch <branch>)) [--] <path>"
+msgid "set-branch (-b|--branch) <branch> [--] <path>"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-submodule.txt:177
+#, no-wrap, priority:220
+msgid "set-branch (-d|--default) [--] <path>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:181
+#: en/git-submodule.txt:182
#, priority:220
msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:182
+#: en/git-submodule.txt:183
#, ignore-ellipsis, no-wrap, priority:220
msgid "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:191
+#: en/git-submodule.txt:192
#, priority:220
msgid "Show commit summary between the given commit (defaults to HEAD) and working tree/index. For a submodule in question, a series of commits in the submodule between the given super project commit and the index or working tree (switched by `--cached`) are shown. If the option `--files` is given, show the series of commits in the submodule between the index of the super project and the working tree of the submodule (this option doesn't allow to use the `--cached` option or to provide an explicit commit)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:194
+#: en/git-submodule.txt:195
#, priority:220
msgid "Using the `--submodule=log` option with linkgit:git-diff[1] will provide that information too."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:195
+#: en/git-submodule.txt:196
#, no-wrap, priority:220
msgid "foreach [--recursive] <command>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:216
+#: en/git-submodule.txt:217
#, priority:220
msgid "Evaluates an arbitrary shell command in each checked out submodule. The command has access to the variables $name, $sm_path, $displaypath, $sha1 and $toplevel: $name is the name of the relevant submodule section in `.gitmodules`, $sm_path is the path of the submodule as recorded in the immediate superproject, $displaypath contains the relative path from the current working directory to the submodules root directory, $sha1 is the commit as recorded in the immediate superproject, and $toplevel is the absolute path to the top-level of the immediate superproject. Note that to avoid conflicts with '$PATH' on Windows, the '$path' variable is now a deprecated synonym of '$sm_path' variable. Any submodules defined in the superproject but not checked out are ignored by this command. Unless given `--quiet`, foreach prints the name of each submodule before evaluating the command. If `--recursive` is given, submodules are traversed recursively (i.e. the given shell command is evaluated in nested submodules as well). A non-zero return from the command in any submodule causes the processing to terminate. This can be overridden by adding '|| :' to the end of the command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:219
+#: en/git-submodule.txt:220
#, priority:220
msgid "As an example, the command below will show the path and currently checked out commit for each submodule:"
msgstr ""
#. type: delimited block -
-#: en/git-submodule.txt:222
+#: en/git-submodule.txt:223
#, no-wrap, priority:220
msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:224
+#: en/git-submodule.txt:225
#, ignore-ellipsis, no-wrap, priority:220
msgid "sync [--recursive] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:231
+#: en/git-submodule.txt:232
#, priority:220
msgid "Synchronizes submodules' remote URL configuration setting to the value specified in `.gitmodules`. It will only affect those submodules which already have a URL entry in .git/config (that is the case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:234
+#: en/git-submodule.txt:235
#, priority:220
msgid "`git submodule sync` synchronizes all submodules while `git submodule sync -- A` synchronizes submodule \"A\" only."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:237
+#: en/git-submodule.txt:238
#, priority:220
msgid "If `--recursive` is specified, this command will recurse into the registered submodules, and sync any nested submodules within."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:238
+#: en/git-submodule.txt:239
#, no-wrap, priority:220
msgid "absorbgitdirs"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:245
+#: en/git-submodule.txt:246
#, priority:220
msgid "If a git directory of a submodule is inside the submodule, move the git directory of the submodule into its superprojects `$GIT_DIR/modules` path and then connect the git directory and its working directory by setting the `core.worktree` and adding a .git file pointing to the git directory embedded in the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:249
+#: en/git-submodule.txt:250
#, priority:220
msgid "A repository that was cloned independently and later added as a submodule or old setups have the submodules git directory inside the submodule instead of embedded into the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:251
+#: en/git-submodule.txt:252
#, priority:220
msgid "This command is recursive by default."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:257
+#: en/git-submodule.txt:258
#, priority:220
msgid "Only print error messages."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:264
+#: en/git-submodule.txt:265
#, priority:220
msgid "This option is only valid for add and update commands. Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:268
+#: en/git-submodule.txt:269
#, priority:220
msgid "This option is only valid for the deinit command. Unregister all submodules in the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:269
+#: en/git-submodule.txt:270
#, no-wrap, priority:220
msgid "-b <branch>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:277
+#: en/git-submodule.txt:278
#, priority:220
msgid "Branch of repository to add as submodule. The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository. If the option is not specified, it defaults to 'master'."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:290
+#: en/git-submodule.txt:291
#, priority:220
msgid "This option is only valid for add, deinit and update commands. When running add, allow adding an otherwise ignored submodule path. When running deinit the submodule working trees will be removed even if they contain local changes. When running update (only effective with the checkout procedure), throw away local changes in submodules when switching to a different commit; and always run a checkout operation in the submodule, even if the commit listed in the index of the containing repository matches the commit checked out in the submodule."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:295
+#: en/git-submodule.txt:296
#, priority:220
msgid "This option is only valid for status and summary commands. These commands typically use the commit found in the submodule HEAD, but with this option, the commit stored in the index is used instead."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:296
+#: en/git-submodule.txt:297
#, ignore-same, no-wrap, priority:220
msgid "--files"
msgstr "--files"
#. type: Plain text
-#: en/git-submodule.txt:300
+#: en/git-submodule.txt:301
#, priority:220
msgid "This option is only valid for the summary command. This command compares the commit in the index with that in the submodule HEAD when this option is used."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:302
+#: en/git-submodule.txt:303
#, ignore-same, no-wrap, priority:220
msgid "--summary-limit"
msgstr "--summary-limit"
#. type: Plain text
-#: en/git-submodule.txt:308
+#: en/git-submodule.txt:309
#, priority:220
msgid "This option is only valid for the summary command. Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:309
+#: en/git-submodule.txt:310
#, ignore-same, no-wrap, priority:220
msgid "--remote"
msgstr "--remote"
#. type: Plain text
-#: en/git-submodule.txt:318
+#: en/git-submodule.txt:319
#, priority:220
msgid "This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:324
+#: en/git-submodule.txt:325
#, priority:220
msgid "This works for any of the supported update procedures (`--checkout`, `--rebase`, etc.). The only change is the source of the target SHA-1. For example, `submodule update --remote --merge` will merge upstream submodule changes into the submodules, while `submodule update --merge` will merge superproject gitlink changes into the submodules."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:329
+#: en/git-submodule.txt:330
#, priority:220
msgid "In order to ensure a current tracking branch state, `update --remote` fetches the submodule's remote repository before calculating the SHA-1. If you don't want to fetch, you should use `submodule update --remote --no-fetch`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:339
+#: en/git-submodule.txt:340
#, priority:220
msgid "Use this option to integrate changes from the upstream subproject with your submodule's current HEAD. Alternatively, you can run `git pull` from the submodule, which is equivalent except for the remote branch name: `update --remote` uses the default upstream repository and `submodule.<name>.branch`, while `git pull` uses the submodule's `branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want to distribute the default upstream branch with the superproject and `branch.<name>.merge` if you want a more native feel while working in the submodule itself."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:341
+#: en/git-submodule.txt:342
#, ignore-same, no-wrap, priority:220
msgid "--no-fetch"
msgstr "--no-fetch"
#. type: Plain text
-#: en/git-submodule.txt:344
+#: en/git-submodule.txt:345
#, priority:220
msgid "This option is only valid for the update command. Don't fetch new objects from the remote site."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:345
+#: en/git-submodule.txt:346
#, ignore-same, no-wrap, priority:220
msgid "--checkout"
msgstr "--checkout"
#. type: Plain text
-#: en/git-submodule.txt:353
+#: en/git-submodule.txt:354
#, priority:220
msgid "This option is only valid for the update command. Checkout the commit recorded in the superproject on a detached HEAD in the submodule. This is the default behavior, the main use of this option is to override `submodule.$name.update` when set to a value other than `checkout`. If the key `submodule.$name.update` is either not explicitly set or set to `checkout`, this option is implicit."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:363
+#: en/git-submodule.txt:364
#, priority:220
msgid "This option is only valid for the update command. Merge the commit recorded in the superproject into the current branch of the submodule. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve the resulting conflicts within the submodule with the usual conflict resolution tools. If the key `submodule.$name.update` is set to `merge`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:364
+#: en/git-submodule.txt:365
#, ignore-same, no-wrap, priority:220
msgid "--rebase"
msgstr "--rebase"
#. type: Plain text
-#: en/git-submodule.txt:372
+#: en/git-submodule.txt:373
#, priority:220
msgid "This option is only valid for the update command. Rebase the current branch onto the commit recorded in the superproject. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve these failures with linkgit:git-rebase[1]. If the key `submodule.$name.update` is set to `rebase`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:373
+#: en/git-submodule.txt:374
#, ignore-same, no-wrap, priority:220
msgid "--init"
msgstr "--init"
#. type: Plain text
-#: en/git-submodule.txt:377
+#: en/git-submodule.txt:378
#, priority:220
msgid "This option is only valid for the update command. Initialize all submodules for which \"git submodule init\" has not been called so far before updating."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:378
+#: en/git-submodule.txt:379
#, ignore-same, no-wrap, priority:220
msgid "--name"
msgstr "--name"
#. type: Plain text
-#: en/git-submodule.txt:382
+#: en/git-submodule.txt:383
#, priority:220
msgid "This option is only valid for the add command. It sets the submodule's name to the given string instead of defaulting to its path. The name must be valid as a directory name and may not end with a '/'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:383
+#: en/git-submodule.txt:384
#, no-wrap, priority:220
msgid "--reference <repository>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:387 en/git-submodule.txt:396
+#: en/git-submodule.txt:388 en/git-submodule.txt:397
#, priority:220
msgid "This option is only valid for add and update commands. These commands sometimes need to clone a remote repository. In this case, this option will be passed to the linkgit:git-clone[1] command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:391
+#: en/git-submodule.txt:392
#, no-wrap, priority:220
msgid ""
"*NOTE*: Do *not* use this option unless you have read the note\n"
@@ -47978,61 +48246,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:398
+#: en/git-submodule.txt:399
#, no-wrap, priority:220
msgid "*NOTE*: see the NOTE for the `--reference` option.\n"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:404
+#: en/git-submodule.txt:405
#, priority:220
msgid "This option is only valid for foreach, update, status and sync commands. Traverse submodules recursively. The operation is performed not only in the submodules of the current repo, but also in any nested submodules inside those submodules (and so on)."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:405
+#: en/git-submodule.txt:406
#, ignore-same, no-wrap, priority:220
msgid "--depth"
msgstr "--depth"
#. type: Plain text
-#: en/git-submodule.txt:409
+#: en/git-submodule.txt:410
#, priority:220
msgid "This option is valid for add and update commands. Create a 'shallow' clone with a history truncated to the specified number of revisions. See linkgit:git-clone[1]"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:410
+#: en/git-submodule.txt:411
#, ignore-same, no-wrap, priority:220
msgid "--[no-]recommend-shallow"
msgstr "--[no-]recommend-shallow"
#. type: Plain text
-#: en/git-submodule.txt:415
+#: en/git-submodule.txt:416
#, priority:220
msgid "This option is only valid for the update command. The initial clone of a submodule will use the recommended `submodule.<name>.shallow` as provided by the `.gitmodules` file by default. To ignore the suggestions use `--no-recommend-shallow`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:421
+#: en/git-submodule.txt:422
#, priority:220
msgid "This option is only valid for the update command. Clone new submodules in parallel with as many jobs. Defaults to the `submodule.fetchJobs` option."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:426
+#: en/git-submodule.txt:427
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:434
+#: en/git-submodule.txt:435
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:438
+#: en/git-submodule.txt:439
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -48664,7 +48932,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:889
+#: en/git-svn.txt:346 en/rev-list-options.txt:905
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -49477,7 +49745,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:777
#, priority:100
-msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider linkgit:git-filter-branch[1] instead. filter-branch also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
+msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports, and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider https://github.com/newren/git-filter-repo[git-filter-repo] instead. filter-repo also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
msgstr ""
#. type: Labeled list
@@ -51398,16 +51666,6 @@ msgid ""
"#\n"
msgstr ""
-#. type: delimited block -
-#: en/git.txt:310
-#, 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/git.txt:315
#, no-wrap, priority:100
@@ -55448,98 +55706,104 @@ msgstr ""
msgid "This option determines how the merge message will be cleaned up before commiting. See linkgit:git-commit[1] for more details. In addition, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on to the commit machinery in the case of a merge conflict."
msgstr ""
+#. type: Labeled list
+#: en/merge-options.txt:44
+#, ignore-same, no-wrap, priority:240
+msgid "--ff-only"
+msgstr "--ff-only"
+
#. type: Plain text
-#: en/merge-options.txt:46
+#: en/merge-options.txt:50
#, priority:240
-msgid "When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. This is the default behavior."
+msgid "Specifies how a merge is handled when the merged-in history is already a descendant of the current history. `--ff` is the default unless merging an annotated (and possibly signed) tag that is not stored in its natural place in the `refs/tags/` hierarchy, in which case `--no-ff` is assumed."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:52
+#: en/merge-options.txt:55
#, priority:240
-msgid "Create a merge commit even when the merge resolves as a fast-forward. This is the default behaviour when merging an annotated (and possibly signed) tag that is not stored in its natural place in 'refs/tags/' hierarchy."
+msgid "With `--ff`, when possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit."
msgstr ""
-#. type: Labeled list
-#: en/merge-options.txt:53
-#, ignore-same, no-wrap, priority:240
-msgid "--ff-only"
-msgstr "--ff-only"
+#. type: Plain text
+#: en/merge-options.txt:58
+#, priority:240
+msgid "With `--no-ff`, create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward."
+msgstr ""
#. type: Plain text
-#: en/merge-options.txt:57
+#: en/merge-options.txt:61
#, priority:240
-msgid "Refuse to merge and exit with a non-zero status unless the current `HEAD` is already up to date or the merge can be resolved as a fast-forward."
+msgid "With `--ff-only`, resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:63
+#: en/merge-options.txt:67
#, priority:240
msgid "GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:69
+#: en/merge-options.txt:73
#, priority:240
msgid "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also linkgit:git-fmt-merge-msg[1]."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:72
+#: en/merge-options.txt:76
#, priority:240
msgid "With --no-log do not list one-line descriptions from the actual commits being merged."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:74
+#: en/merge-options.txt:78
#, ignore-same, no-wrap, priority:240
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
-#: en/merge-options.txt:83
+#: en/merge-options.txt:87
#, priority:240
msgid "With --no-signoff do not add a Signed-off-by line."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:89
+#: en/merge-options.txt:93
#, priority:240
msgid "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:92
+#: en/merge-options.txt:96
#, priority:240
msgid "With -n or --no-stat do not show a diffstat at the end of the merge."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:93
+#: en/merge-options.txt:97
#, ignore-same, no-wrap, priority:240
msgid "--squash"
msgstr "--squash"
#. type: Labeled list
-#: en/merge-options.txt:94
+#: en/merge-options.txt:98
#, ignore-same, no-wrap, priority:240
msgid "--no-squash"
msgstr "--no-squash"
#. type: Plain text
-#: en/merge-options.txt:102
+#: en/merge-options.txt:106
#, priority:240
msgid "Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:105
+#: en/merge-options.txt:109
#, priority:240
msgid "With --no-squash perform the merge and commit the result. This option can be used to override --squash."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:107
+#: en/merge-options.txt:111
#, priority:240
msgid "With --squash, --commit is not allowed, and will fail."
msgstr ""
@@ -55547,71 +55811,77 @@ msgstr ""
#. type: Plain text
#: en/merge-options.txt:115
#, priority:240
+msgid "This option bypasses the pre-merge and commit-msg hooks. See also linkgit:githooks[5]."
+msgstr ""
+
+#. type: Plain text
+#: en/merge-options.txt:123
+#, priority:240
msgid "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise)."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:116
+#: en/merge-options.txt:124
#, no-wrap, priority:240
msgid "-X <option>"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:120
+#: en/merge-options.txt:128
#, priority:240
msgid "Pass merge strategy specific option through to the merge strategy."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:121
+#: en/merge-options.txt:129
#, ignore-same, no-wrap, priority:240
msgid "--verify-signatures"
msgstr "--verify-signatures"
#. type: Labeled list
-#: en/merge-options.txt:122
+#: en/merge-options.txt:130
#, ignore-same, no-wrap, priority:240
msgid "--no-verify-signatures"
msgstr "--no-verify-signatures"
#. type: Plain text
-#: en/merge-options.txt:128
+#: en/merge-options.txt:136
#, priority:240
msgid "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:130
+#: en/merge-options.txt:138
#, ignore-same, no-wrap, priority:240
msgid "--no-summary"
msgstr "--no-summary"
#. type: Plain text
-#: en/merge-options.txt:133
+#: en/merge-options.txt:141
#, priority:240
msgid "Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:138
+#: en/merge-options.txt:146
#, priority:240
msgid "Operate quietly. Implies --no-progress."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:149
+#: en/merge-options.txt:157
#, priority:240
msgid "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:152
+#: en/merge-options.txt:160
#, ignore-same, no-wrap, priority:240
msgid "--allow-unrelated-histories"
msgstr "--allow-unrelated-histories"
#. type: Plain text
-#: en/merge-options.txt:158
+#: en/merge-options.txt:166
#, priority:240
msgid "By default, `git merge` command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added."
msgstr ""
@@ -56934,7 +57204,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:215
#, priority:260
-msgid "minutes ago`}; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -59312,263 +59582,281 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:762
#, priority:260
+msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:771
+#, ignore-ellipsis, priority:260
+msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:775
+#, priority:260
+msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:778
+#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:779
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:766
+#: en/rev-list-options.txt:782
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:773
+#: en/rev-list-options.txt:789
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:781
+#: en/rev-list-options.txt:797
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:800
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:791
+#: en/rev-list-options.txt:807
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:793
+#: en/rev-list-options.txt:809
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:801
+#: en/rev-list-options.txt:817
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:802
+#: en/rev-list-options.txt:818
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:804
+#: en/rev-list-options.txt:820
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:822
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:812
+#: en/rev-list-options.txt:828
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:832
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:818
+#: en/rev-list-options.txt:834
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:819
+#: en/rev-list-options.txt:835
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:826
+#: en/rev-list-options.txt:842
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:847
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:833
+#: en/rev-list-options.txt:849
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:852
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:838
+#: en/rev-list-options.txt:854
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:839
+#: en/rev-list-options.txt:855
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:840
+#: en/rev-list-options.txt:856
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:859
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:846
+#: en/rev-list-options.txt:862
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:864
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:873
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:864
+#: en/rev-list-options.txt:880
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:868
+#: en/rev-list-options.txt:884
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:875
+#: en/rev-list-options.txt:891
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:894
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:880
+#: en/rev-list-options.txt:896
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:882
+#: en/rev-list-options.txt:898
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:884
+#: en/rev-list-options.txt:900
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:887
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:892
+#: en/rev-list-options.txt:908
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:909
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:896
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:898
+#: en/rev-list-options.txt:914
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:902
+#: en/rev-list-options.txt:918
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:907
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:925
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:932
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -59579,19 +59867,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:919
+#: en/rev-list-options.txt:935
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:922
+#: en/rev-list-options.txt:938
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:929
+#: en/rev-list-options.txt:945
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -59603,85 +59891,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:931
+#: en/rev-list-options.txt:947
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:937
+#: en/rev-list-options.txt:953
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:939
+#: en/rev-list-options.txt:955
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:942
+#: en/rev-list-options.txt:958
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:943
+#: en/rev-list-options.txt:959
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:949
+#: en/rev-list-options.txt:965
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:959
+#: en/rev-list-options.txt:975
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:963
+#: en/rev-list-options.txt:979
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:984
#, priority:260
msgid "Listed below are options that control the formatting of diff output. Some of them are specific to linkgit:git-rev-list[1], however other diff options may be given. See linkgit:git-diff-files[1] for more options."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:991
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:981
+#: en/rev-list-options.txt:997
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:1012
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1015
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1018
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.it.po b/po/documentation.it.po
index 569e44b6e382db6274d1c1e763242c8b6dec1d62..66a04ee4e50821a1fdde5c5d1b7dd5c912cf2e84 100644
--- a/po/documentation.it.po
+++ b/po/documentation.it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2019-08-27 18:53+0200\n"
+"POT-Creation-Date: 2019-12-08 16:35+0100\n"
"PO-Revision-Date: 2019-11-22 20:04+0000\n"
"Last-Translator: Francesco Zannino <francesco.zannino@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "-b"
msgstr "-b"
@@ -31,8 +31,8 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:319 en/git-fsck.txt:38 en/git-rebase.txt:471
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:321 en/git-fsck.txt:38 en/git-rebase.txt:493
+#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -44,7 +44,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:9
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--show-stats"
msgstr "--show-stats"
@@ -80,7 +80,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:198 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "-l"
msgstr "-l"
@@ -91,8 +91,8 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1000
-#, no-wrap, ignore-same, no-wrap, priority:260
+#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1016
+#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -127,14 +127,14 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:433 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
-#, no-wrap, ignore-same, no-wrap, priority:300
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
#. type: Labeled list
#: en/blame-options.txt:40 en/git-commit.txt:113 en/git-push.txt:176 en/git-worktree.txt:179
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--porcelain"
msgstr "--porcelain"
@@ -146,7 +146,7 @@ msgstr "Visualizza l'output in un formato progettato per l'utilizzo da parte di
#. type: Labeled list
#: en/blame-options.txt:43
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--line-porcelain"
msgstr "--line-porcelain"
@@ -158,7 +158,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:48 en/git-pack-objects.txt:138 en/git-svn.txt:373
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--incremental"
msgstr "--incremental"
@@ -206,7 +206,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:73 en/git-fsck.txt:100
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]progress"
msgstr "--[no-]progress"
@@ -278,7 +278,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "-h"
msgstr "-h"
@@ -290,7 +290,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:1 en/git-blame.txt:233
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-annotate[1]"
msgstr "linkgit:git-annotate[1]"
@@ -302,7 +302,7 @@ msgstr "Annota le righe dei file con le informazioni sui commit"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:4 en/git-annotate.txt:30
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-blame[1]"
msgstr "linkgit:git-blame[1]"
@@ -314,7 +314,7 @@ msgstr "Visualizza quali revisione e autore hanno modificato ogni singola riga d
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
@@ -326,7 +326,7 @@ msgstr "Conta il numero di oggetti non in un pack e la loro occupazione di spazi
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:10
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
@@ -338,7 +338,7 @@ msgstr "Visualizza le modifiche usando tool comuni per la visualizzazione dei di
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:13
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
@@ -350,7 +350,7 @@ msgstr "Verifica la connessione e la validit횪 degli oggetti nel database"
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:16
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
@@ -362,7 +362,7 @@ msgstr "Visualizza una guida a Git"
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:19
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
@@ -374,7 +374,7 @@ msgstr "Sfoglia istantaneamente il tuo repository di lavoro su gitweb"
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:22
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
@@ -386,7 +386,7 @@ msgstr "Visualizza un merge a tre vie senza modificare l'indice"
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:25
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
@@ -398,7 +398,7 @@ msgstr "Riusa la risoluzione registrata dei merge che hanno generato conflitti"
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:28
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
@@ -410,7 +410,7 @@ msgstr "Visualizza i branch e i loro commit"
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:31
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
@@ -422,7 +422,7 @@ msgstr "Verifica la firma GPG dei commit"
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:34
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
@@ -434,7 +434,7 @@ msgstr "Verifica la firma GPG dei tag"
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:37
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
@@ -446,7 +446,7 @@ msgstr "Visualizza i registri insieme alle differenze introdotte da ciascun comm
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
@@ -458,7 +458,7 @@ msgstr "Interfaccia Web per Git (frontend Web ai repository Git)"
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:1 en/git-difftool.txt:144
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-config[1]"
msgstr "linkgit:git-config[1]"
@@ -469,8 +469,8 @@ msgid "Get and set repository or global options."
msgstr "Ottiene e imposta le opzioni a livello di repository o globali"
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1505
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1528
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-export[1]"
msgstr "linkgit:git-fast-export[1]"
@@ -481,8 +481,8 @@ msgid "Git data exporter."
msgstr "Esportatore di dati Git"
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:243
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-import[1]"
msgstr "linkgit:git-fast-import[1]"
@@ -494,7 +494,7 @@ msgstr "Backend per importatori di dati Git veloci"
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:10
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-filter-branch[1]"
msgstr "linkgit:git-filter-branch[1]"
@@ -506,7 +506,7 @@ msgstr "Riscrive branch"
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:13 en/git-difftool.txt:141
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-mergetool[1]"
msgstr "linkgit:git-mergetool[1]"
@@ -518,7 +518,7 @@ msgstr "Esegue gli strumenti di risoluzione conflitti di merge per risolvere i c
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:16
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-pack-refs[1]"
msgstr "linkgit:git-pack-refs[1]"
@@ -530,7 +530,7 @@ msgstr "Esegue il pack di head e tag per un accesso efficiente al repository"
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:19
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-prune[1]"
msgstr "linkgit:git-prune[1]"
@@ -542,7 +542,7 @@ msgstr "Elimina tutti gli oggetti non raggiungibili dal database oggetti"
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:22
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-reflog[1]"
msgstr "linkgit:git-reflog[1]"
@@ -554,7 +554,7 @@ msgstr "Gestisce le informazioni del registro dei riferimenti"
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:25
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-remote[1]"
msgstr "linkgit:git-remote[1]"
@@ -566,7 +566,7 @@ msgstr "Gestisce l'insieme dei repository tracciati"
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:28
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-repack[1]"
msgstr "linkgit:git-repack[1]"
@@ -578,7 +578,7 @@ msgstr "Esegue il pack degli oggetti non sottoposti a pack in un repository"
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:31
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-replace[1]"
msgstr "linkgit:git-replace[1]"
@@ -590,7 +590,7 @@ msgstr "Crea, elenca, elimina i riferimenti per sostituire oggetti"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:1
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-archimport[1]"
msgstr "linkgit:git-archimport[1]"
@@ -602,7 +602,7 @@ msgstr "Importa un repository GNU Arch in Git"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:4
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-cvsexportcommit[1]"
msgstr "linkgit:git-cvsexportcommit[1]"
@@ -614,7 +614,7 @@ msgstr "Esporta un singolo commit in un checkout CVS"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:7
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-cvsimport[1]"
msgstr "linkgit:git-cvsimport[1]"
@@ -626,7 +626,7 @@ msgstr "Recupera i dati da un sistema di controllo di versione che le persone ad
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:10
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-cvsserver[1]"
msgstr "linkgit:git-cvsserver[1]"
@@ -638,7 +638,7 @@ msgstr "Un emulatore di server CVS per Git"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:13
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-imap-send[1]"
msgstr "linkgit:git-imap-send[1]"
@@ -650,7 +650,7 @@ msgstr "Invia un insieme di patch dallo standard input a una cartella IMAP"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:16
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-p4[1]"
msgstr "linkgit:git-p4[1]"
@@ -662,7 +662,7 @@ msgstr "Importa dati da, o invia dati a, repository Perforce"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:19
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-quiltimport[1]"
msgstr "linkgit:git-quiltimport[1]"
@@ -674,7 +674,7 @@ msgstr "Applica un insieme di patch quilt sul branch corrente"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:22
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-request-pull[1]"
msgstr "linkgit:git-request-pull[1]"
@@ -686,7 +686,7 @@ msgstr "Genera un riassunto delle modifiche in sospeso"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:25
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-send-email[1]"
msgstr "linkgit:git-send-email[1]"
@@ -698,7 +698,7 @@ msgstr "Invia un insieme di patch come e-mail"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:28
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-svn[1]"
msgstr "linkgit:git-svn[1]"
@@ -710,7 +710,7 @@ msgstr "Operativit횪 bidirezionale tra un repository Subversion e Git"
#. type: Plain text
#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
@@ -722,7 +722,7 @@ msgstr "Aggiunge i contenuti del file all'indice"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:4
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-am[1]"
msgstr "linkgit:git-am[1]"
@@ -734,7 +734,7 @@ msgstr "Applica una serie di patch da una casella di posta"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:7
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-archive[1]"
msgstr "linkgit:git-archive[1]"
@@ -746,7 +746,7 @@ msgstr "Crea un archivio di file da un albero con nome"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:10
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-bisect[1]"
msgstr "linkgit:git-bisect[1]"
@@ -758,7 +758,7 @@ msgstr "Usa la ricerca binaria per trovare il commit che ha introdotto un bug"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:13
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-branch[1]"
msgstr "linkgit:git-branch[1]"
@@ -770,7 +770,7 @@ msgstr "Elenca, crea o elimina branch"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:16
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-bundle[1]"
msgstr "linkgit:git-bundle[1]"
@@ -782,7 +782,7 @@ msgstr "Sposta oggetti e riferimenti in base a un archivio"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:19
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-checkout[1]"
msgstr "linkgit:git-checkout[1]"
@@ -794,7 +794,7 @@ msgstr "Passa da un branch a un altro o ripristina i file nell'albero di lavoro"
#. type: Plain text
#: en/cmds-mainporcelain.txt:22 en/git-revert.txt:139
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-cherry-pick[1]"
msgstr "linkgit:git-cherry-pick[1]"
@@ -806,7 +806,7 @@ msgstr "Applica le modifiche introdotte da alcuni commit esistenti"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:25
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-citool[1]"
msgstr "linkgit:git-citool[1]"
@@ -818,7 +818,7 @@ msgstr "Alternativa grafica a git-commit"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:28
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-clean[1]"
msgstr "linkgit:git-clean[1]"
@@ -830,7 +830,7 @@ msgstr "Rimuove i file non tracciati dall'albero di lavoro"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:31
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-clone[1]"
msgstr "linkgit:git-clone[1]"
@@ -842,7 +842,7 @@ msgstr "Clona un repository in una nuova directory"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:34
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-commit[1]"
msgstr "linkgit:git-commit[1]"
@@ -854,7 +854,7 @@ msgstr "Registra modifiche al repository"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:37
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-describe[1]"
msgstr "linkgit:git-describe[1]"
@@ -866,7 +866,7 @@ msgstr "Attribuisce un nome leggibile a un oggetto basandosi su un riferimento d
#. type: Labeled list
#: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:138
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-diff[1]"
msgstr "linkgit:git-diff[1]"
@@ -878,7 +878,7 @@ msgstr "Visualizza le modifiche fra commit, un commit e l'albero di lavoro, ecc.
#. type: Plain text
#: en/cmds-mainporcelain.txt:43 en/git-fetch-pack.txt:129
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fetch[1]"
msgstr "linkgit:git-fetch[1]"
@@ -890,7 +890,7 @@ msgstr "Scarica oggetti e riferimenti da un altro repository"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:46
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-format-patch[1]"
msgstr "linkgit:git-format-patch[1]"
@@ -902,7 +902,7 @@ msgstr "Prepara patch per il loro invio tramite e-mail"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:49
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-gc[1]"
msgstr "linkgit:git-gc[1]"
@@ -914,7 +914,7 @@ msgstr "Ripulisce file non necessari e ottimizza il repository locale"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:52
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-grep[1]"
msgstr "linkgit:git-grep[1]"
@@ -926,7 +926,7 @@ msgstr "Stampa le righe corrispondenti a un'espressione regolare"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:55
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-gui[1]"
msgstr "linkgit:git-gui[1]"
@@ -938,7 +938,7 @@ msgstr "Un'interfaccia grafica portabile per Git"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:58
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-init[1]"
msgstr "linkgit:git-init[1]"
@@ -950,7 +950,7 @@ msgstr "Crea un repository Git vuoto o ne reinizializza uno esistente"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:61
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-log[1]"
msgstr "linkgit:git-log[1]"
@@ -962,7 +962,7 @@ msgstr "Visualizza i log dei commit"
#. type: Plain text
#: en/cmds-mainporcelain.txt:64 en/git-fmt-merge-msg.txt:75
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge[1]"
msgstr "linkgit:git-merge[1]"
@@ -974,7 +974,7 @@ msgstr "Unisce due o pi첫 cronologie di sviluppo"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:67
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-mv[1]"
msgstr "linkgit:git-mv[1]"
@@ -986,7 +986,7 @@ msgstr "Sposta o rinomina un file, una directory o un collegamento simbolico"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:70
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-notes[1]"
msgstr "linkgit:git-notes[1]"
@@ -998,7 +998,7 @@ msgstr "Aggiunge o esamina le note agli oggetti"
#. type: Plain text
#: en/cmds-mainporcelain.txt:73 en/git-fetch.txt:296
-#, no-wrap, ignore-same, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "linkgit:git-pull[1]"
msgstr "linkgit:git-pull[1]"
@@ -1010,7 +1010,7 @@ msgstr "Esegue il fetch e l'integrazione con un altro repository o un branch loc
#. type: Labeled list
#: en/cmds-mainporcelain.txt:76
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-push[1]"
msgstr "linkgit:git-push[1]"
@@ -1022,7 +1022,7 @@ msgstr "Aggiorna i riferimenti remoti insieme agli oggetti associati"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:79
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-range-diff[1]"
msgstr "linkgit:git-range-diff[1]"
@@ -1034,7 +1034,7 @@ msgstr "Compara due intervalli di commit (ad es. due versioni di un branch)"
#. type: Plain text
#: en/cmds-mainporcelain.txt:82 en/git-svn.txt:1171
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rebase[1]"
msgstr "linkgit:git-rebase[1]"
@@ -1046,7 +1046,7 @@ msgstr "Riapplica dei commit dopo l'ultimo commit di un branch"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:85
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-reset[1]"
msgstr "linkgit:git-reset[1]"
@@ -1058,7 +1058,7 @@ msgstr "Ripristina l'HEAD corrente allo stato specificato"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:88
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-restore[1]"
msgstr "linkgit:git-restore[1]"
@@ -1070,7 +1070,7 @@ msgstr "Ripristina i file nell'albero di lavoro"
#. type: Plain text
#: en/cmds-mainporcelain.txt:91 en/git-cherry-pick.txt:240
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-revert[1]"
msgstr "linkgit:git-revert[1]"
@@ -1082,7 +1082,7 @@ msgstr "Esegue il revert di alcuni commit esistenti"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:94
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rm[1]"
msgstr "linkgit:git-rm[1]"
@@ -1094,7 +1094,7 @@ msgstr "Rimuove file dall'albero di lavoro e dall'indice"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:97
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-shortlog[1]"
msgstr "linkgit:git-shortlog[1]"
@@ -1106,7 +1106,7 @@ msgstr "Riassume l'output di 'git log'"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:100
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show[1]"
msgstr "linkgit:git-show[1]"
@@ -1118,7 +1118,7 @@ msgstr "Visualizza vari tipi di oggetti"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
@@ -1130,7 +1130,7 @@ msgstr "Mette da parte le modifiche in una directory di lavoro sporca"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:106
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
@@ -1142,7 +1142,7 @@ msgstr "Visualizza lo stato dell'albero di lavoro"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:109
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
@@ -1154,7 +1154,7 @@ msgstr "Inizializza, aggiorna o esamina sottomoduli"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:112
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-switch[1]"
msgstr "linkgit:git-switch[1]"
@@ -1166,7 +1166,7 @@ msgstr "Passa da un branch a un altro"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:115
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
@@ -1178,7 +1178,7 @@ msgstr "Crea, elenca, elimina o verifica un oggetto tag firmato con GPG"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:118
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
@@ -1190,7 +1190,7 @@ msgstr "Gestisce alberi di lavoro multipli"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
@@ -1202,7 +1202,7 @@ msgstr "Il browser per i repository Git"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:1
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-cat-file[1]"
msgstr "linkgit:git-cat-file[1]"
@@ -1214,7 +1214,7 @@ msgstr "Fornisci informazioni sul contenuto o sul tipo e sulle dimensioni per gl
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:4
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-cherry[1]"
msgstr "linkgit:git-cherry[1]"
@@ -1226,7 +1226,7 @@ msgstr "Trova commit che devono essere ancora applicati upstream"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:7
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-diff-files[1]"
msgstr "linkgit:git-diff-files[1]"
@@ -1238,7 +1238,7 @@ msgstr "Confronta file nell'albero di lavoro e nell'indice"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:10
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-diff-index[1]"
msgstr "linkgit:git-diff-index[1]"
@@ -1250,7 +1250,7 @@ msgstr "Confronta un albero con l'albero di lavoro o l'indice"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:13
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-diff-tree[1]"
msgstr "linkgit:git-diff-tree[1]"
@@ -1262,7 +1262,7 @@ msgstr "Confronta il contenuto e i mode dei blob trovati tramite due oggetti alb
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:16
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-for-each-ref[1]"
msgstr "linkgit:git-for-each-ref[1]"
@@ -1274,7 +1274,7 @@ msgstr "Visualizza in output le informazioni su ogni riferimento"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:19
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-get-tar-commit-id[1]"
msgstr "linkgit:git-get-tar-commit-id[1]"
@@ -1286,7 +1286,7 @@ msgstr "Estrae l'ID del commit da un archivio creato usando git-archive"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:22
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-ls-files[1]"
msgstr "linkgit:git-ls-files[1]"
@@ -1298,7 +1298,7 @@ msgstr "Visualizza informazioni sui file nell'indice e nell'albero di lavoro"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:25
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-ls-remote[1]"
msgstr "linkgit:git-ls-remote[1]"
@@ -1310,7 +1310,7 @@ msgstr "Elenca i riferimenti in un repository remoto"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:28
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-ls-tree[1]"
msgstr "linkgit:git-ls-tree[1]"
@@ -1322,7 +1322,7 @@ msgstr "Elenca i contenuti di un oggetto albero"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:31
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-base[1]"
msgstr "linkgit:git-merge-base[1]"
@@ -1334,7 +1334,7 @@ msgstr "Trova il maggior numero possibile di antenati comuni per un merge"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:34
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-name-rev[1]"
msgstr "linkgit:git-name-rev[1]"
@@ -1346,7 +1346,7 @@ msgstr "Trova i nomi simbolici per le revisioni date"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:37
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-pack-redundant[1]"
msgstr "linkgit:git-pack-redundant[1]"
@@ -1358,7 +1358,7 @@ msgstr "Trova file pack ridondanti"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:40
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rev-list[1]"
msgstr "linkgit:git-rev-list[1]"
@@ -1370,7 +1370,7 @@ msgstr "Elenca gli oggetti commit in ordine cronologico inverso"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:43
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rev-parse[1]"
msgstr "linkgit:git-rev-parse[1]"
@@ -1382,7 +1382,7 @@ msgstr "Sceglie e altera i parametri"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:46
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-index[1]"
msgstr "linkgit:git-show-index[1]"
@@ -1394,7 +1394,7 @@ msgstr "Visualizza l'indice di un archivio sottoposto a pack"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:49 en/git-for-each-ref.txt:391
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-ref[1]"
msgstr "linkgit:git-show-ref[1]"
@@ -1406,7 +1406,7 @@ msgstr "Elenca i riferimenti in un repository locale"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:52
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-unpack-file[1]"
msgstr "linkgit:git-unpack-file[1]"
@@ -1418,7 +1418,7 @@ msgstr "Crea un file temporaneo con i contenuti di un blob"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:55
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-var[1]"
msgstr "linkgit:git-var[1]"
@@ -1430,7 +1430,7 @@ msgstr "Visualizza una variabile logica di Git"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:58
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-pack[1]"
msgstr "linkgit:git-verify-pack[1]"
@@ -1442,7 +1442,7 @@ msgstr "Convalida i file archivio sottoposti a pack di Git"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:1
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-apply[1]"
msgstr "linkgit:git-apply[1]"
@@ -1454,7 +1454,7 @@ msgstr "Applica una patch ai file e/o all'indice"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:4
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-checkout-index[1]"
msgstr "linkgit:git-checkout-index[1]"
@@ -1466,7 +1466,7 @@ msgstr "Copia dei file dall'indice all'albero di lavoro"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:7
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-commit-graph[1]"
msgstr "linkgit:git-commit-graph[1]"
@@ -1478,7 +1478,7 @@ msgstr "Scrive e verifica i file grafo dei commit di Git"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:10
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-commit-tree[1]"
msgstr "linkgit:git-commit-tree[1]"
@@ -1490,7 +1490,7 @@ msgstr "Crea un nuovo oggetto commit"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:13
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-hash-object[1]"
msgstr "linkgit:git-hash-object[1]"
@@ -1502,7 +1502,7 @@ msgstr "Calcola l'ID oggetto e crea facoltativamente un blob da un file"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:16
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-index-pack[1]"
msgstr "linkgit:git-index-pack[1]"
@@ -1514,7 +1514,7 @@ msgstr "Genera il file indice pack per un archivio esistente sottoposto a pack"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:19
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-file[1]"
msgstr "linkgit:git-merge-file[1]"
@@ -1526,7 +1526,7 @@ msgstr "Esegue un merge a tre vie su file"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:22
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-index[1]"
msgstr "linkgit:git-merge-index[1]"
@@ -1538,7 +1538,7 @@ msgstr "Esegue un merge per i file che lo richiedono"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:25
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-mktag[1]"
msgstr "linkgit:git-mktag[1]"
@@ -1550,7 +1550,7 @@ msgstr "Crea un oggetto tag"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:28
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-mktree[1]"
msgstr "linkgit:git-mktree[1]"
@@ -1562,7 +1562,7 @@ msgstr "Genera un oggetto albero da testo in formato ls-tree"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:31
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-multi-pack-index[1]"
msgstr "linkgit:git-multi-pack-index[1]"
@@ -1574,7 +1574,7 @@ msgstr "Scrive e verifica indici multi-pack"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:34
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-pack-objects[1]"
msgstr "linkgit:git-pack-objects[1]"
@@ -1586,7 +1586,7 @@ msgstr "Crea un archivio di oggetti sottoposto a pack"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:37
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-prune-packed[1]"
msgstr "linkgit:git-prune-packed[1]"
@@ -1598,7 +1598,7 @@ msgstr "Rimuove gli oggetti aggiuntivi gi횪 presenti nei file pack"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:40
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-read-tree[1]"
msgstr "linkgit:git-read-tree[1]"
@@ -1610,7 +1610,7 @@ msgstr "Legge le informazioni su un albero dall'indice"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:43
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-symbolic-ref[1]"
msgstr "linkgit:git-symbolic-ref[1]"
@@ -1622,7 +1622,7 @@ msgstr "Legge, modifica ed elimina riferimenti simbolici"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:46
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-unpack-objects[1]"
msgstr "linkgit:git-unpack-objects[1]"
@@ -1634,7 +1634,7 @@ msgstr "Decomprime gli oggetti da un archivio sottoposto a pack"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:49
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-update-index[1]"
msgstr "linkgit:git-update-index[1]"
@@ -1646,7 +1646,7 @@ msgstr "Registra i contenuti dei file dell'albero di lavoro nell'indice"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:52
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-update-ref[1]"
msgstr "linkgit:git-update-ref[1]"
@@ -1658,7 +1658,7 @@ msgstr "Aggiorna in modo sicuro il nome oggetto salvato in un riferimento"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:120
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -1670,7 +1670,7 @@ msgstr "Crea un oggetto albero dall'indice corrente"
#. type: Labeled list
#: en/cmds-purehelpers.txt:1
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-check-attr[1]"
msgstr "linkgit:git-check-attr[1]"
@@ -1682,7 +1682,7 @@ msgstr "Visualizza le informazioni sugli attributi Git"
#. type: Labeled list
#: en/cmds-purehelpers.txt:4
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-check-ignore[1]"
msgstr "linkgit:git-check-ignore[1]"
@@ -1694,7 +1694,7 @@ msgstr "Esegui il debug dei file gitignore/escludi file"
#. type: Labeled list
#: en/cmds-purehelpers.txt:7
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-check-mailmap[1]"
msgstr "linkgit:git-check-mailmap[1]"
@@ -1706,7 +1706,7 @@ msgstr "Visualizza i nomi canonici e gli indirizzi e-mail dei contatti"
#. type: Labeled list
#: en/cmds-purehelpers.txt:10
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-check-ref-format[1]"
msgstr "linkgit:git-check-ref-format[1]"
@@ -1718,7 +1718,7 @@ msgstr "Si assicura che un nome riferimento sia ben formato"
#. type: Labeled list
#: en/cmds-purehelpers.txt:13
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-column[1]"
msgstr "linkgit:git-column[1]"
@@ -1730,7 +1730,7 @@ msgstr "Visualizza i dati in colonne"
#. type: Labeled list
#: en/cmds-purehelpers.txt:16
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-credential[1]"
msgstr "linkgit:git-credential[1]"
@@ -1742,7 +1742,7 @@ msgstr "Recupera e salva credenziali utente"
#. type: Labeled list
#: en/cmds-purehelpers.txt:19
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-credential-cache[1]"
msgstr "linkgit:git-credential-cache[1]"
@@ -1754,7 +1754,7 @@ msgstr "Helper per salvare temporaneamente password in memoria"
#. type: Labeled list
#: en/cmds-purehelpers.txt:22
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-credential-store[1]"
msgstr "linkgit:git-credential-store[1]"
@@ -1766,7 +1766,7 @@ msgstr "Helper per salvare credenziali su disco"
#. type: Labeled list
#: en/cmds-purehelpers.txt:25
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fmt-merge-msg[1]"
msgstr "linkgit:git-fmt-merge-msg[1]"
@@ -1778,7 +1778,7 @@ msgstr "Genera un messaggio di commit del merge"
#. type: Labeled list
#: en/cmds-purehelpers.txt:28
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-interpret-trailers[1]"
msgstr "linkgit:git-interpret-trailers[1]"
@@ -1790,7 +1790,7 @@ msgstr "Aggiunge o analizza informazioni strutturate nei messaggi di commit"
#. type: Labeled list
#: en/cmds-purehelpers.txt:31
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-mailinfo[1]"
msgstr "linkgit:git-mailinfo[1]"
@@ -1802,7 +1802,7 @@ msgstr "Estrae la patch e le informazioni sull'autore da un singolo messaggio e-
#. type: Labeled list
#: en/cmds-purehelpers.txt:34
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-mailsplit[1]"
msgstr "linkgit:git-mailsplit[1]"
@@ -1814,7 +1814,7 @@ msgstr "Un semplice programma per suddividere i file UNIX mbox"
#. type: Labeled list
#: en/cmds-purehelpers.txt:37
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-one-file[1]"
msgstr "linkgit:git-merge-one-file[1]"
@@ -1826,7 +1826,7 @@ msgstr "Il programma helper standard da usare con git-merge-index"
#. type: Plain text
#: en/cmds-purehelpers.txt:40 en/git-cherry.txt:142
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-patch-id[1]"
msgstr "linkgit:git-patch-id[1]"
@@ -1838,7 +1838,7 @@ msgstr "Calcola l'ID univoco per una patch"
#. type: Labeled list
#: en/cmds-purehelpers.txt:43
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-sh-i18n[1]"
msgstr "linkgit:git-sh-i18n[1]"
@@ -1850,7 +1850,7 @@ msgstr "Codice di inizializzazione dell'internazionalizzazione di Git per gli sc
#. type: Labeled list
#: en/cmds-purehelpers.txt:46
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-sh-setup[1]"
msgstr "linkgit:git-sh-setup[1]"
@@ -1862,7 +1862,7 @@ msgstr "Codice comune di inizializzazione di Git per gli script shell"
#. type: Labeled list
#: en/cmds-purehelpers.txt:49
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stripspace[1]"
msgstr "linkgit:git-stripspace[1]"
@@ -1874,7 +1874,7 @@ msgstr "Rimuove spazi bianchi non necessari"
#. type: Labeled list
#: en/cmds-synchelpers.txt:1
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-http-fetch[1]"
msgstr "linkgit:git-http-fetch[1]"
@@ -1886,7 +1886,7 @@ msgstr "Scarica dati da un repository Git remoto tramite HTTP"
#. type: Labeled list
#: en/cmds-synchelpers.txt:4
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-http-push[1]"
msgstr "linkgit:git-http-push[1]"
@@ -1898,7 +1898,7 @@ msgstr "Esegue il push di oggetti su un altro repository tramite HTTP/DAV"
#. type: Labeled list
#: en/cmds-synchelpers.txt:7
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-parse-remote[1]"
msgstr "linkgit:git-parse-remote[1]"
@@ -1910,7 +1910,7 @@ msgstr "Routine che aiutano ad analizzare i parametri di accesso ai repository r
#. type: Labeled list
#: en/cmds-synchelpers.txt:10
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-receive-pack[1]"
msgstr "linkgit:git-receive-pack[1]"
@@ -1922,7 +1922,7 @@ msgstr "Riceve quanto sottoposto a push nel repository"
#. type: Labeled list
#: en/cmds-synchelpers.txt:13
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-shell[1]"
msgstr "linkgit:git-shell[1]"
@@ -1934,7 +1934,7 @@ msgstr "Shell di login limitata per concedere accesso SSH solo per Git"
#. type: Labeled list
#: en/cmds-synchelpers.txt:16
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-upload-archive[1]"
msgstr "linkgit:git-upload-archive[1]"
@@ -1946,7 +1946,7 @@ msgstr "Reinvia l'archivio a git-archive"
#. type: Labeled list
#: en/cmds-synchelpers.txt:19
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-upload-pack[1]"
msgstr "linkgit:git-upload-pack[1]"
@@ -1958,7 +1958,7 @@ msgstr "Reinvia gli oggetti sottoposti a pack a git-fetch-pack"
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:1
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-daemon[1]"
msgstr "linkgit:git-daemon[1]"
@@ -1970,7 +1970,7 @@ msgstr "Un server veramente semplice per repository Git"
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:4
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fetch-pack[1]"
msgstr "linkgit:git-fetch-pack[1]"
@@ -1982,7 +1982,7 @@ msgstr "Riceve oggetti mancanti da un altro repository"
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:7
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-http-backend[1]"
msgstr "linkgit:git-http-backend[1]"
@@ -1994,7 +1994,7 @@ msgstr "Implementazione lato server di Git su HTTP"
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:10
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-send-pack[1]"
msgstr "linkgit:git-send-pack[1]"
@@ -2006,7 +2006,7 @@ msgstr "Esegue il push di oggetti su un altro repository tramite il protocollo G
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:13
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-update-server-info[1]"
msgstr "linkgit:git-update-server-info[1]"
@@ -2144,7 +2144,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:113
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`gitdir`"
msgstr "`gitdir`"
@@ -2210,7 +2210,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:147
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`onbranch`"
msgstr "`onbranch`"
@@ -2262,95 +2262,95 @@ msgstr ""
msgid "Example"
msgstr ""
-#. type: Plain text
-#: en/config.txt:185
+#. type: delimited block -
+#: en/config.txt:186
#, no-wrap, priority:100
msgid ""
-"\t# Core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"# Core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:190
+#. type: delimited block -
+#: en/config.txt:191
#, no-wrap, priority:100
msgid ""
-"\t# Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"# Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:194
+#. type: delimited block -
+#: en/config.txt:195
#, no-wrap, priority:100
msgid ""
-"\t[branch \"devel\"]\n"
-"\t\tremote = origin\n"
-"\t\tmerge = refs/heads/devel\n"
+"[branch \"devel\"]\n"
+"\tremote = origin\n"
+"\tmerge = refs/heads/devel\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:199
+#. type: delimited block -
+#: en/config.txt:200
#, no-wrap, priority:100
msgid ""
-"\t# Proxy settings\n"
-"\t[core]\n"
-"\t\tgitProxy=\"ssh\" for \"kernel.org\"\n"
-"\t\tgitProxy=default-proxy ; for the rest\n"
+"# Proxy settings\n"
+"[core]\n"
+"\tgitProxy=\"ssh\" for \"kernel.org\"\n"
+"\tgitProxy=default-proxy ; for the rest\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:204
+#. type: delimited block -
+#: en/config.txt:205
#, no-wrap, priority:100
msgid ""
-"\t[include]\n"
-"\t\tpath = /path/to/foo.inc ; include by absolute path\n"
-"\t\tpath = foo.inc ; find \"foo.inc\" relative to the current file\n"
-"\t\tpath = ~/foo.inc ; find \"foo.inc\" in your `$HOME` directory\n"
+"[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: Plain text
-#: en/config.txt:208
+#. type: delimited block -
+#: en/config.txt:209
#, no-wrap, priority:100
msgid ""
-"\t; include if $GIT_DIR is /path/to/foo/.git\n"
-"\t[includeIf \"gitdir:/path/to/foo/.git\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; 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: Plain text
-#: en/config.txt:212
+#. type: delimited block -
+#: en/config.txt:213
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside /path/to/group\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside /path/to/group\n"
+"[includeIf \"gitdir:/path/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:216
+#. type: delimited block -
+#: en/config.txt:217
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside $HOME/to/group\n"
-"\t[includeIf \"gitdir:~/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside $HOME/to/group\n"
+"[includeIf \"gitdir:~/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:222
+#. type: delimited block -
+#: en/config.txt:223
#, no-wrap, priority:100
msgid ""
-"\t; relative paths are always relative to the including\n"
-"\t; file (if the condition is true); their location is not\n"
-"\t; affected by the condition\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = foo.inc\n"
+"; 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:227
+#: en/config.txt:229
#, no-wrap, priority:100
msgid ""
"\t; include only if we are in a worktree where foo-branch is\n"
@@ -2360,43 +2360,43 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/config.txt:229
+#: en/config.txt:231
#, no-wrap, priority:100
msgid "Values"
msgstr ""
#. type: Plain text
-#: en/config.txt:234
+#: 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:235
+#: en/config.txt:237
#, no-wrap, priority:100
msgid "boolean"
msgstr ""
#. type: Plain text
-#: en/config.txt:240
+#: 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:241
+#: en/config.txt:243
#, no-wrap, priority:100
msgid "true"
msgstr ""
#. type: Plain text
-#: en/config.txt:242
+#: en/config.txt:244
#, priority:100
msgid "Boolean true literals are `yes`, `on`, `true`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:244
+#: en/config.txt:246
#, no-wrap, priority:100
msgid ""
"and `1`. Also, a variable defined without `= <value>`\n"
@@ -2404,116 +2404,116 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/config.txt:245
+#: en/config.txt:247
#, no-wrap, priority:100
msgid "false"
msgstr ""
#. type: Plain text
-#: en/config.txt:246
+#: en/config.txt:248
#, priority:100
msgid "Boolean false literals are `no`, `off`, `false`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:247
+#: en/config.txt:249
#, no-wrap, priority:100
msgid "`0` and the empty string.\n"
msgstr ""
#. type: Plain text
-#: en/config.txt:251
+#: 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:252
+#: en/config.txt:254
#, no-wrap, priority:100
msgid "integer"
msgstr ""
#. type: Plain text
-#: en/config.txt:256
-#, priority:100
+#: 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:257 en/diff-options.txt:356 en/git-for-each-ref.txt:177
+#: 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:261
+#: 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:265
+#: en/config.txt:267
#, 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."
msgstr ""
#. type: Plain text
-#: en/config.txt:270
+#: en/config.txt:272
#, 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:277
+#: en/config.txt:279
#, 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:280
+#: en/config.txt:282
#, 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:289
+#: en/config.txt:291
#, 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:290
+#: en/config.txt:292
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:296
+#: en/config.txt:298
#, 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:299 en/git-imap-send.txt:58
+#: en/config.txt:301 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:304
+#: en/config.txt:306
#, 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:309
+#: en/config.txt:311
#, 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
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.conflictStyle"
msgstr "merge.conflictStyle"
@@ -2525,7 +2525,7 @@ msgstr ""
#. type: Labeled list
#: en/config/merge.txt:9
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.defaultToUpstream"
msgstr "merge.defaultToUpstream"
@@ -2537,7 +2537,7 @@ msgstr ""
#. type: Labeled list
#: en/config/merge.txt:19
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.ff"
msgstr "merge.ff"
@@ -2549,7 +2549,7 @@ msgstr ""
#. type: Labeled list
#: en/config/merge.txt:29
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.verifySignatures"
msgstr "merge.verifySignatures"
@@ -2561,7 +2561,7 @@ msgstr ""
#. type: Labeled list
#: en/config/merge.txt:35
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.renameLimit"
msgstr "merge.renameLimit"
@@ -2573,7 +2573,7 @@ msgstr ""
#. type: Labeled list
#: en/config/merge.txt:41
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.renames"
msgstr "merge.renames"
@@ -2585,7 +2585,7 @@ msgstr ""
#. type: Labeled list
#: en/config/merge.txt:46
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.directoryRenames"
msgstr "merge.directoryRenames"
@@ -2597,7 +2597,7 @@ msgstr ""
#. type: Labeled list
#: en/config/merge.txt:59
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.renormalize"
msgstr "merge.renormalize"
@@ -2609,7 +2609,7 @@ msgstr ""
#. type: Labeled list
#: en/config/merge.txt:69
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.stat"
msgstr "merge.stat"
@@ -2621,7 +2621,7 @@ msgstr ""
#. type: Labeled list
#: en/config/merge.txt:73
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.tool"
msgstr "merge.tool"
@@ -2633,7 +2633,7 @@ msgstr ""
#. type: Labeled list
#: en/config/merge.txt:79
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.guitool"
msgstr "merge.guitool"
@@ -2645,7 +2645,7 @@ msgstr ""
#. type: Labeled list
#: en/config/merge.txt:87
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.verbosity"
msgstr "merge.verbosity"
@@ -2693,7 +2693,7 @@ msgstr ""
#. type: Labeled list
#: en/config/fmt-merge-msg.txt:1
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.branchdesc"
msgstr "merge.branchdesc"
@@ -2705,7 +2705,7 @@ msgstr ""
#. type: Labeled list
#: en/config/fmt-merge-msg.txt:6
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.log"
msgstr "merge.log"
@@ -2825,7 +2825,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-format.txt:16
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]"
msgstr ""
@@ -2837,7 +2837,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-format.txt:19
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "git-diff-files [<pattern>...]"
msgstr ""
@@ -3244,53 +3244,53 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
#, no-wrap, priority:260
-msgid "Generating patches with -p"
+msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:10
+#: en/diff-generate-patch.txt:14
#, priority:260
-msgid "When \"git-diff-index\", \"git-diff-tree\", or \"git-diff-files\" are run with a `-p` option, \"git diff\" without the `--raw` option, or \"git log\" with the \"-p\" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
+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:13
+#: 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:15
+#: 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:17
+#: 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:21
+#: 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:25
+#: 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:27
+#: 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:39
+#: en/diff-generate-patch.txt:43
#, no-wrap, priority:260
msgid ""
"old mode <mode>\n"
@@ -3307,43 +3307,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:42
+#: 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:44
+#: 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:51
+#: 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:55
+#: en/diff-generate-patch.txt:59
#, priority:260
-msgid "The index line includes the SHA-1 checksum 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."
+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:59
+#: 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:64
+#: 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:71
+#: en/diff-generate-patch.txt:75
#, no-wrap, priority:260
msgid ""
"diff --git a/a b/b\n"
@@ -3355,25 +3355,25 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/diff-generate-patch.txt:74
+#: en/diff-generate-patch.txt:78
#, no-wrap, priority:260
-msgid "combined diff format"
+msgid "Combined diff format"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:82
+#: 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:84
+#: en/diff-generate-patch.txt:88
#, priority:260
-msgid "A 'combined diff' format looks like this:"
+msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:93
+#: en/diff-generate-patch.txt:97
#, no-wrap, priority:260
msgid ""
"diff --combined describe.c\n"
@@ -3386,7 +3386,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:103
+#: en/diff-generate-patch.txt:107
#, no-wrap, priority:260
msgid ""
"- static void describe(char *arg)\n"
@@ -3401,7 +3401,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:113
+#: en/diff-generate-patch.txt:117
#, no-wrap, priority:260
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
@@ -3416,37 +3416,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:117
+#: en/diff-generate-patch.txt:121
#, priority:260
-msgid "It is preceded with a \"git diff\" header, that looks like this (when `-c` option is used):"
+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:119
+#: en/diff-generate-patch.txt:123
#, no-wrap, priority:260
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:121
+#: en/diff-generate-patch.txt:125
#, priority:260
-msgid "or like this (when `--cc` option is used):"
+msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:123
+#: en/diff-generate-patch.txt:127
#, no-wrap, priority:260
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:126
+#: 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:131
+#: en/diff-generate-patch.txt:135
#, no-wrap, priority:260
msgid ""
"index <hash>,<hash>..<hash>\n"
@@ -3456,92 +3456,92 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:137
+#: 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:139
+#: 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:141 en/diff-generate-patch.txt:152 en/diff-generate-patch.txt:153 en/diff-generate-patch.txt:154
+#: 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:142 en/diff-generate-patch.txt:155
+#: 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:146
+#: 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:150
+#: 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:159
+#: 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:165
+#: 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 for apply. The change is similar to the change in the extended 'index' header:"
+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:167
+#: 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:170
+#: 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:179
-#, priority:260
+#: 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:185
+#: 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:191
+#: 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:197
+#: 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:327 en/merge-options.txt:86
-#, no-wrap, ignore-same, no-wrap, priority:280
+#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
+#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3552,14 +3552,14 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:186 en/git-add.txt:111 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
-#, no-wrap, ignore-same, no-wrap, priority:300
+#: en/diff-options.txt:23 en/fetch-options.txt:198 en/git-add.txt:111 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
+#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
#. type: Labeled list
#: en/diff-options.txt:24 en/git-add.txt:89 en/git-checkout.txt:269 en/git-commit.txt:71 en/git-restore.txt:47
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"
@@ -3576,14 +3576,14 @@ msgid "\tThis is the default.\n"
msgstr ""
#. 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:117 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
-#, no-wrap, ignore-same, no-wrap, priority:300
+#: 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:118 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
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--no-patch"
msgstr "--no-patch"
@@ -3655,7 +3655,7 @@ 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
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--raw"
msgstr "--raw"
@@ -3678,7 +3678,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:72
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--patch-with-raw"
msgstr "--patch-with-raw"
@@ -3690,7 +3690,7 @@ msgstr "sinonimo di '-p --raw'"
#. type: Labeled list
#: en/diff-options.txt:76
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--indent-heuristic"
msgstr "--indent-heuristic"
@@ -3702,7 +3702,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:80
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--no-indent-heuristic"
msgstr "--no-indent-heuristic"
@@ -3714,7 +3714,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:83
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--minimal"
msgstr "--minimal"
@@ -3726,7 +3726,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:87
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--patience"
msgstr "--patience"
@@ -3738,7 +3738,7 @@ msgstr "genera il diff usando l'algoritmo \"patience diff\""
#. type: Labeled list
#: en/diff-options.txt:90
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--histogram"
msgstr "--histogram"
@@ -3798,13 +3798,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:109
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "`minimal`"
msgstr "`minimal`"
#. type: Labeled list
#: en/diff-options.txt:112
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "`patience`"
msgstr "`patience`"
@@ -3816,7 +3816,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:114
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "`histogram`"
msgstr "`histogram`"
@@ -3840,7 +3840,7 @@ msgstr "<ampiezza>[,<ampiezza nome>[,<numero>]]"
#. type: Plain text
#: en/diff-options.txt:137
-#, priority:280
+#, 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 ""
@@ -3852,7 +3852,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:141
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--compact-summary"
msgstr "--compact-summary"
@@ -3864,7 +3864,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:149 en/git-apply.txt:45
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--numstat"
msgstr "--numstat"
@@ -3876,7 +3876,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:156
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--shortstat"
msgstr "--shortstat"
@@ -3888,13 +3888,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:161
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "-X[<param1,param2,...>]"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:162
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "--dirstat[=<param1,param2,...>]"
msgstr ""
@@ -3906,7 +3906,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:171
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "`changes`"
msgstr "`changes`"
@@ -3918,7 +3918,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:177
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "`lines`"
msgstr "`lines`"
@@ -3930,7 +3930,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:185
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "`files`"
msgstr "`files`"
@@ -3942,7 +3942,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:190
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "`cumulative`"
msgstr "`cumulative`"
@@ -3972,7 +3972,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:206
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--cumulative"
msgstr "--cumulative"
@@ -3984,19 +3984,19 @@ msgstr "sinonimo di --dirstat=cumulative"
#. type: Labeled list
#: en/diff-options.txt:209
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "--dirstat-by-file[=<param1,param2>...]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:211
-#, fuzzy, priority:280
+#, fuzzy, ignore-ellipsis, priority:280
msgid "Synonym for --dirstat=files,param1,param2..."
msgstr "sinonimo di --dirstat=files,parametro1,parametro2..."
#. type: Labeled list
-#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:129
-#, no-wrap, ignore-same, no-wrap, priority:280
+#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:137
+#, ignore-same, no-wrap, priority:280
msgid "--summary"
msgstr "--summary"
@@ -4008,7 +4008,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:217
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--patch-with-stat"
msgstr "--patch-with-stat"
@@ -4019,8 +4019,8 @@ msgid "Synonym for `-p --stat`."
msgstr "sinonimo di '-p --stat'"
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:122 en/git-update-index.txt:168
-#, no-wrap, ignore-same, no-wrap, priority:280
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:168
+#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4052,7 +4052,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:188 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr "--name-only"
@@ -4064,7 +4064,7 @@ msgstr "visualizza solo i nomi dei file modificati"
#. type: Labeled list
#: en/diff-options.txt:242 en/git-ls-tree.txt:60
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--name-status"
msgstr "--name-status"
@@ -4108,7 +4108,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:225 en/git-show-branch.txt:124
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--no-color"
msgstr "--no-color"
@@ -4231,7 +4231,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:313
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--no-color-moved"
msgstr "--no-color-moved"
@@ -4321,7 +4321,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:344
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--no-color-moved-ws"
msgstr "--no-color-moved-ws"
@@ -4428,8 +4428,8 @@ msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:402 en/git-status.txt:139
-#, no-wrap, ignore-same, no-wrap, priority:280
+#: en/diff-options.txt:402 en/git-status.txt:143
+#, ignore-same, no-wrap, priority:280
msgid "--no-renames"
msgstr "--no-renames"
@@ -4441,7 +4441,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:406
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--[no-]rename-empty"
msgstr "--[no-]rename-empty"
@@ -4453,7 +4453,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:410 en/git-apply.txt:58
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--check"
msgstr "--check"
@@ -4477,7 +4477,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:432
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--full-index"
msgstr "--full-index"
@@ -4489,7 +4489,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:437 en/git-apply.txt:160
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--binary"
msgstr "--binary"
@@ -4532,7 +4532,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:463
#, priority:280
-msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
+msgid "It affects the way a change that amounts to a total rewrite of a file does not appear as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
msgstr ""
#. type: Plain text
@@ -4548,7 +4548,7 @@ msgid "-M[<n>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:473 en/git-status.txt:143
+#: en/diff-options.txt:473 en/git-status.txt:147
#, no-wrap, priority:280
msgid "--find-renames[=<n>]"
msgstr ""
@@ -4603,7 +4603,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:497 en/git-svn.txt:626
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--find-copies-harder"
msgstr "--find-copies-harder"
@@ -4621,7 +4621,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:507
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--irreversible-delete"
msgstr "--irreversible-delete"
@@ -4651,13 +4651,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:527
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:538
-#, priority:280
+#, ignore-ellipsis, priority:280
msgid "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."
msgstr ""
@@ -4717,7 +4717,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-options.txt:573
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
"...\n"
@@ -4762,7 +4762,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:594
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--pickaxe-all"
msgstr "--pickaxe-all"
@@ -4774,7 +4774,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:599
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--pickaxe-regex"
msgstr "--pickaxe-regex"
@@ -4858,13 +4858,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:64 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-tag.txt:60
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "-a"
msgstr "-a"
#. type: Labeled list
#: en/diff-options.txt:657 en/git-grep.txt:102
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--text"
msgstr "--text"
@@ -4876,7 +4876,7 @@ msgstr "tratta tutti i file come se fossero di testo"
#. type: Labeled list
#: en/diff-options.txt:660
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-cr-at-eol"
msgstr "--ignore-cr-at-eol"
@@ -4888,25 +4888,25 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:663
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-space-at-eol"
msgstr "--ignore-space-at-eol"
#. type: Labeled list
#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:134 en/git-hash-object.txt:29 en/git-help.txt:79
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "-w"
msgstr "-w"
#. type: Labeled list
#: en/diff-options.txt:673
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-all-space"
msgstr "--ignore-all-space"
@@ -4918,7 +4918,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:678
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-blank-lines"
msgstr "--ignore-blank-lines"
@@ -4948,7 +4948,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:688 en/git-grep.txt:262
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--function-context"
msgstr "--function-context"
@@ -4960,7 +4960,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:693 en/git-ls-remote.txt:46
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--exit-code"
msgstr "--exit-code"
@@ -4971,8 +4971,8 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:203 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:52 en/git-clone.txt:120 en/git-commit.txt:314 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:301 en/git-gc.txt:68 en/git-grep.txt:296 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:315 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:255 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:136 en/rev-list-options.txt:220
-#, no-wrap, ignore-same, no-wrap, priority:300
+#: en/diff-options.txt:698 en/fetch-options.txt:215 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:316 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:302 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:256 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
+#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -4984,7 +4984,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:703
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--ext-diff"
msgstr "--ext-diff"
@@ -4996,7 +4996,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:708
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--no-ext-diff"
msgstr "--no-ext-diff"
@@ -5008,13 +5008,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:105
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
#: en/diff-options.txt:712 en/git-grep.txt:108
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--no-textconv"
msgstr "--no-textconv"
@@ -5025,7 +5025,7 @@ msgid "Allow (or disallow) external text conversion filters to be run when compa
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:85
+#: en/diff-options.txt:722 en/git-status.txt:87
#, no-wrap, priority:280
msgid "--ignore-submodules[=<when>]"
msgstr ""
@@ -5062,7 +5062,7 @@ msgstr "visualizza il prefisso destinazione specificato invece di \"b/\""
#. type: Labeled list
#: en/diff-options.txt:741
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--no-prefix"
msgstr "--no-prefix"
@@ -5086,7 +5086,7 @@ msgstr "anteponi un prefisso aggiuntivo ad ogni riga dell'output"
#. type: Labeled list
#: en/diff-options.txt:747
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--ita-invisible-in-index"
msgstr "--ita-invisible-in-index"
@@ -5103,8 +5103,8 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:265 en/rev-list-options.txt:138
-#, no-wrap, ignore-same, no-wrap, priority:300
+#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:266 en/rev-list-options.txt:138
+#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5116,7 +5116,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:5
-#, no-wrap, ignore-same, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--append"
msgstr "--append"
@@ -5160,9 +5160,7 @@ msgstr "--shallow-since=<date>"
#: en/fetch-options.txt:25 en/git-fetch-pack.txt:93
#, priority:220
msgid "Deepen or shorten the history of a shallow repository to include all reachable commits after <date>."
-msgstr ""
-"Approfondisci o limita la storia di uno shallow repository per includere "
-"tutti i commit raggiungibili dopo <date>."
+msgstr "Approfondisci o limita la storia di uno shallow repository per includere tutti i commit raggiungibili dopo <date>."
#. type: Labeled list
#: en/fetch-options.txt:26 en/git-clone.txt:218 en/git-fetch-pack.txt:94
@@ -5178,7 +5176,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:31
-#, no-wrap, ignore-same, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--unshallow"
msgstr "--unshallow"
@@ -5186,9 +5184,7 @@ msgstr "--unshallow"
#: en/fetch-options.txt:35
#, priority:220
msgid "If the source repository is complete, convert a shallow repository to a complete one, removing all the limitations imposed by shallow repositories."
-msgstr ""
-"Se il repository di origine 챔 completo, converti un 'repository shallow' in "
-"uno completo, rimuovendo tutte le limitazioni imposte dai repository shallow."
+msgstr "Se il repository di origine 챔 completo, converti un 'repository shallow' in uno completo, rimuovendo tutte le limitazioni imposte dai repository shallow."
#. type: Plain text
#: en/fetch-options.txt:38
@@ -5198,7 +5194,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:39
-#, no-wrap, ignore-same, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--update-shallow"
msgstr "--update-shallow"
@@ -5206,11 +5202,7 @@ msgstr "--update-shallow"
#: en/fetch-options.txt:44
#, priority:220
msgid "By default when fetching from a shallow repository, `git fetch` refuses refs that require updating .git/shallow. This option updates .git/shallow and accept such refs."
-msgstr ""
-"Di default quando si recuperano i dati da uno \"shallow repository\", `git "
-"fetch` non accetta riferimenti che richiedono di fare l'aggiornamento di ."
-"git/shallow. Inserendo questa opzione vengono accettati questi riferimenti "
-"ed aggiornato .git/shallow."
+msgstr "Di default quando si recuperano i dati da uno \"shallow repository\", `git fetch` non accetta riferimenti che richiedono di fare l'aggiornamento di .git/shallow. Inserendo questa opzione vengono accettati questi riferimenti ed aggiornato .git/shallow."
#. type: Labeled list
#: en/fetch-options.txt:45
@@ -5240,13 +5232,11 @@ msgstr ""
#: en/fetch-options.txt:63
#, priority:220
msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
-msgstr ""
-"Vedere anche l'opzione di configurazione`fetch.negotiationAlgorithm`"
-"documentata in linkgit:git-config[1]."
+msgstr "Vedere anche l'opzione di configurazione`fetch.negotiationAlgorithm`documentata in linkgit:git-config[1]."
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:48 en/git-commit.txt:317 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
-#, no-wrap, ignore-same, no-wrap, priority:300
+#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:50 en/git-commit.txt:319 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
+#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5257,14 +5247,14 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:34 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:195 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:347 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:278 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
-#, no-wrap, ignore-same, no-wrap, priority:300
+#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:279 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:35 en/git-fast-import.txt:37 en/git-filter-branch.txt:196 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:279 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
-#, no-wrap, ignore-same, no-wrap, priority:300
+#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:280 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5295,14 +5285,14 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:112 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
-#, no-wrap, ignore-same, no-wrap, priority:280
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:113 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
#. type: Labeled list
#: en/fetch-options.txt:83 en/git-am.txt:41 en/git-fetch-pack.txt:54 en/git-index-pack.txt:54 en/git-reset.txt:83
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--keep"
msgstr "--keep"
@@ -5314,7 +5304,7 @@ msgstr "mantieni il pack scaricato"
#. type: Labeled list
#: en/fetch-options.txt:87
-#, no-wrap, ignore-same, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--multiple"
msgstr "--multiple"
@@ -5326,7 +5316,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:91
-#, no-wrap, ignore-same, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--[no-]auto-gc"
msgstr "--[no-]auto-gc"
@@ -5338,7 +5328,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:96 en/git-push.txt:153
-#, no-wrap, ignore-same, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--prune"
msgstr "--prune"
@@ -5362,7 +5352,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:110
-#, no-wrap, ignore-same, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--prune-tags"
msgstr "--prune-tags"
@@ -5373,14 +5363,14 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:47 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:97 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:326 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:301 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:85
-#, no-wrap, ignore-same, no-wrap, priority:300
+#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:98 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:302 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
+#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
#. type: Labeled list
#: en/fetch-options.txt:125 en/git-clone.txt:233
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--no-tags"
msgstr "--no-tags"
@@ -5404,7 +5394,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:142 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--tags"
msgstr "--tags"
@@ -5428,7 +5418,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:161
-#, no-wrap, ignore-same, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "-j"
msgstr "-j"
@@ -5439,194 +5429,218 @@ msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:167
+#: en/fetch-options.txt:164
+#, priority:220
+msgid "Number of parallel children to be used for all forms of fetching."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:169
+#, priority:220
+msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:172
#, priority:220
-msgid "Number of parallel children to be used for fetching submodules. Each will fetch from different submodules, such that fetching many submodules will be faster. By default submodules will be fetched one at a time."
+msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:168 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
-#, no-wrap, ignore-same, no-wrap, priority:240
+#: en/fetch-options.txt:173 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
+#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:171
+#: en/fetch-options.txt:176
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:172
+#: en/fetch-options.txt:177 en/git-branch.txt:225 en/git-push.txt:349
+#, ignore-same, no-wrap, priority:240
+msgid "--set-upstream"
+msgstr "--set-upstream"
+
+#. type: Plain text
+#: en/fetch-options.txt:183
+#, priority:220
+msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:184
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:188
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177
+#: en/fetch-options.txt:189
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:184
+#: en/fetch-options.txt:196
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:187
-#, no-wrap, ignore-same, no-wrap, priority:220
+#: en/fetch-options.txt:199
+#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:194
+#: en/fetch-options.txt:206
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:195 en/git-clone.txt:182
+#: en/fetch-options.txt:207 en/git-clone.txt:182
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:212
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:202 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:51 en/git-clone.txt:119 en/git-commit.txt:313 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:300 en/git-grep.txt:295 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:314 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:254 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:135
-#, no-wrap, ignore-same, no-wrap, priority:300
+#: en/fetch-options.txt:214 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:315 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:301 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:255 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:143
+#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:207
+#: en/fetch-options.txt:219
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:208 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:298 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:318 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:139
-#, no-wrap, ignore-same, no-wrap, priority:300
+#: en/fetch-options.txt:220 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:300 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
+#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:209 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:299 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:319 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:140
-#, no-wrap, ignore-same, no-wrap, priority:300
+#: en/fetch-options.txt:221 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:301 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
+#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:211 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:142
+#: en/fetch-options.txt:223 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:150
#, fuzzy, priority:300
msgid "Be verbose."
msgstr "visualizza ulteriori dettagli"
#. type: Labeled list
-#: en/fetch-options.txt:213 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:326 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:258 en/git-switch.txt:144 en/merge-options.txt:143
-#, no-wrap, ignore-same, no-wrap, priority:300
+#: en/fetch-options.txt:225 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:328 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:259 en/git-switch.txt:144 en/merge-options.txt:151
+#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:218 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:230 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:219 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:231 en/git-ls-remote.txt:73 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:220 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:232 en/git-clone.txt:135 en/git-ls-remote.txt:74
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-clone.txt:142
+#: en/fetch-options.txt:239 en/git-clone.txt:142
#, priority:300
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:228
-#, no-wrap, ignore-same, no-wrap, priority:220
+#: en/fetch-options.txt:240
+#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:233
+#: en/fetch-options.txt:245
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:234
-#, no-wrap, ignore-same, no-wrap, priority:220
+#: en/fetch-options.txt:246
+#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:240
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:241 en/git-push.txt:398
-#, no-wrap, ignore-same, no-wrap, priority:220
+#: en/fetch-options.txt:253 en/git-push.txt:398
+#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:242 en/git-push.txt:399
-#, no-wrap, ignore-same, no-wrap, priority:220
+#: en/fetch-options.txt:254 en/git-push.txt:399
+#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:244 en/git-push.txt:401
+#: en/fetch-options.txt:256 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:245 en/git-push.txt:402
-#, no-wrap, ignore-same, no-wrap, priority:220
+#: en/fetch-options.txt:257 en/git-push.txt:402
+#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:246 en/git-push.txt:403
-#, no-wrap, ignore-same, no-wrap, priority:220
+#: en/fetch-options.txt:258 en/git-push.txt:403
+#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:247 en/git-push.txt:405
+#: en/fetch-options.txt:259 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
#. type: Title =
#: en/git-add.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "git-add(1)"
msgstr "git-add(1)"
@@ -5650,7 +5664,7 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:15
-#, no-wrap, priority:300
+#, ignore-ellipsis, no-wrap, priority:300
msgid ""
"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n"
"\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n"
@@ -5659,7 +5673,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:20 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:67 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
+#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr ""
@@ -5701,14 +5715,14 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr ""
#. type: Title -
-#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:83 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:85 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:115 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:253 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:86 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:254 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:52 en/git-grep.txt:308 en/git-status.txt:148
-#, no-wrap, priority:300
+#: en/git-add.txt:52 en/git-grep.txt:325 en/git-status.txt:152
+#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
@@ -5719,7 +5733,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:67 en/git-grep.txt:314
+#: en/git-add.txt:67 en/git-grep.txt:331
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -5737,14 +5751,14 @@ msgid "Allow adding otherwise ignored files."
msgstr "consenti l'aggiunta di file altrimenti ignorati"
#. type: Labeled list
-#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:42 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:394 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
-#, no-wrap, ignore-same, no-wrap, priority:300
+#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:43 en/git-rebase.txt:395 en/git-rebase.txt:536 en/git-svn.txt:297
-#, no-wrap, ignore-same, no-wrap, priority:300
+#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
+#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5767,14 +5781,14 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:275 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
-#, no-wrap, ignore-same, no-wrap, priority:300
+#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
#. type: Labeled list
#: en/git-add.txt:100 en/git-cherry-pick.txt:54 en/git-commit.txt:220 en/git-config.txt:248 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--edit"
msgstr "--edit"
@@ -5792,7 +5806,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:112
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--update"
msgstr "--update"
@@ -5816,7 +5830,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:124
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--no-ignore-removal"
msgstr "--no-ignore-removal"
@@ -5834,13 +5848,13 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:135
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--no-all"
msgstr "--no-all"
#. type: Labeled list
#: en/git-add.txt:136
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--ignore-removal"
msgstr "--ignore-removal"
@@ -5852,19 +5866,19 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:145
-#, priority:300
+#, ignore-ellipsis, priority:300
msgid "This option is primarily to help users who are used to older versions of Git, whose \"git add <pathspec>...\" was a synonym for \"git add --no-all <pathspec>...\", i.e. ignored removed files."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:146 en/git-format-patch.txt:101 en/git-submodule.txt:340
+#: en/git-add.txt:146 en/git-format-patch.txt:102 en/git-submodule.txt:341
#, no-wrap, priority:300
msgid "-N"
msgstr ""
#. type: Labeled list
#: en/git-add.txt:147 en/git-apply.txt:77
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--intent-to-add"
msgstr "--intent-to-add"
@@ -5876,7 +5890,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:154 en/git-update-index.txt:54
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--refresh"
msgstr "--refresh"
@@ -5888,7 +5902,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:158
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--ignore-errors"
msgstr "--ignore-errors"
@@ -5900,7 +5914,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:165 en/git-notes.txt:169 en/git-update-index.txt:72 en/rev-list-options.txt:201
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--ignore-missing"
msgstr "--ignore-missing"
@@ -5912,7 +5926,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:171
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--no-warn-embedded-repo"
msgstr "--no-warn-embedded-repo"
@@ -5924,7 +5938,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:178
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--renormalize"
msgstr "--renormalize"
@@ -5947,7 +5961,7 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:343 en/git-grep.txt:304 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
+#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:345 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr ""
@@ -5959,7 +5973,7 @@ msgid "This option can be used to separate command-line options from the list of
msgstr ""
#. type: Title -
-#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:357 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:153 en/git-fetch.txt:242 en/git-filter-branch.txt:234 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:634 en/git-grep.txt:316 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:206 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:359 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:638 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr ""
@@ -6001,7 +6015,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:221 en/git-rebase.txt:591
+#: en/git-add.txt:221 en/git-rebase.txt:613
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr ""
@@ -6013,7 +6027,7 @@ msgid "When the command enters the interactive mode, it shows the output of the
msgstr ""
#. type: Plain text
-#: en/git-add.txt:230 en/git-clean.txt:83
+#: en/git-add.txt:230 en/git-clean.txt:85
#, priority:300
msgid "The command loop shows the list of subcommands available, and gives a prompt \"What now> \". In general, when the prompt ends with a single '>', you can pick only one of the choices given and type return, like this:"
msgstr ""
@@ -6182,7 +6196,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:336
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "diff"
msgstr "diff"
@@ -6313,7 +6327,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:135 en/git-commit-tree.txt:118 en/git-commit.txt:487 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:241 en/git-fast-import.txt:1503 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:679 en/git-gc.txt:154 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:112 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:247 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:519 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:292 en/git-status.txt:434 en/git-submodule.txt:436 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
+#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:489 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1526 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:683 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:437 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
@@ -6325,20 +6339,20 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:139 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:495 en/git-config.txt:492 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:245 en/git-fast-import.txt:1507 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:480 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:683 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:334 en/git-gui.txt:126 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:116 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:230 en/git-merge-file.txt:94 en/git-merge-index.txt:78 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1052 en/git-receive-pack.txt:251 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:123 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:523 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:300 en/git-status.txt:438 en/git-stripspace.txt:93 en/git-submodule.txt:440 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
+#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:497 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1530 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:693 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:687 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:441 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
#, no-wrap, priority:300
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:140 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:496 en/git-config.txt:493 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:246 en/git-fast-import.txt:1508 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:481 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:684 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:335 en/git-gui.txt:127 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:117 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:231 en/git-merge-file.txt:95 en/git-merge-index.txt:79 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1053 en/git-receive-pack.txt:252 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:124 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:524 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:301 en/git-status.txt:439 en/git-stripspace.txt:94 en/git-submodule.txt:441 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
+#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:498 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1531 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:694 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:688 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:442 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
#. type: Title =
#: en/git-am.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-am(1)"
msgstr "git-am(1)"
@@ -6350,7 +6364,7 @@ msgstr "Applica una serie di patch da una casella di posta"
#. type: Plain text
#: en/git-am.txt:20
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n"
"\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n"
@@ -6370,7 +6384,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:29
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "(<mbox>|<Maildir>)..."
msgstr ""
@@ -6381,8 +6395,8 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:118 en/git-rebase.txt:387 en/git-revert.txt:98 en/merge-options.txt:73
-#, no-wrap, ignore-same, no-wrap, priority:280
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:119 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
+#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6400,7 +6414,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:44 en/git-quiltimport.txt:59
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--keep-non-patch"
msgstr "--keep-non-patch"
@@ -6412,7 +6426,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:47
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]keep-cr"
msgstr "--[no-]keep-cr"
@@ -6423,14 +6437,14 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:969
-#, no-wrap, ignore-same, no-wrap, priority:260
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:985
+#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
#. type: Labeled list
#: en/git-am.txt:54 en/git-mailinfo.txt:74
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--scissors"
msgstr "--scissors"
@@ -6442,7 +6456,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:59 en/git-mailinfo.txt:90
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-scissors"
msgstr "--no-scissors"
@@ -6453,14 +6467,14 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:267 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:989
-#, no-wrap, ignore-same, no-wrap, priority:260
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1005
+#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
#. type: Labeled list
#: en/git-am.txt:63 en/git-mailinfo.txt:70
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--message-id"
msgstr "--message-id"
@@ -6472,7 +6486,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:69
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-message-id"
msgstr "--no-message-id"
@@ -6490,7 +6504,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:78
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--utf8"
msgstr "--utf8"
@@ -6510,7 +6524,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:88
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-utf8"
msgstr "--no-utf8"
@@ -6522,19 +6536,19 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:92 en/git-apply.txt:85
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "-3"
msgstr "-3"
#. type: Labeled list
#: en/git-am.txt:93 en/git-apply.txt:86
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--3way"
msgstr "--3way"
#. type: Labeled list
#: en/git-am.txt:94
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-3way"
msgstr "--no-3way"
@@ -6545,37 +6559,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:303 en/git-revert.txt:112
-#, no-wrap, ignore-same, no-wrap, priority:240
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
+#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:304 en/git-revert.txt:113
-#, no-wrap, ignore-same, no-wrap, priority:240
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
+#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:307 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:373 en/git-rebase.txt:524
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
+#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:374
+#: en/git-am.txt:109 en/git-rebase.txt:396
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:337
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6606,7 +6620,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:115 en/git-apply.txt:108
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--reject"
msgstr "--reject"
@@ -6618,7 +6632,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:120
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--patch-format"
msgstr "--patch-format"
@@ -6635,8 +6649,8 @@ msgid "Run interactively."
msgstr "esegui in modalit횪 interattiva"
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:380 en/git-rebase.txt:521
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
+#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6647,8 +6661,8 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:381 en/git-rebase.txt:522
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
+#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6659,8 +6673,8 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:256 en/sequencer.txt:6
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
+#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6671,38 +6685,38 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:333 en/git-rebase.txt:308 en/git-revert.txt:91 en/merge-options.txt:58
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:335 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:334 en/git-rebase.txt:309 en/git-revert.txt:92 en/merge-options.txt:59
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:336 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:338 en/git-rebase.txt:313 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:340 en/git-rebase.txt:331 en/git-revert.txt:96
#, priority:280
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:228 en/sequencer.txt:1
-#, no-wrap, ignore-same, no-wrap, priority:240
+#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:246 en/sequencer.txt:1
+#, ignore-same, no-wrap, priority:240
msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:406 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:997
-#, no-wrap, ignore-same, no-wrap, priority:280
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1013
+#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
#. type: Labeled list
#: en/git-am.txt:157
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--resolved"
msgstr "--resolved"
@@ -6725,8 +6739,8 @@ msgid "When a patch failure occurs, <msg> will be printed to the screen before e
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:231 en/sequencer.txt:15
-#, no-wrap, ignore-same, no-wrap, priority:240
+#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:249 en/sequencer.txt:15
+#, ignore-same, no-wrap, priority:240
msgid "--abort"
msgstr "--abort"
@@ -6737,8 +6751,8 @@ msgid "Restore the original branch and abort the patching operation."
msgstr "ripristina il branch originario e interrompi l'operazione di patching."
#. type: Labeled list
-#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:238 en/sequencer.txt:10
-#, no-wrap, ignore-same, no-wrap, priority:240
+#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:256 en/sequencer.txt:10
+#, ignore-same, no-wrap, priority:240
msgid "--quit"
msgstr "--quit"
@@ -6749,8 +6763,8 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:262
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-am.txt:179 en/git-rebase.txt:280
+#, ignore-same, no-wrap, priority:100
msgid "--show-current-patch"
msgstr "--show-current-patch"
@@ -6761,7 +6775,7 @@ msgid "Show the patch being applied when \"git am\" is stopped because of confli
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:451 en/git-format-patch.txt:351 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:188 en/git-tag.txt:231
+#: en/git-am.txt:184 en/git-commit.txt:453 en/git-format-patch.txt:355 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
@@ -6845,7 +6859,7 @@ msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the curren
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:471 en/git-gc.txt:147
+#: en/git-am.txt:234 en/git-commit.txt:473 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
@@ -6864,7 +6878,7 @@ msgstr "linkgit:git-apply[1]."
#. type: Title =
#: en/git-annotate.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-annotate(1)"
msgstr "git-annotate(1)"
@@ -6894,7 +6908,7 @@ msgstr ""
#. type: Title =
#: en/git-apply.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-apply(1)"
msgstr "git-apply(1)"
@@ -6906,7 +6920,7 @@ msgstr "Applica una patch ai file e/o all'indice"
#. type: Plain text
#: en/git-apply.txt:20
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git apply' [--stat] [--numstat] [--summary] [--check] [--index | --intent-to-add] [--3way]\n"
"\t [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]\n"
@@ -6932,7 +6946,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:37
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<patch>..."
msgstr ""
@@ -6943,8 +6957,8 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:322 en/merge-options.txt:84
-#, no-wrap, ignore-same, no-wrap, priority:240
+#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
+#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -6974,7 +6988,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--index"
msgstr "--index"
@@ -6985,8 +6999,8 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:291
-#, no-wrap, ignore-same, no-wrap, priority:280
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:292
+#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7028,7 +7042,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:105 en/rev-list-options.txt:676
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--reverse"
msgstr "--reverse"
@@ -7057,14 +7071,14 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:342
+#: en/git-apply.txt:134 en/git-rebase.txt:360
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:135
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--unidiff-zero"
msgstr "--unidiff-zero"
@@ -7082,7 +7096,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:145
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--apply"
msgstr "--apply"
@@ -7094,7 +7108,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:152
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-add"
msgstr "--no-add"
@@ -7106,7 +7120,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:159
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--allow-binary-replacement"
msgstr "--allow-binary-replacement"
@@ -7208,7 +7222,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:217
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--inaccurate-eof"
msgstr "--inaccurate-eof"
@@ -7226,7 +7240,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:230
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--recount"
msgstr "--recount"
@@ -7256,7 +7270,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:243
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--unsafe-paths"
msgstr "--unsafe-paths"
@@ -7273,14 +7287,14 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:330 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:398 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:332 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:256
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "apply.ignoreWhitespace"
msgstr "apply.ignoreWhitespace"
@@ -7292,7 +7306,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:260
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "apply.whitespace"
msgstr "apply.whitespace"
@@ -7334,7 +7348,7 @@ msgstr "linkgit:git-am[1]."
#. type: Title =
#: en/git-archimport.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-archimport(1)"
msgstr "git-archimport(1)"
@@ -7346,7 +7360,7 @@ msgstr ""
#. type: Plain text
#: en/git-archimport.txt:14
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]\n"
" <archive/branch>[:<git-branch>] ...\n"
@@ -7444,7 +7458,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archimport.txt:86 en/git-commit.txt:267 en/git-grep.txt:211 en/git-ls-files.txt:47 en/git-merge-index.txt:29
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "-o"
msgstr "-o"
@@ -7498,7 +7512,7 @@ msgstr ""
#. type: Title =
#: en/git-archive.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-archive(1)"
msgstr "git-archive(1)"
@@ -7510,7 +7524,7 @@ msgstr "Crea un archivio di file da un albero con nome"
#. type: Plain text
#: en/git-archive.txt:16
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git archive' [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]\n"
"\t [-o <file> | --output=<file>] [--worktree-attributes]\n"
@@ -7544,7 +7558,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:165 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--list"
msgstr "--list"
@@ -7586,7 +7600,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:58
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--worktree-attributes"
msgstr "--worktree-attributes"
@@ -7670,7 +7684,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "-0"
msgstr "-0"
@@ -7682,7 +7696,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:92
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "-9"
msgstr "-9"
@@ -7874,7 +7888,7 @@ msgstr "linkgit:gitattributes[5]"
#. type: Title =
#: en/git-bisect.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-bisect(1)"
msgstr "git-bisect(1)"
@@ -7898,7 +7912,7 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:31
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>]\n"
"\t\t [--no-checkout] [<bad> [<good>...]] [--] [<paths>...]\n"
@@ -8093,7 +8107,7 @@ msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:158
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "git bisect new [<rev>...]\n"
msgstr ""
@@ -8123,7 +8137,7 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:175
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "If you would like to use your own terms instead of \"bad\"/\"good\" or \"new\"/\"old\", you can choose any names you like (except existing bisect subcommands like `reset`, `start`, ...) by starting the bisection using"
msgstr ""
@@ -8403,7 +8417,7 @@ msgstr ""
#. type: Labeled list
#: en/git-bisect.txt:357 en/git-clone.txt:144
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--no-checkout"
msgstr "--no-checkout"
@@ -8563,7 +8577,7 @@ msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:463
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git bisect start HEAD <known-good-commit> [ <boundary-commit> ... ] --no-checkout\n"
"$ git bisect run sh -c '\n"
@@ -8637,7 +8651,7 @@ msgstr ""
#. type: Title =
#: en/git-blame.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-blame(1)"
msgstr "git-blame(1)"
@@ -8705,7 +8719,7 @@ msgstr "Usa la stessa modalit횪 di output di git-annotate (impostazione predefin
#. type: Labeled list
#: en/git-blame.txt:56
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--score-debug"
msgstr "--score-debug"
@@ -8717,7 +8731,7 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:66
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--show-name"
msgstr "--show-name"
@@ -8729,7 +8743,7 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:72
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--show-number"
msgstr "--show-number"
@@ -8747,7 +8761,7 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:79
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--show-email"
msgstr "--show-email"
@@ -9019,7 +9033,7 @@ msgstr ""
#. type: Title =
#: en/git-branch.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "git-branch(1)"
msgstr "git-branch(1)"
@@ -9031,7 +9045,7 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:26
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<length> | --no-abbrev]]\n"
@@ -9076,7 +9090,7 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:61
-#, priority:240
+#, ignore-ellipsis, priority:240
msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
@@ -9118,13 +9132,13 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:97 en/git-clean.txt:28 en/git-cvsexportcommit.txt:49 en/git-difftool.txt:22 en/git-http-push.txt:44 en/git-instaweb.txt:27 en/git-ls-files.txt:39 en/git-ls-tree.txt:41 en/git-push.txt:181 en/git-repack.txt:60 en/git-replace.txt:65 en/git-show-ref.txt:47 en/git-switch.txt:81 en/git-symbolic-ref.txt:35 en/git-tag.txt:83
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--delete"
msgstr "--delete"
@@ -9142,7 +9156,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--create-reflog"
msgstr "--create-reflog"
@@ -9160,7 +9174,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:126
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--move"
msgstr "--move"
@@ -9184,7 +9198,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:133
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--copy"
msgstr "--copy"
@@ -9195,7 +9209,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:525
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9220,7 +9234,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:113 en/git-tag.txt:131
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -9231,14 +9245,14 @@ msgid "Sorting and filtering branches are case insensitive."
msgstr "l'ordinamento e il filtraggio non fanno differenza tra maiuscole e minuscole"
#. type: Labeled list
-#: en/git-branch.txt:153 en/git-status.txt:126 en/git-tag.txt:134
+#: en/git-branch.txt:153 en/git-status.txt:130 en/git-tag.txt:134
#, no-wrap, priority:280
msgid "--column[=<options>]"
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:154 en/git-status.txt:127 en/git-tag.txt:135
-#, no-wrap, ignore-same, no-wrap, priority:280
+#: en/git-branch.txt:154 en/git-status.txt:131 en/git-tag.txt:135
+#, ignore-same, no-wrap, priority:280
msgid "--no-column"
msgstr "--no-column"
@@ -9256,7 +9270,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:162 en/git-show-branch.txt:44
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--remotes"
msgstr "--remotes"
@@ -9274,13 +9288,13 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:176
-#, priority:240
+#, ignore-ellipsis, priority:240
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:177
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--show-current"
msgstr "--show-current"
@@ -9292,7 +9306,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:182
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "-vv"
msgstr "-vv"
@@ -9322,7 +9336,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:202
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--no-abbrev"
msgstr "--no-abbrev"
@@ -9334,7 +9348,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:206 en/git-checkout.txt:159 en/git-switch.txt:152
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--track"
msgstr "--track"
@@ -9352,7 +9366,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:221 en/git-checkout.txt:173 en/git-switch.txt:167
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--no-track"
msgstr "--no-track"
@@ -9362,12 +9376,6 @@ msgstr "--no-track"
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
-#. type: Labeled list
-#: en/git-branch.txt:225 en/git-push.txt:349
-#, no-wrap, ignore-same, no-wrap, priority:240
-msgid "--set-upstream"
-msgstr "--set-upstream"
-
#. type: Plain text
#: en/git-branch.txt:228
#, priority:240
@@ -9394,7 +9402,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:235
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--unset-upstream"
msgstr "--unset-upstream"
@@ -9406,7 +9414,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:239
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--edit-description"
msgstr "--edit-description"
@@ -9520,7 +9528,7 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:291
-#, priority:240
+#, ignore-ellipsis, priority:240
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. You may use the --sort=<key> option multiple times, in which case the last key becomes the primary key. The keys supported are the same as those in `git for-each-ref`. Sort order defaults to the value configured for the `branch.sort` variable if exists, or to sorting based on the full refname (including `refs/...` prefix). This lists detached HEAD (if present) first, then local branches and finally remote-tracking branches. See linkgit:git-config[1]."
msgstr ""
@@ -9562,7 +9570,7 @@ msgstr ""
#. type: delimited block -
#: en/git-branch.txt:317
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -9584,7 +9592,7 @@ msgstr ""
#. type: delimited block -
#: en/git-branch.txt:329
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -9637,7 +9645,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-filter-branch.txt:449 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -9686,7 +9694,7 @@ msgstr ""
#. type: Title =
#: en/git-bundle.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-bundle(1)"
msgstr "git-bundle(1)"
@@ -9698,7 +9706,7 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:16
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git bundle' create <file> <git-rev-list-args>\n"
"'git bundle' verify <file>\n"
@@ -9774,7 +9782,7 @@ msgstr ""
#. type: Labeled list
#: en/git-bundle.txt:71
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "[<refname>...]"
msgstr ""
@@ -9971,7 +9979,7 @@ msgstr ""
#. type: Title =
#: en/git-cat-file.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-cat-file(1)"
msgstr "git-cat-file(1)"
@@ -10057,7 +10065,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:66
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--filters"
msgstr "--filters"
@@ -10081,7 +10089,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:77 en/git-mktree.txt:32
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--batch"
msgstr "--batch"
@@ -10099,7 +10107,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:85
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--batch-check"
msgstr "--batch-check"
@@ -10117,7 +10125,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:93
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--batch-all-objects"
msgstr "--batch-all-objects"
@@ -10129,7 +10137,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:100
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--buffer"
msgstr "--buffer"
@@ -10141,7 +10149,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:107
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--unordered"
msgstr "--unordered"
@@ -10153,7 +10161,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:117
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--allow-unknown-type"
msgstr "--allow-unknown-type"
@@ -10165,7 +10173,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:120
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--follow-symlinks"
msgstr "--follow-symlinks"
@@ -10257,7 +10265,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:152 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10312,7 +10320,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:202
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`objectname`"
msgstr "`objectname`"
@@ -10324,7 +10332,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:205
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`objecttype`"
msgstr "`objecttype`"
@@ -10336,7 +10344,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:208
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`objectsize`"
msgstr "`objectsize`"
@@ -10360,7 +10368,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:216
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`deltabase`"
msgstr "`deltabase`"
@@ -10372,7 +10380,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:221
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`rest`"
msgstr "`rest`"
@@ -10538,7 +10546,7 @@ msgstr ""
#. type: Title =
#: en/git-check-attr.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-check-attr(1)"
msgstr "git-check-attr(1)"
@@ -10550,7 +10558,7 @@ msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:14
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git check-attr' [-a | --all | <attr>...] [--] <pathname>...\n"
"'git check-attr' --stdin [-z] [-a | --all | <attr>...]\n"
@@ -10582,7 +10590,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:148 en/rev-list-options.txt:213
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--stdin"
msgstr "--stdin"
@@ -10779,7 +10787,7 @@ msgstr "linkgit:gitattributes[5]."
#. type: Title =
#: en/git-check-ignore.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-check-ignore(1)"
msgstr "git-check-ignore(1)"
@@ -10791,7 +10799,7 @@ msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:14
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git check-ignore' [<options>] <pathname>...\n"
"'git check-ignore' [<options>] --stdin\n"
@@ -10853,7 +10861,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ignore.txt:52 en/git-grep.txt:79
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-index"
msgstr "--no-index"
@@ -10906,7 +10914,7 @@ msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will al
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:226
+#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
@@ -10955,7 +10963,7 @@ msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
#. type: Title =
#: en/git-check-mailmap.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-check-mailmap(1)"
msgstr "git-check-mailmap(1)"
@@ -10967,7 +10975,7 @@ msgstr ""
#. type: Plain text
#: en/git-check-mailmap.txt:13
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid "'git check-mailmap' [<options>] <contact>...\n"
msgstr "git check-mailmap [<opzioni>] <contatto>..."
@@ -10991,7 +10999,7 @@ msgstr ""
#. type: Title =
#: en/git-checkout-index.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-checkout-index(1)"
msgstr "git-checkout-index(1)"
@@ -11003,7 +11011,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:17
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]\n"
"\t\t [--stage=<number>|all]\n"
@@ -11044,7 +11052,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout-index.txt:44
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-create"
msgstr "--no-create"
@@ -11080,7 +11088,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout-index.txt:57
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--temp"
msgstr "--temp"
@@ -11103,7 +11111,7 @@ msgid "Only meaningful with `--stdin`; paths are separated with NUL character in
msgstr ""
#. type: Plain text
-#: en/git-checkout-index.txt:73 en/git-commit.txt:345 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
+#: en/git-checkout-index.txt:73 en/git-commit.txt:347 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
#, priority:280
msgid "Do not interpret any more arguments as options."
msgstr ""
@@ -11266,7 +11274,7 @@ msgstr ""
#. type: Title =
#: en/git-checkout.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "git-checkout(1)"
msgstr "git-checkout(1)"
@@ -11278,7 +11286,7 @@ msgstr "Passa da un branch a un altro o ripristina i file nell'albero di lavoro"
#. type: Plain text
#: en/git-checkout.txt:18
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git checkout' [-q] [-f] [-m] [<branch>]\n"
"'git checkout' [-q] [-f] [-m] --detach [<branch>]\n"
@@ -11389,7 +11397,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:82
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git checkout' [<tree-ish>] [--] <pathspec>..."
msgstr ""
@@ -11407,7 +11415,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:98
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]"
msgstr ""
@@ -11424,8 +11432,8 @@ msgid "Quiet, suppress feedback messages."
msgstr "non visualizzare i messaggi di feedback"
#. type: Labeled list
-#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:144
-#, no-wrap, ignore-same, no-wrap, priority:240
+#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:152
+#, ignore-same, no-wrap, priority:240
msgid "--no-progress"
msgstr "--no-progress"
@@ -11449,13 +11457,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:128 en/git-merge-file.txt:73 en/git-restore.txt:75
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:129 en/git-merge-file.txt:74 en/git-restore.txt:76
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--theirs"
msgstr "--theirs"
@@ -11521,13 +11529,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:177 en/git-switch.txt:87
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--guess"
msgstr "--guess"
#. type: Labeled list
#: en/git-checkout.txt:178 en/git-switch.txt:88
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--no-guess"
msgstr "--no-guess"
@@ -11557,7 +11565,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:202 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--detach"
msgstr "--detach"
@@ -11599,7 +11607,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:234 en/git-restore.txt:102
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -11610,8 +11618,8 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:241 en/git-rebase.txt:268 en/git-rebase.txt:529 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:354 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
-#, no-wrap, ignore-same, no-wrap, priority:280
+#: en/git-checkout.txt:241 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:355 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
+#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11671,7 +11679,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:282 en/git-switch.txt:175
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--ignore-other-worktrees"
msgstr "--ignore-other-worktrees"
@@ -11683,13 +11691,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:288 en/git-merge.txt:90
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--overwrite-ignore"
msgstr "--overwrite-ignore"
#. type: Labeled list
#: en/git-checkout.txt:289 en/git-merge.txt:91
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--no-overwrite-ignore"
msgstr "--no-overwrite-ignore"
@@ -11701,7 +11709,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:294 en/git-grep.txt:95 en/git-ls-files.txt:150 en/git-switch.txt:181
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -11713,13 +11721,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:304 en/git-restore.txt:109
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
#: en/git-checkout.txt:305 en/git-restore.txt:110
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--no-overlay"
msgstr "--no-overlay"
@@ -11730,7 +11738,7 @@ msgid "In the default overlay mode, `git checkout` never removes files from the
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:312 en/git-rebase.txt:225 en/git-switch.txt:36
+#: en/git-checkout.txt:312 en/git-rebase.txt:243 en/git-switch.txt:36
#, fuzzy, no-wrap, priority:240
msgid "<branch>"
msgstr "'branch'"
@@ -11749,7 +11757,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:326 en/git-switch.txt:58
-#, priority:240
+#, ignore-ellipsis, priority:240
msgid "As a special case, you may use `A...B` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
@@ -11779,7 +11787,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:337
-#, priority:240
+#, ignore-ellipsis, priority:240
msgid "As a special case, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
@@ -12140,7 +12148,7 @@ msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
#. type: Title =
#: en/git-check-ref-format.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-check-ref-format(1)"
msgstr "git-check-ref-format(1)"
@@ -12276,7 +12284,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:101
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]allow-onelevel"
msgstr "--[no-]allow-onelevel"
@@ -12288,7 +12296,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:106
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--refspec-pattern"
msgstr "--refspec-pattern"
@@ -12300,7 +12308,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:113
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--normalize"
msgstr "--normalize"
@@ -12338,7 +12346,7 @@ msgstr ""
#. type: Title =
#: en/git-cherry-pick.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-cherry-pick(1)"
msgstr "git-cherry-pick(1)"
@@ -12350,7 +12358,7 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:14
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]\n"
"\t\t [-S[<keyid>]] <commit>...\n"
@@ -12407,13 +12415,13 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:43 en/git-merge.txt:116 en/git-revert.txt:36 en/git-verify-commit.txt:27
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid "<commit>..."
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:52
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Commits to cherry-pick. For a more complete list of ways to spell commits, see linkgit:gitrevisions[7]. Sets of commits can be passed but no traversal is done by default, as if the `--no-walk` option was specified, see linkgit:git-rev-list[1]. Note that specifying a range will feed all <commit>... arguments to a single revision walk (see a later example that uses 'maint master..next')."
msgstr ""
@@ -12436,14 +12444,14 @@ msgid "This option determines how the commit message will be cleaned up before b
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:65 en/git-clean.txt:61
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-cherry-pick.txt:65 en/git-clean.txt:63
+#, ignore-same, no-wrap, priority:100
msgid "-x"
msgstr "-x"
#. type: Plain text
#: en/git-cherry-pick.txt:78
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "When recording the commit, append a line that says \"(cherry picked from commit ...)\" to the original commit message in order to indicate which commit this change was cherry-picked from. This is done only for cherry picks without conflicts. Do not use this option if you are cherry-picking from your private branch because the information is useless to the recipient. If on the other hand you are cherry-picking between two publicly visible branches (e.g. backporting a fix to a maintenance branch for an older release from a development branch), adding this information can be useful."
msgstr ""
@@ -12473,7 +12481,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:93 en/git-revert.txt:78 en/merge-options.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--no-commit"
msgstr "--no-commit"
@@ -12497,7 +12505,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:116 en/merge-options.txt:42
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--ff"
msgstr "--ff"
@@ -12509,7 +12517,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:121 en/git-commit.txt:179 en/git-notes.txt:158
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--allow-empty"
msgstr "--allow-empty"
@@ -12520,8 +12528,8 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:249 en/git-rebase.txt:532
-#, no-wrap, ignore-same, no-wrap, priority:280
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:267 en/git-rebase.txt:554
+#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12533,7 +12541,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:139
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--keep-redundant-commits"
msgstr "--keep-redundant-commits"
@@ -12544,7 +12552,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:282 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:109
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12562,7 +12570,7 @@ msgid "-X<option>"
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:125
#, no-wrap, priority:240
msgid "--strategy-option=<option>"
msgstr ""
@@ -12717,7 +12725,7 @@ msgstr ""
#. type: Title =
#: en/git-cherry.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-cherry(1)"
msgstr "git-cherry(1)"
@@ -12758,7 +12766,7 @@ msgid "Show the commit subjects next to the SHA1s."
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:32 en/git-rebase.txt:220
+#: en/git-cherry.txt:32 en/git-rebase.txt:238
#, fuzzy, no-wrap, priority:100
msgid "<upstream>"
msgstr "upstream"
@@ -12776,7 +12784,7 @@ msgid "<head>"
msgstr ""
#. type: Plain text
-#: en/git-cherry.txt:38 en/git-rebase.txt:227
+#: en/git-cherry.txt:38 en/git-rebase.txt:245
#, priority:100
msgid "Working branch; defaults to HEAD."
msgstr ""
@@ -12801,7 +12809,7 @@ msgstr ""
#. type: delimited block -
#: en/git-cherry.txt:58
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git checkout -b topic origin/master\n"
"# work and create some commits\n"
@@ -12837,7 +12845,7 @@ msgstr ""
#. type: delimited block -
#: en/git-cherry.txt:86
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git log --graph --oneline --decorate --boundary origin/master...topic\n"
"* 7654321 (origin/master) upstream tip commit\n"
@@ -12860,7 +12868,7 @@ msgstr ""
#. type: delimited block -
#: en/git-cherry.txt:96
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git cherry origin/master topic\n"
"- cccc000... commit C\n"
@@ -12888,7 +12896,7 @@ msgstr ""
#. type: delimited block -
#: en/git-cherry.txt:126
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git log --graph --oneline --decorate --boundary origin/master...topic\n"
"* 7654321 (origin/master) upstream tip commit\n"
@@ -12914,7 +12922,7 @@ msgstr ""
#. type: delimited block -
#: en/git-cherry.txt:136
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git cherry origin/master topic base\n"
"- cccc000... commit C\n"
@@ -12924,7 +12932,7 @@ msgstr ""
#. type: Title =
#: en/git-citool.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-citool(1)"
msgstr "git-citool(1)"
@@ -12954,7 +12962,7 @@ msgstr ""
#. type: Title =
#: en/git-clean.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-clean(1)"
msgstr "git-clean(1)"
@@ -12966,7 +12974,7 @@ msgstr "Rimuove i file non tracciati dall'albero di lavoro"
#. type: Plain text
#: en/git-clean.txt:12
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <path>...\n"
msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <percorsi>..."
@@ -12984,90 +12992,90 @@ msgstr ""
#. type: Plain text
#: en/git-clean.txt:25
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "If any optional `<path>...` arguments are given, only those paths are affected."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:33
+#: en/git-clean.txt:35
#, priority:100
-msgid "Remove untracked directories in addition to untracked files. If an untracked directory is managed by a different Git repository, it is not removed by default. Use -f option twice if you really want to remove such a directory."
+msgid "Normally, when no <path> is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. If any paths are specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under `--force`) will be removed."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:41
+#: en/git-clean.txt:43
#, priority:100
-msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f, -n or -i. Git will refuse to delete directories with .git sub directory or file unless a second -f is given."
+msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f or -i. Git will refuse to modify untracked nested git repositories (directories with a .git subdirectory) unless a second -f is given."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:46
+#: en/git-clean.txt:48
#, priority:100
msgid "Show what would be done and clean files interactively. See ``Interactive mode'' for details."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:50
+#: en/git-clean.txt:52
#, priority:100
msgid "Don't actually remove anything, just show what would be done."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:55
+#: en/git-clean.txt:57
#, priority:100
msgid "Be quiet, only report errors, but not the files that are successfully removed."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:56
+#: en/git-clean.txt:58
#, no-wrap, priority:100
msgid "-e <pattern>"
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:57 en/git-ls-files.txt:85 en/git-name-rev.txt:33
+#: en/git-clean.txt:59 en/git-ls-files.txt:85 en/git-name-rev.txt:33
#, no-wrap, priority:100
msgid "--exclude=<pattern>"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:60
+#: en/git-clean.txt:62
#, priority:100
msgid "Use the given exclude pattern in addition to the standard ignore rules (see linkgit:gitignore[5])."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:68
+#: en/git-clean.txt:70
#, priority:100
msgid "Don't use the standard ignore rules (see linkgit:gitignore[5]), but still use the ignore rules given with `-e` options from the command line. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git restore' or 'git reset') to create a pristine working directory to test a clean build."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:69
+#: en/git-clean.txt:71
#, no-wrap, priority:100
msgid "-X"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:72
+#: en/git-clean.txt:74
#, priority:100
msgid "Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files."
msgstr ""
#. type: Title -
-#: en/git-clean.txt:74
+#: en/git-clean.txt:76
#, no-wrap, priority:100
msgid "Interactive mode"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:78
+#: en/git-clean.txt:80
#, priority:100
msgid "When the command enters the interactive mode, it shows the files and directories to be cleaned, and goes into its interactive command loop."
msgstr ""
#. type: delimited block -
-#: en/git-clean.txt:89
+#: en/git-clean.txt:91
#, no-wrap, priority:100
msgid ""
" *** Commands ***\n"
@@ -13077,98 +13085,98 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:92
+#: en/git-clean.txt:94
#, priority:100
msgid "You also could say `c` or `clean` above as long as the choice is unique."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:94
+#: en/git-clean.txt:96
#, priority:100
msgid "The main command loop has 6 subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:95
+#: en/git-clean.txt:97
#, no-wrap, priority:100
msgid "clean"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:98
+#: en/git-clean.txt:100
#, priority:100
msgid "Start cleaning files and directories, and then quit."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:99
+#: en/git-clean.txt:101
#, no-wrap, priority:100
msgid "filter by pattern"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:107
+#: en/git-clean.txt:109
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Input ignore patterns>>\" prompt. You can input space-separated patterns to exclude files and directories from deletion. E.g. \"*.c *.h\" will excludes files end with \".c\" and \".h\" from deletion. When you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:108
+#: en/git-clean.txt:110
#, no-wrap, priority:100
msgid "select by numbers"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:119
+#: en/git-clean.txt:121
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Select items to delete>>\" prompt. When the prompt ends with double '>>' like this, you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything. Also when you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:120
+#: en/git-clean.txt:122
#, no-wrap, priority:100
msgid "ask each"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:125
+#: en/git-clean.txt:127
#, priority:100
msgid "This will start to clean, and you must confirm one by one in order to delete items. Please note that this action is not as efficient as the above two actions."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:126
+#: en/git-clean.txt:128
#, fuzzy, no-wrap, priority:100
msgid "quit"
msgstr "non visualizzare messaggi"
#. type: Plain text
-#: en/git-clean.txt:129
+#: en/git-clean.txt:131
#, priority:100
msgid "This lets you quit without do cleaning."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:130
+#: en/git-clean.txt:132
#, no-wrap, priority:100
msgid "help"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:133
+#: en/git-clean.txt:135
#, priority:100
msgid "Show brief usage of interactive git-clean."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:137 en/git-status.txt:436
+#: en/git-clean.txt:139 en/git-status.txt:440
#, ignore-same, priority:280
msgid "linkgit:gitignore[5]"
msgstr "linkgit:gitignore[5]"
#. type: Title =
#: en/git-clone.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "git-clone(1)"
msgstr "git-clone(1)"
@@ -13212,7 +13220,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:45 en/git-config.txt:127 en/git-instaweb.txt:24 en/git-pack-objects.txt:142 en/git-svn.txt:245
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--local"
msgstr "--local"
@@ -13230,7 +13238,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:60
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--no-hardlinks"
msgstr "--no-hardlinks"
@@ -13242,7 +13250,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:67
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--shared"
msgstr "--shared"
@@ -13300,8 +13308,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:108 en/git-submodule.txt:392
-#, no-wrap, ignore-same, no-wrap, priority:300
+#: en/git-clone.txt:108 en/git-submodule.txt:393
+#, ignore-same, no-wrap, priority:300
msgid "--dissociate"
msgstr "--dissociate"
@@ -13337,7 +13345,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:135
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--bare"
msgstr "--bare"
@@ -13349,7 +13357,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:159 en/git-push.txt:161
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--mirror"
msgstr "--mirror"
@@ -13469,7 +13477,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:223
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
@@ -13511,7 +13519,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:261
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--[no-]shallow-submodules"
msgstr "--[no-]shallow-submodules"
@@ -13523,7 +13531,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:264
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--[no-]remote-submodules"
msgstr "--[no-]remote-submodules"
@@ -13546,13 +13554,13 @@ msgid "Instead of placing the cloned repository where it is supposed to be, plac
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:277 en/git-submodule.txt:416
+#: en/git-clone.txt:277 en/git-submodule.txt:417
#, no-wrap, priority:300
msgid "-j <n>"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:278 en/git-submodule.txt:417
+#: en/git-clone.txt:278 en/git-submodule.txt:418
#, no-wrap, priority:300
msgid "--jobs <n>"
msgstr ""
@@ -13595,7 +13603,7 @@ msgstr ""
#. type: delimited block -
#: en/git-clone.txt:306
-#, no-wrap, priority:300
+#, ignore-ellipsis, no-wrap, priority:300
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux.git my-linux\n"
"$ cd my-linux\n"
@@ -13625,7 +13633,7 @@ msgstr ""
#. type: delimited block -
#: en/git-clone.txt:325
-#, no-wrap, priority:300
+#, ignore-ellipsis, no-wrap, priority:300
msgid ""
"$ git clone --reference /git/linux.git \\\n"
"\tgit://git.kernel.org/pub/scm/.../linux.git \\\n"
@@ -13647,7 +13655,7 @@ msgstr ""
#. type: Title =
#: en/git-column.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-column(1)"
msgstr "git-column(1)"
@@ -13806,7 +13814,7 @@ msgstr ""
#. type: Title =
#: en/git-commit-tree.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-commit-tree(1)"
msgstr "git-commit-tree(1)"
@@ -13818,7 +13826,7 @@ msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:15
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git commit-tree' <tree> [(-p <parent>)...]\n"
"'git commit-tree' [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n"
@@ -13910,8 +13918,8 @@ msgid "Read the commit log message from the given file. Use `-` to read from the
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:68 en/git-commit.txt:339
-#, no-wrap, ignore-same, no-wrap, priority:280
+#: en/git-commit-tree.txt:68 en/git-commit.txt:341
+#, ignore-same, no-wrap, priority:280
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
@@ -13994,7 +14002,7 @@ msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:477 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:428 en/git-svn.txt:1156
+#: en/git-commit-tree.txt:114 en/git-commit.txt:479 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:429 en/git-svn.txt:1156
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
@@ -14007,7 +14015,7 @@ msgstr ""
#. type: Title =
#: en/git-commit.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "git-commit(1)"
msgstr "git-commit(1)"
@@ -14019,7 +14027,7 @@ msgstr ""
#. type: Plain text
#: en/git-commit.txt:17
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n"
"\t [--dry-run] [(-c | -C | --fixup | --squash) <commit>]\n"
@@ -14157,7 +14165,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:100
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--reset-author"
msgstr "--reset-author"
@@ -14169,7 +14177,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:106 en/git-status.txt:28 en/git-symbolic-ref.txt:45
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--short"
msgstr "--short"
@@ -14181,7 +14189,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:110 en/git-status.txt:32
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--branch"
msgstr "--branch"
@@ -14199,7 +14207,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:118 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--long"
msgstr "--long"
@@ -14211,7 +14219,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:123 en/git-config.txt:207 en/git-grep.txt:207
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--null"
msgstr "--null"
@@ -14300,14 +14308,14 @@ msgid "When editing the commit message, start the editor with the contents in th
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:173 en/merge-options.txt:81
+#: en/git-commit.txt:173 en/merge-options.txt:85
#, priority:280
msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:175 en/git-rebase.txt:330
-#, no-wrap, ignore-same, no-wrap, priority:280
+#: en/git-commit.txt:175 en/git-rebase.txt:348 en/merge-options.txt:112
+#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14409,7 +14417,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:226 en/git-revert.txt:66 en/merge-options.txt:17
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--no-edit"
msgstr "--no-edit"
@@ -14421,7 +14429,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:231
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--amend"
msgstr "--amend"
@@ -14439,7 +14447,7 @@ msgstr ""
#. type: delimited block -
#: en/git-commit.txt:248
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"\t$ git reset --soft HEAD^\n"
"\t$ ... do something else to come up with the right tree ...\n"
@@ -14460,7 +14468,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:257
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--no-post-rewrite"
msgstr "--no-post-rewrite"
@@ -14472,7 +14480,7 @@ msgstr "ignora l'hook post-rewrite"
#. type: Labeled list
#: en/git-commit.txt:261
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--include"
msgstr "--include"
@@ -14484,7 +14492,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:268
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--only"
msgstr "--only"
@@ -14513,115 +14521,115 @@ msgid "Show untracked files."
msgstr "Nessun file non tracciato.\n"
#. type: Plain text
-#: en/git-commit.txt:288
+#: en/git-commit.txt:289
#, priority:280
msgid "The mode parameter is optional (defaults to 'all'), and is used to specify the handling of untracked files; when -u is not used, the default is 'normal', i.e. show untracked files and directories."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:290 en/git-status.txt:67 en/git-status.txt:107
+#: en/git-commit.txt:291 en/git-status.txt:68 en/git-status.txt:110
#, priority:280
msgid "The possible options are:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:292
+#: en/git-commit.txt:293
#, no-wrap, priority:280
msgid "'no' - Show no untracked files\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:293
+#: en/git-commit.txt:294
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:294 en/git-status.txt:71
+#: en/git-commit.txt:295 en/git-status.txt:72
#, no-wrap, priority:280
msgid "'all' - Also shows individual files in untracked directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:297 en/git-status.txt:84
+#: en/git-commit.txt:298 en/git-status.txt:85
#, priority:280
msgid "The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:308
+#: en/git-commit.txt:310
#, priority:280
msgid "Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template to help the user describe the commit by reminding what changes the commit has. Note that this diff output doesn't have its lines prefixed with '#'. This diff will not be a part of the commit message. See the `commit.verbose` configuration variable in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:312
+#: en/git-commit.txt:314
#, priority:280
msgid "If specified twice, show in addition the unified diff between what would be committed and the worktree files, i.e. the unstaged changes to tracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:316
+#: en/git-commit.txt:318
#, priority:280
msgid "Suppress commit summary message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:321
+#: en/git-commit.txt:323
#, priority:280
msgid "Do not create a commit, but show a list of paths that are to be committed, paths with local changes that will be left uncommitted and paths that are untracked."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:322
-#, no-wrap, ignore-same, no-wrap, priority:280
+#: en/git-commit.txt:324
+#, ignore-same, no-wrap, priority:280
msgid "--status"
msgstr "--status"
#. type: Plain text
-#: en/git-commit.txt:327
+#: en/git-commit.txt:329
#, priority:280
msgid "Include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the commit message. Defaults to on, but can be used to override configuration variable commit.status."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:328
-#, no-wrap, ignore-same, no-wrap, priority:280
+#: en/git-commit.txt:330
+#, ignore-same, no-wrap, priority:280
msgid "--no-status"
msgstr "--no-status"
#. type: Plain text
-#: en/git-commit.txt:332
+#: en/git-commit.txt:334
#, priority:280
msgid "Do not include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the default commit message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:342
+#: en/git-commit.txt:344
#, priority:280
msgid "Countermand `commit.gpgSign` configuration variable that is set to force each and every commit to be signed."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:346 en/git-rm.txt:29
-#, no-wrap, priority:280
+#: en/git-commit.txt:348 en/git-rm.txt:29
+#, ignore-ellipsis, no-wrap, priority:280
msgid "<file>..."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:352
+#: en/git-commit.txt:354
#, priority:280
msgid "When files are given on the command line, the command commits the contents of the named files, without recording the changes already staged. The contents of these files are also staged for the next commit on top of what have been staged before."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:369
+#: en/git-commit.txt:371
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:375
+#: en/git-commit.txt:377
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14631,13 +14639,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:383
+#: en/git-commit.txt:385
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:388
+#: en/git-commit.txt:390
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14646,19 +14654,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:393
+#: en/git-commit.txt:395
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:398
+#: en/git-commit.txt:400
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:404
+#: en/git-commit.txt:406
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14668,31 +14676,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:411
+#: en/git-commit.txt:413
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:414 en/git-commit.txt:440
+#: en/git-commit.txt:416 en/git-commit.txt:442
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:418
+#: en/git-commit.txt:420
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:426
+#: en/git-commit.txt:428
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:432
+#: en/git-commit.txt:434
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14702,62 +14710,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:437
+#: en/git-commit.txt:439
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:448
+#: en/git-commit.txt:450
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:460
+#: en/git-commit.txt:462
#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:464
+#: en/git-commit.txt:466
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:469
+#: en/git-commit.txt:471
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:475
+#: en/git-commit.txt:477
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:479
+#: en/git-commit.txt:481
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:485
+#: en/git-commit.txt:487
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:493
+#: en/git-commit.txt:495
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
#. type: Title =
#: en/git-config.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-config(1)"
msgstr "git-config(1)"
@@ -14874,7 +14882,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:74
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--replace-all"
msgstr "--replace-all"
@@ -14886,7 +14894,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:78 en/git-update-index.txt:44
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--add"
msgstr "--add"
@@ -14898,7 +14906,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:83
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--get"
msgstr "--get"
@@ -14910,7 +14918,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:88
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--get-all"
msgstr "--get-all"
@@ -14922,7 +14930,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:91
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--get-regexp"
msgstr "--get-regexp"
@@ -14946,7 +14954,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:106
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--global"
msgstr "--global"
@@ -14970,7 +14978,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:117
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--system"
msgstr "--system"
@@ -15000,7 +15008,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:136 en/git-restore.txt:57
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--worktree"
msgstr "--worktree"
@@ -15042,7 +15050,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:152
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--remove-section"
msgstr "--remove-section"
@@ -15054,7 +15062,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:155
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--rename-section"
msgstr "--rename-section"
@@ -15066,7 +15074,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:158
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--unset"
msgstr "--unset"
@@ -15078,7 +15086,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:161
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--unset-all"
msgstr "--unset-all"
@@ -15150,31 +15158,31 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:193
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--bool"
msgstr "--bool"
#. type: Labeled list
#: en/git-config.txt:194
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--int"
msgstr "--int"
#. type: Labeled list
#: en/git-config.txt:195
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--bool-or-int"
msgstr "--bool-or-int"
#. type: Labeled list
#: en/git-config.txt:196 en/git-hash-object.txt:39
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--path"
msgstr "--path"
#. type: Labeled list
#: en/git-config.txt:197
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--expiry-date"
msgstr "--expiry-date"
@@ -15186,7 +15194,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:201
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-type"
msgstr "--no-type"
@@ -15210,7 +15218,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:219
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--show-origin"
msgstr "--show-origin"
@@ -15258,7 +15266,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:252
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]includes"
msgstr "--[no-]includes"
@@ -15390,7 +15398,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:324
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
@@ -15402,7 +15410,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:329
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG_NOSYSTEM"
msgstr "GIT_CONFIG_NOSYSTEM"
@@ -15418,211 +15426,211 @@ msgstr ""
msgid "Given a .git/config like this:"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:347
+#. type: delimited block -
+#: en/git-config.txt:348
#, no-wrap, priority:100
msgid ""
-"\t#\n"
-"\t# This is the config file, and\n"
-"\t# a '#' or ';' character indicates\n"
-"\t# a comment\n"
-"\t#\n"
+"#\n"
+"# This is the config file, and\n"
+"# a '#' or ';' character indicates\n"
+"# a comment\n"
+"#\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:352
+#. type: delimited block -
+#: en/git-config.txt:353 en/git.txt:310
#, no-wrap, priority:100
msgid ""
-"\t; core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"; core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:357
+#. type: delimited block -
+#: en/git-config.txt:358
#, no-wrap, priority:100
msgid ""
-"\t; Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"; Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:362
+#. type: delimited block -
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
-"\t; Proxy settings\n"
-"\t[core]\n"
-"\t\tgitproxy=proxy-command for kernel.org\n"
-"\t\tgitproxy=default-proxy ; for all the rest\n"
+"; Proxy settings\n"
+"[core]\n"
+"\tgitproxy=proxy-command for kernel.org\n"
+"\tgitproxy=default-proxy ; for all the rest\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:369
+#. type: delimited block -
+#: en/git-config.txt:370
#, no-wrap, priority:100
msgid ""
-"\t; HTTP\n"
-"\t[http]\n"
-"\t\tsslVerify\n"
-"\t[http \"https://weak.example.com\"]\n"
-"\t\tsslVerify = false\n"
-"\t\tcookieFile = /tmp/cookie.txt\n"
+"; HTTP\n"
+"[http]\n"
+"\tsslVerify\n"
+"[http \"https://weak.example.com\"]\n"
+"\tsslVerify = false\n"
+"\tcookieFile = /tmp/cookie.txt\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:371
+#: en/git-config.txt:373
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:374
+#: en/git-config.txt:376
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:379
+#: en/git-config.txt:381
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:382
+#: en/git-config.txt:384
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:385
+#: en/git-config.txt:387
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:389
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:390
+#: en/git-config.txt:392
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:394
+#: en/git-config.txt:396
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:398
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:399
+#: en/git-config.txt:401
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:402 en/git-gui.txt:120 en/git-merge-index.txt:64
+#: en/git-config.txt:404 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:407
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:410
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:413
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:414
+#: en/git-config.txt:416
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:417
+#: en/git-config.txt:419
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:421
+#: en/git-config.txt:423
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:424
+#: en/git-config.txt:426
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:428
-#, priority:100
+#: en/git-config.txt:430
+#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:431
+#: en/git-config.txt:433
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:434
+#: en/git-config.txt:436
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:437
+#: en/git-config.txt:439
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:440
+#: en/git-config.txt:442
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:443
+#: en/git-config.txt:445
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:447
+#: en/git-config.txt:449
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:453
+#: en/git-config.txt:455
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15632,13 +15640,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:457
+#: en/git-config.txt:459
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:466
+#: en/git-config.txt:468
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15651,19 +15659,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:471 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1029 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
+#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:476
+#: en/git-config.txt:478
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:482
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15671,13 +15679,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:483
+#: en/git-config.txt:485
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:488
+#: en/git-config.txt:490
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15687,7 +15695,7 @@ msgstr ""
#. type: Title =
#: en/git-count-objects.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-count-objects(1)"
msgstr "git-count-objects(1)"
@@ -15771,7 +15779,7 @@ msgstr ""
#. type: Labeled list
#: en/git-count-objects.txt:48
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--human-readable"
msgstr "--human-readable"
@@ -15783,7 +15791,7 @@ msgstr "stampa le dimensioni in un formato leggibile"
#. type: Title =
#: en/git-credential-cache--daemon.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-credential-cache--daemon(1)"
msgstr "git-credential-cache--daemon(1)"
@@ -15819,7 +15827,7 @@ msgstr ""
#. type: Title =
#: en/git-credential-cache.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-credential-cache(1)"
msgstr "git-credential-cache(1)"
@@ -15928,7 +15936,7 @@ msgstr ""
#. type: Title =
#: en/git-credential-store.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-credential-store(1)"
msgstr "git-credential-store(1)"
@@ -16067,7 +16075,7 @@ msgstr ""
#. type: Title =
#: en/git-credential.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-credential(1)"
msgstr "git-credential(1)"
@@ -16212,7 +16220,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:120
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`protocol`"
msgstr "`protocol`"
@@ -16224,7 +16232,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:125
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`host`"
msgstr "`host`"
@@ -16236,7 +16244,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:129
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`path`"
msgstr "`path`"
@@ -16248,7 +16256,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:135
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`username`"
msgstr "`username`"
@@ -16260,7 +16268,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:140
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`password`"
msgstr "`password`"
@@ -16272,7 +16280,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:144
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`url`"
msgstr "`url`"
@@ -16284,7 +16292,7 @@ msgstr ""
#. type: Title =
#: en/git-cvsexportcommit.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-cvsexportcommit(1)"
msgstr "git-cvsexportcommit(1)"
@@ -16461,7 +16469,7 @@ msgstr ""
#. type: Title =
#: en/git-cvsimport.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-cvsimport(1)"
msgstr "git-cvsimport(1)"
@@ -16895,7 +16903,7 @@ msgstr ""
#. type: Title =
#: en/git-cvsserver.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-cvsserver(1)"
msgstr "git-cvsserver(1)"
@@ -16939,7 +16947,7 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:26
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
msgstr ""
@@ -16963,7 +16971,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:37 en/git-daemon.txt:49
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--strict-paths"
msgstr "--strict-paths"
@@ -16975,7 +16983,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:40 en/git-daemon.txt:78
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--export-all"
msgstr "--export-all"
@@ -16993,7 +17001,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:45 en/git.txt:42
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--version"
msgstr "--version"
@@ -17005,7 +17013,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:50 en/git.txt:45
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--help"
msgstr "--help"
@@ -17040,7 +17048,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
msgstr ""
#. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:234
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
#, no-wrap, priority:100
msgid "LIMITATIONS"
msgstr ""
@@ -17385,7 +17393,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:293
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "%G"
msgstr "%G"
@@ -17397,7 +17405,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:295
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "%g"
msgstr "%g"
@@ -17409,7 +17417,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:300
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "%m"
msgstr "%m"
@@ -17421,7 +17429,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:302
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "%a"
msgstr "%a"
@@ -17433,7 +17441,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:304
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "%u"
msgstr "%u"
@@ -17625,7 +17633,7 @@ msgstr ""
#. type: Title =
#: en/git-daemon.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-daemon(1)"
msgstr "git-daemon(1)"
@@ -17637,7 +17645,7 @@ msgstr "Un server veramente semplice per repository Git"
#. type: Plain text
#: en/git-daemon.txt:25
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git daemon' [--verbose] [--syslog] [--export-all]\n"
"\t [--timeout=<n>] [--init-timeout=<n>] [--max-connections=<n>]\n"
@@ -17705,7 +17713,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:62
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--base-path-relaxed"
msgstr "--base-path-relaxed"
@@ -17735,7 +17743,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:83
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--inetd"
msgstr "--inetd"
@@ -17807,7 +17815,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:114
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--syslog"
msgstr "--syslog"
@@ -17867,7 +17875,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:138
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--user-path"
msgstr "--user-path"
@@ -17891,7 +17899,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:151
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--reuseaddr"
msgstr "--reuseaddr"
@@ -17987,7 +17995,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:196
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]informative-errors"
msgstr "--[no-]informative-errors"
@@ -18191,7 +18199,7 @@ msgstr ""
#. type: Title =
#: en/git-describe.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "git-describe(1)"
msgstr "git-describe(1)"
@@ -18203,7 +18211,7 @@ msgstr "Attribuisce un nome leggibile a un oggetto basandosi su un riferimento d
#. type: Plain text
#: en/git-describe.txt:14
-#, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]\n"
"'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]\n"
@@ -18230,7 +18238,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:37
-#, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:260
msgid "<commit-ish>..."
msgstr ""
@@ -18272,7 +18280,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:60
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--contains"
msgstr "--contains"
@@ -18302,7 +18310,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:78
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--exact-match"
msgstr "--exact-match"
@@ -18314,7 +18322,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:82 en/git-ls-files.txt:159
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--debug"
msgstr "--debug"
@@ -18326,7 +18334,7 @@ msgstr ""
#. type: Plain text
#: en/git-describe.txt:95
-#, priority:260
+#, ignore-ellipsis, priority:260
msgid "Always output the long format (the tag, the number of commits and the abbreviated commit name) even when it matches a tag. This is useful when you want to see parts of the commit object name in \"describe\" output, even when the commit in question happens to be a tagged version. Instead of just emitting the tag name, it will describe such a commit as v1.2-0-gdeadbee (0th commit since tag v1.2 that points at object deadbee....)."
msgstr ""
@@ -18356,7 +18364,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:118 en/git-diff-tree.txt:115 en/git-name-rev.txt:61
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--always"
msgstr "--always"
@@ -18368,7 +18376,7 @@ msgstr "visualizza l'oggetto commit abbreviato come fallback"
#. type: Labeled list
#: en/git-describe.txt:121 en/rev-list-options.txt:124
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--first-parent"
msgstr "--first-parent"
@@ -18492,7 +18500,7 @@ msgstr ""
#. type: Title =
#: en/git-diff-files.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-diff-files(1)"
msgstr "git-diff-files(1)"
@@ -18504,7 +18512,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff-files.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...]\n"
msgstr ""
@@ -18545,8 +18553,8 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:976
-#, no-wrap, ignore-same, no-wrap, priority:260
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:992
+#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -18564,7 +18572,7 @@ msgstr ""
#. type: Title =
#: en/git-diff-index.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-diff-index(1)"
msgstr "git-diff-index(1)"
@@ -18576,7 +18584,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git diff-index' [-m] [--cached] [<common diff options>] <tree-ish> [<path>...]\n"
msgstr ""
@@ -18715,7 +18723,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:102
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" torvalds@ppc970:~/v2.6/linux> git diff-index --abbrev HEAD\n"
" :100644 100664 7476bb... 000000... kernel/sched.c\n"
@@ -18741,7 +18749,7 @@ msgstr ""
#. type: Title =
#: en/git-difftool.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-difftool(1)"
msgstr "git-difftool(1)"
@@ -18753,7 +18761,7 @@ msgstr ""
#. type: Plain text
#: en/git-difftool.txt:12
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
msgstr "git difftool [<opzioni>] [<commit> [<commit>]] [--] [<percorso>...]"
@@ -18765,7 +18773,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:23
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--dir-diff"
msgstr "--dir-diff"
@@ -18777,13 +18785,13 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:28 en/git-mergetool.txt:70
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "-y"
msgstr "-y"
#. type: Labeled list
#: en/git-difftool.txt:29 en/git-mergetool.txt:71
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--no-prompt"
msgstr "--no-prompt"
@@ -18795,7 +18803,7 @@ msgstr "non chiedere conferma prima di lanciare un tool diff"
#. type: Labeled list
#: en/git-difftool.txt:32 en/git-mergetool.txt:78
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--prompt"
msgstr "--prompt"
@@ -18849,7 +18857,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:69 en/git-mergetool.txt:67
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--tool-help"
msgstr "--tool-help"
@@ -18861,7 +18869,7 @@ msgstr "stampa un elenco di strumenti diff che possono essere usati con `--tool`
#. type: Labeled list
#: en/git-difftool.txt:72
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]symlinks"
msgstr "--[no-]symlinks"
@@ -18897,13 +18905,13 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:88 en/git-help.txt:59 en/git-mergetool.txt:82 en/git-show-branch.txt:111 en/git-update-index.txt:122 en/rev-list-options.txt:264
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "-g"
msgstr "-g"
#. type: Labeled list
#: en/git-difftool.txt:89
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]gui"
msgstr "--[no-]gui"
@@ -18915,7 +18923,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:97
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]trust-exit-code"
msgstr "--[no-]trust-exit-code"
@@ -18951,7 +18959,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:113
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "diff.tool"
msgstr "diff.tool"
@@ -18963,7 +18971,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:116
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "diff.guitool"
msgstr "diff.guitool"
@@ -19005,7 +19013,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:128
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "difftool.prompt"
msgstr "difftool.prompt"
@@ -19017,7 +19025,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:131
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "difftool.trustExitCode"
msgstr "difftool.trustExitCode"
@@ -19053,7 +19061,7 @@ msgstr "Ottiene e imposta le opzioni a livello di repository o globali"
#. type: Title =
#: en/git-diff-tree.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
@@ -19065,7 +19073,7 @@ msgstr "Confronta il contenuto e i mode dei blob trovati tramite due oggetti alb
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root]\n"
@@ -19097,8 +19105,8 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:422
-#, no-wrap, priority:280
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:423
+#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -19170,7 +19178,7 @@ msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:84
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-commit-id"
msgstr "--no-commit-id"
@@ -19193,13 +19201,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:982
-#, no-wrap, ignore-same, no-wrap, priority:260
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:998
+#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:988
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1004
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -19212,7 +19220,7 @@ msgstr ""
#. type: Title =
#: en/git-diff.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "git-diff(1)"
msgstr "git-diff(1)"
@@ -19224,7 +19232,7 @@ msgstr "Visualizza le modifiche fra commit, un commit e l'albero di lavoro, ecc.
#. type: Plain text
#: en/git-diff.txt:17
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git diff' [<options>] [<commit>] [--] [<path>...]\n"
"'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
@@ -19241,7 +19249,7 @@ msgstr ""
#. type: Labeled list
#: en/git-diff.txt:24
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] [--] [<path>...]"
msgstr ""
@@ -19265,7 +19273,7 @@ msgstr ""
#. type: Labeled list
#: en/git-diff.txt:41
-#, fuzzy, no-wrap, priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
msgstr "git difftool [<opzioni>] [<commit> [<commit>]] [--] [<percorso>...]"
@@ -19277,7 +19285,7 @@ msgstr ""
#. type: Labeled list
#: en/git-diff.txt:51
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit> [--] [<path>...]"
msgstr ""
@@ -19289,7 +19297,7 @@ msgstr ""
#. type: Labeled list
#: en/git-diff.txt:59
-#, fuzzy, no-wrap, priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
msgstr "git difftool [<opzioni>] [<commit> [<commit>]] [--] [<percorso>...]"
@@ -19301,7 +19309,7 @@ msgstr ""
#. type: Labeled list
#: en/git-diff.txt:64
-#, fuzzy, no-wrap, priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
msgstr "git difftool [<opzioni>] [<commit> [<commit>]] [--] [<percorso>...]"
@@ -19313,13 +19321,13 @@ msgstr ""
#. type: Labeled list
#: en/git-diff.txt:70
-#, fuzzy, no-wrap, priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
msgstr "git difftool [<opzioni>] [<commit> [<commit>]] [--] [<percorso>...]"
#. type: Plain text
#: en/git-diff.txt:77
-#, priority:280
+#, ignore-ellipsis, priority:280
msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>. \"git diff A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\". You can omit any one of <commit>, which has the same effect as using HEAD instead."
msgstr ""
@@ -19331,7 +19339,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:89
-#, priority:280
+#, ignore-ellipsis, priority:280
msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]. However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
msgstr ""
@@ -19439,7 +19447,7 @@ msgstr ""
#. type: delimited block -
#: en/git-diff.txt:160
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git diff topic master <1>\n"
"$ git diff topic..master <2>\n"
@@ -19531,7 +19539,7 @@ msgstr ""
#. type: Title =
#: en/git-fast-export.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
@@ -19554,9 +19562,9 @@ msgid "This program dumps the given revisions in a form suitable to be piped int
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:22
+#: en/git-fast-export.txt:23
#, priority:100
-msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a kind of an interactive 'git filter-branch'."
+msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
@@ -19643,146 +19651,158 @@ msgstr ""
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
+#. type: Labeled list
+#: en/git-fast-export.txt:79
+#, ignore-same, no-wrap, priority:100
+msgid "--mark-tags"
+msgstr "--mark-tags"
+
+#. type: Plain text
+#: en/git-fast-export.txt:87
+#, priority:100
+msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
+msgstr ""
+
#. type: Plain text
-#: en/git-fast-export.txt:83
+#: en/git-fast-export.txt:92
#, priority:100
-msgid "Any commits that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
+msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:84
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-export.txt:93
+#, ignore-same, no-wrap, priority:100
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
-#: en/git-fast-export.txt:89
+#: en/git-fast-export.txt:98
#, priority:100
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:90
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-export.txt:99
+#, ignore-same, no-wrap, priority:100
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
-#: en/git-fast-export.txt:93
+#: en/git-fast-export.txt:102
#, priority:100
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:94
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-export.txt:103
+#, ignore-same, no-wrap, priority:100
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
-#: en/git-fast-export.txt:101
+#: en/git-fast-export.txt:110
#, priority:100
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-export.txt:111 en/git-ls-tree.txt:72
+#, ignore-same, no-wrap, priority:100
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
-#: en/git-fast-export.txt:107
+#: en/git-fast-export.txt:116
#, priority:100
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:108
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-export.txt:117
+#, ignore-same, no-wrap, priority:100
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
-#: en/git-fast-export.txt:112
+#: en/git-fast-export.txt:121
#, priority:100
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:113
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-export.txt:122
+#, ignore-same, no-wrap, priority:100
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
-#: en/git-fast-export.txt:124
+#: en/git-fast-export.txt:133
#, priority:100
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:125
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-export.txt:134
+#, ignore-same, no-wrap, priority:100
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
-#: en/git-fast-export.txt:131
+#: en/git-fast-export.txt:140
#, priority:100
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:132
+#: en/git-fast-export.txt:141
#, no-wrap, priority:100
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:138
+#: en/git-fast-export.txt:147
#, priority:100
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be reencoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:139
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-export.txt:148
+#, ignore-same, no-wrap, priority:100
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
-#: en/git-fast-export.txt:142
+#: en/git-fast-export.txt:151
#, priority:100
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:143
-#, no-wrap, priority:100
+#: en/git-fast-export.txt:152
+#, ignore-ellipsis, no-wrap, priority:100
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:160
#, priority:100
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:157
+#: en/git-fast-export.txt:166
#, no-wrap, priority:100
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:162
+#: en/git-fast-export.txt:171
#, priority:100
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:167
+#: en/git-fast-export.txt:176
#, no-wrap, priority:100
msgid ""
"$ git fast-export master~5..master |\n"
@@ -19791,56 +19811,56 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:180
#, priority:100
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:175
+#: en/git-fast-export.txt:184
#, priority:100
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
-#: en/git-fast-export.txt:178
+#: en/git-fast-export.txt:187
#, no-wrap, priority:100
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:186
+#: en/git-fast-export.txt:195
#, priority:100
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:198
+#: en/git-fast-export.txt:207
#, priority:100
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:201
+#: en/git-fast-export.txt:210
#, priority:100
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:204
+#: en/git-fast-export.txt:213
#, no-wrap, priority:100
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:209
+#: en/git-fast-export.txt:218
#, priority:100
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:215
-#, no-wrap, priority:100
+#: en/git-fast-export.txt:224
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -19849,32 +19869,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:222
+#: en/git-fast-export.txt:231
#, priority:100
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:225
+#: en/git-fast-export.txt:234
#, no-wrap, priority:100
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:240
#, priority:100
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:239
+#: en/git-fast-export.txt:248
#, priority:100
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
@@ -19922,7 +19942,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--stats"
msgstr "--stats"
@@ -19964,7 +19984,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:69
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--done"
msgstr "--done"
@@ -20006,7 +20026,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:99
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
@@ -20090,7 +20110,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:140
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
@@ -20101,7 +20121,7 @@ msgid "See linkgit:git-config[1]"
msgstr "linkgit:git-config[1]"
#. type: Title -
-#: en/git-fast-import.txt:144 en/git-p4.txt:507
+#: en/git-fast-import.txt:144 en/git-filter-branch.txt:463 en/git-p4.txt:507
#, no-wrap, priority:100
msgid "PERFORMANCE"
msgstr ""
@@ -20216,7 +20236,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:239
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`raw`"
msgstr "`raw`"
@@ -20294,7 +20314,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:292
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`now`"
msgstr "`now`"
@@ -20335,8 +20355,8 @@ msgid "fast-import accepts several commands to update the current repository and
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:319 en/git-fast-import.txt:381
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:319 en/git-fast-import.txt:388
+#, ignore-same, no-wrap, priority:100
msgid "`commit`"
msgstr "`commit`"
@@ -20347,8 +20367,8 @@ msgid "Creates a new branch or updates an existing branch by creating a new comm
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:324 en/git-fast-import.txt:771
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:324 en/git-fast-import.txt:778
+#, ignore-same, no-wrap, priority:100
msgid "`tag`"
msgstr "`tag`"
@@ -20359,8 +20379,8 @@ msgid "Creates an annotated tag object from an existing commit or branch. Light
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:330 en/git-fast-import.txt:815
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:330 en/git-fast-import.txt:823
+#, ignore-same, no-wrap, priority:100
msgid "`reset`"
msgstr "`reset`"
@@ -20371,8 +20391,8 @@ msgid "Reset an existing branch (or a new branch) to a specific revision. This
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:335 en/git-fast-import.txt:844
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:335 en/git-fast-import.txt:852
+#, ignore-same, no-wrap, priority:100
msgid "`blob`"
msgstr "`blob`"
@@ -20383,109 +20403,121 @@ msgid "Convert raw file data into a blob, for future use in a `commit` command.
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:340 en/git-fast-import.txt:917
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:340 en/git-fast-import.txt:925
+#, ignore-same, no-wrap, priority:100
+msgid "`alias`"
+msgstr "`alias`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:346
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
+msgstr ""
+
+#. type: Title ~
+#: en/git-fast-import.txt:347 en/git-fast-import.txt:940
+#, ignore-same, no-wrap, priority:100
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
-#: en/git-fast-import.txt:345
+#: en/git-fast-import.txt:352
#, priority:100
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:346 en/git-fast-import.txt:945
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:353 en/git-fast-import.txt:968
+#, ignore-same, no-wrap, priority:100
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
-#: en/git-fast-import.txt:350
+#: en/git-fast-import.txt:357
#, priority:100
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:351 en/git-fast-import.txt:1152
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:358 en/git-fast-import.txt:1175
+#, ignore-same, no-wrap, priority:100
msgid "`done`"
msgstr "`done`"
#. type: Plain text
-#: en/git-fast-import.txt:355
+#: en/git-fast-import.txt:362
#, priority:100
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:356 en/git-fast-import.txt:970
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:363 en/git-fast-import.txt:993
+#, ignore-same, no-wrap, priority:100
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
-#: en/git-fast-import.txt:360
+#: en/git-fast-import.txt:367
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:361 en/git-fast-import.txt:985
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:368 en/git-fast-import.txt:1008
+#, ignore-same, no-wrap, priority:100
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
-#: en/git-fast-import.txt:365
+#: en/git-fast-import.txt:372
#, priority:100
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:366 en/git-fast-import.txt:1016
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:373 en/git-fast-import.txt:1039
+#, ignore-same, no-wrap, priority:100
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
-#: en/git-fast-import.txt:370
+#: en/git-fast-import.txt:377
#, priority:100
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:371 en/git-fast-import.txt:1069
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:378 en/git-fast-import.txt:1092
+#, ignore-same, no-wrap, priority:100
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
#, priority:100
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:1124
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:1147
+#, ignore-same, no-wrap, priority:100
msgid "`option`"
msgstr "`option`"
#. type: Plain text
-#: en/git-fast-import.txt:379
+#: en/git-fast-import.txt:386
#, priority:100
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:384
+#: en/git-fast-import.txt:391
#, priority:100
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
#, no-wrap, priority:100
msgid ""
"\t'commit' SP <ref> LF\n"
@@ -20496,247 +20528,247 @@ msgid ""
"\t('encoding' SP <encoding>)?\n"
"\tdata\n"
"\t('from' SP <commit-ish> LF)?\n"
-"\t('merge' SP <commit-ish> LF)?\n"
+"\t('merge' SP <commit-ish> LF)*\n"
"\t(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*\n"
"\tLF?\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:405
+#: en/git-fast-import.txt:412
#, priority:100
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:411
+#: en/git-fast-import.txt:418
#, priority:100
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:417
+#: en/git-fast-import.txt:424
#, priority:100
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:425
+#: en/git-fast-import.txt:432
#, priority:100
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:432
+#: en/git-fast-import.txt:439
#, priority:100
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:434
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:441
+#, ignore-same, no-wrap, priority:100
msgid "`author`"
msgstr "`author`"
#. type: Plain text
-#: en/git-fast-import.txt:440
+#: en/git-fast-import.txt:447
#, priority:100
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:442
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:449
+#, ignore-same, no-wrap, priority:100
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
-#: en/git-fast-import.txt:445
+#: en/git-fast-import.txt:452
#, priority:100
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
#, priority:100
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:458
+#: en/git-fast-import.txt:465
#, priority:100
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:460
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:467
+#, ignore-same, no-wrap, priority:100
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
-#: en/git-fast-import.txt:464
+#: en/git-fast-import.txt:471
#, priority:100
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:466
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:473
+#, ignore-same, no-wrap, priority:100
msgid "`from`"
msgstr "`from`"
#. type: Plain text
-#: en/git-fast-import.txt:472
+#: en/git-fast-import.txt:479
#, priority:100
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
#, priority:100
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:485
+#: en/git-fast-import.txt:492
#, priority:100
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
#, priority:100
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:491
+#: en/git-fast-import.txt:498
#, priority:100
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:493
+#: en/git-fast-import.txt:500
#, priority:100
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:499
+#: en/git-fast-import.txt:506
#, priority:100
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:501
+#: en/git-fast-import.txt:508
#, priority:100
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:503
+#: en/git-fast-import.txt:510
#, priority:100
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
#, priority:100
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:509
+#: en/git-fast-import.txt:516
#, priority:100
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:512
+#: en/git-fast-import.txt:519
#, priority:100
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
#, no-wrap, priority:100
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:521
+#: en/git-fast-import.txt:528
#, priority:100
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:523
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:530
+#, ignore-same, no-wrap, priority:100
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
-#: en/git-fast-import.txt:531
+#: en/git-fast-import.txt:538
#, priority:100
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:534
+#: en/git-fast-import.txt:541
#, priority:100
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:536
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:543
+#, ignore-same, no-wrap, priority:100
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:540
+#: en/git-fast-import.txt:547
#, priority:100
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:541 en/git-fast-import.txt:708
+#: en/git-fast-import.txt:548 en/git-fast-import.txt:715
#, no-wrap, priority:100
msgid "External data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:544
+#: en/git-fast-import.txt:551
#, priority:100
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:547
+#: en/git-fast-import.txt:554
#, no-wrap, priority:100
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
#, priority:100
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:555 en/git-fast-import.txt:721
+#: en/git-fast-import.txt:562 en/git-fast-import.txt:728
#, no-wrap, priority:100
msgid "Inline data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:559
+#: en/git-fast-import.txt:566
#, priority:100
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
#, no-wrap, priority:100
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -20744,259 +20776,259 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:566 en/git-fast-import.txt:732
+#: en/git-fast-import.txt:573 en/git-fast-import.txt:739
#, priority:100
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:569
+#: en/git-fast-import.txt:576
#, priority:100
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
#, priority:100
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:574
+#: en/git-fast-import.txt:581
#, priority:100
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:575
+#: en/git-fast-import.txt:582
#, priority:100
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
#, priority:100
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:580
+#: en/git-fast-import.txt:587
#, priority:100
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:583
+#: en/git-fast-import.txt:590
#, priority:100
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:587
+#: en/git-fast-import.txt:594
#, priority:100
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:594
+#: en/git-fast-import.txt:601
#, priority:100
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
#, priority:100
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:598
+#: en/git-fast-import.txt:605
#, priority:100
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:599
+#: en/git-fast-import.txt:606
#, priority:100
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:600
+#: en/git-fast-import.txt:607
#, priority:100
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:602
+#: en/git-fast-import.txt:609
#, priority:100
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:604
+#: en/git-fast-import.txt:611
#, priority:100
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:606
+#: en/git-fast-import.txt:613
#, priority:100
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:608
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:615
+#, ignore-same, no-wrap, priority:100
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
-#: en/git-fast-import.txt:614
+#: en/git-fast-import.txt:621
#, priority:100
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
#, no-wrap, priority:100
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
#, priority:100
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:624
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:631
+#, ignore-same, no-wrap, priority:100
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
#, priority:100
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:632
+#: en/git-fast-import.txt:639
#, no-wrap, priority:100
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:638 en/git-fast-import.txt:658
+#: en/git-fast-import.txt:645 en/git-fast-import.txt:665
#, priority:100
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:643
+#: en/git-fast-import.txt:650
#, priority:100
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:645
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:652
+#, ignore-same, no-wrap, priority:100
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
-#: en/git-fast-import.txt:649
+#: en/git-fast-import.txt:656
#, priority:100
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:652
+#: en/git-fast-import.txt:659
#, no-wrap, priority:100
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:663
+#: en/git-fast-import.txt:670
#, priority:100
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:672
+#: en/git-fast-import.txt:679
#, priority:100
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:674
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:681
+#, ignore-same, no-wrap, priority:100
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
-#: en/git-fast-import.txt:679
+#: en/git-fast-import.txt:686
#, priority:100
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:682
+#: en/git-fast-import.txt:689
#, no-wrap, priority:100
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:688
+#: en/git-fast-import.txt:695
#, priority:100
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:696
+#: en/git-fast-import.txt:703
#, priority:100
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:698
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:705
+#, ignore-same, no-wrap, priority:100
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:707
+#: en/git-fast-import.txt:714
#, priority:100
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:712
+#: en/git-fast-import.txt:719
#, priority:100
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:715
+#: en/git-fast-import.txt:722
#, no-wrap, priority:100
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:720
+#: en/git-fast-import.txt:727
#, priority:100
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:725
+#: en/git-fast-import.txt:732
#, priority:100
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:729
+#: en/git-fast-import.txt:736
#, no-wrap, priority:100
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -21004,76 +21036,77 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:735
+#: en/git-fast-import.txt:742
#, priority:100
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:737
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:744
+#, ignore-same, no-wrap, priority:100
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
-#: en/git-fast-import.txt:743
+#: en/git-fast-import.txt:750
#, priority:100
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:746
+#: en/git-fast-import.txt:753
#, no-wrap, priority:100
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:752
+#: en/git-fast-import.txt:759
#, priority:100
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:756
+#: en/git-fast-import.txt:763
#, priority:100
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:758
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:765
+#, ignore-same, no-wrap, priority:100
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
-#: en/git-fast-import.txt:763
+#: en/git-fast-import.txt:770
#, priority:100
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:766
+#: en/git-fast-import.txt:773
#, no-wrap, priority:100
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:769
+#: en/git-fast-import.txt:776
#, priority:100
msgid "where `<object-identifer>` is any string not containing LF."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:774
+#: en/git-fast-import.txt:781
#, priority:100
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:781
+#: en/git-fast-import.txt:789
#, no-wrap, priority:100
msgid ""
"\t'tag' SP <name> LF\n"
+"\tmark?\n"
"\t'from' SP <commit-ish> LF\n"
"\toriginal-oid?\n"
"\t'tagger' (SP <name>)? SP LT <email> GT SP <when> LF\n"
@@ -21081,55 +21114,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:784
+#: en/git-fast-import.txt:792
#, priority:100
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:789
+#: en/git-fast-import.txt:797
#, priority:100
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:793
+#: en/git-fast-import.txt:801
#, priority:100
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:796
+#: en/git-fast-import.txt:804
#, priority:100
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:799
+#: en/git-fast-import.txt:807
#, priority:100
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:813
#, priority:100
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:813
+#: en/git-fast-import.txt:821
#, priority:100
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:820
+#: en/git-fast-import.txt:828
#, priority:100
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:825
+#: en/git-fast-import.txt:833
#, no-wrap, priority:100
msgid ""
"\t'reset' SP <ref> LF\n"
@@ -21138,25 +21171,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:829
+#: en/git-fast-import.txt:837
#, priority:100
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:831 en/git-fast-import.txt:943
+#: en/git-fast-import.txt:839 en/git-fast-import.txt:966
#, priority:100
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:834
+#: en/git-fast-import.txt:842
#, priority:100
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:838
+#: en/git-fast-import.txt:846
#, no-wrap, priority:100
msgid ""
"\treset refs/tags/938\n"
@@ -21164,19 +21197,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:850
#, priority:100
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:849
+#: en/git-fast-import.txt:857
#, priority:100
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:855
+#: en/git-fast-import.txt:863
#, no-wrap, priority:100
msgid ""
"\t'blob' LF\n"
@@ -21186,43 +21219,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:861
+#: en/git-fast-import.txt:869
#, priority:100
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:863
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-fast-import.txt:871
+#, ignore-same, no-wrap, priority:100
msgid "`data`"
msgstr "`data`"
#. type: Plain text
-#: en/git-fast-import.txt:870
+#: en/git-fast-import.txt:878
#, priority:100
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:875
+#: en/git-fast-import.txt:883
#, priority:100
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:876
+#: en/git-fast-import.txt:884
#, no-wrap, priority:100
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:878
+#: en/git-fast-import.txt:886
#, priority:100
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:882
+#: en/git-fast-import.txt:890
#, no-wrap, priority:100
msgid ""
"\t'data' SP <count> LF\n"
@@ -21230,31 +21263,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:888
+#: en/git-fast-import.txt:896
#, priority:100
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:893
+#: en/git-fast-import.txt:901
#, priority:100
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:894
+#: en/git-fast-import.txt:902
#, no-wrap, priority:100
msgid "Delimited format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:899
+#: en/git-fast-import.txt:907
#, priority:100
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:905
+#: en/git-fast-import.txt:913
#, no-wrap, priority:100
msgid ""
"\t'data' SP '<<' <delim> LF\n"
@@ -21264,25 +21297,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:921
#, priority:100
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:915
+#: en/git-fast-import.txt:923
#, priority:100
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:920
+#: en/git-fast-import.txt:928
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object."
+msgstr ""
+
+#. type: delimited block .
+#: en/git-fast-import.txt:934
+#, no-wrap, priority:100
+msgid ""
+"\t'alias' LF\n"
+"\tmark\n"
+"\t'to' SP <commit-ish> LF\n"
+"\tLF?\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:937
+#, priority:100
+msgid "For a detailed description of `<commit-ish>` see above under `from`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:943
#, priority:100
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:924
+#: en/git-fast-import.txt:947
#, no-wrap, priority:100
msgid ""
"\t'checkpoint' LF\n"
@@ -21290,31 +21345,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:930
+#: en/git-fast-import.txt:953
#, priority:100
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:935
+#: en/git-fast-import.txt:958
#, priority:100
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:941
+#: en/git-fast-import.txt:964
#, priority:100
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:950
+#: en/git-fast-import.txt:973
#, priority:100
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:954
+#: en/git-fast-import.txt:977
#, no-wrap, priority:100
msgid ""
"\t'progress' SP <any> LF\n"
@@ -21322,67 +21377,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:960
+#: en/git-fast-import.txt:983
#, priority:100
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:986
#, no-wrap, priority:100
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:968
+#: en/git-fast-import.txt:991
#, priority:100
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:976
+#: en/git-fast-import.txt:999
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:979
+#: en/git-fast-import.txt:1002
#, no-wrap, priority:100
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:983 en/git-fast-import.txt:1014 en/git-fast-import.txt:1067
+#: en/git-fast-import.txt:1006 en/git-fast-import.txt:1037 en/git-fast-import.txt:1090
#, priority:100
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:991
+#: en/git-fast-import.txt:1014
#, priority:100
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:994
+#: en/git-fast-import.txt:1017
#, no-wrap, priority:100
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1022
#, priority:100
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:1024
#, priority:100
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1005
+#: en/git-fast-import.txt:1028
#, no-wrap, priority:100
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21390,283 +21445,283 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1011
+#: en/git-fast-import.txt:1034
#, priority:100
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1022
+#: en/git-fast-import.txt:1045
#, priority:100
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1025
+#: en/git-fast-import.txt:1048
#, priority:100
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1049
#, no-wrap, priority:100
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1030
+#: en/git-fast-import.txt:1053
#, priority:100
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1033
+#: en/git-fast-import.txt:1056
#, no-wrap, priority:100
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1035
+#: en/git-fast-import.txt:1058
#, no-wrap, priority:100
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1041
+#: en/git-fast-import.txt:1064
#, priority:100
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1044
+#: en/git-fast-import.txt:1067
#, no-wrap, priority:100
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1047
+#: en/git-fast-import.txt:1070
#, priority:100
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1072
#, priority:100
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1075
#, no-wrap, priority:100
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1080
#, priority:100
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1060
+#: en/git-fast-import.txt:1083
#, priority:100
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1086
#, no-wrap, priority:100
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1072
+#: en/git-fast-import.txt:1095
#, priority:100
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1075
+#: en/git-fast-import.txt:1098
#, no-wrap, priority:100
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1078
+#: en/git-fast-import.txt:1101
#, priority:100
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1079 en/git-fast-import.txt:1146
+#: en/git-fast-import.txt:1102 en/git-fast-import.txt:1169
#, no-wrap, priority:100
msgid "date-format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1080 en/git-fast-import.txt:1148
+#: en/git-fast-import.txt:1103 en/git-fast-import.txt:1171
#, no-wrap, priority:100
msgid "export-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1081
+#: en/git-fast-import.txt:1104
#, no-wrap, priority:100
msgid "relative-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1082
+#: en/git-fast-import.txt:1105
#, fuzzy, no-wrap, priority:100
msgid "no-relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
-#: en/git-fast-import.txt:1083 en/git-fast-import.txt:1150
+#: en/git-fast-import.txt:1106 en/git-fast-import.txt:1173
#, no-wrap, priority:100
msgid "force"
msgstr "forza l'operazione"
#. type: Plain text
-#: en/git-fast-import.txt:1087
+#: en/git-fast-import.txt:1110
#, priority:100
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1088 en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1111 en/git-fast-import.txt:1170
#, no-wrap, priority:100
msgid "import-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1089
+#: en/git-fast-import.txt:1112
#, no-wrap, priority:100
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1097
+#: en/git-fast-import.txt:1120
#, priority:100
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1098
+#: en/git-fast-import.txt:1121
#, fuzzy, no-wrap, priority:100
msgid "get-mark"
msgstr "`get-mark`"
#. type: Labeled list
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1122
#, fuzzy, no-wrap, priority:100
msgid "cat-blob"
msgstr "`cat-blob`"
#. type: Labeled list
-#: en/git-fast-import.txt:1100
+#: en/git-fast-import.txt:1123
#, no-wrap, priority:100
msgid "ls"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1108
+#: en/git-fast-import.txt:1131
#, priority:100
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1109
+#: en/git-fast-import.txt:1132
#, no-wrap, priority:100
msgid "notes"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1114
+#: en/git-fast-import.txt:1137
#, priority:100
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1138
#, fuzzy, no-wrap, priority:100
msgid "done"
msgstr "none"
#. type: Plain text
-#: en/git-fast-import.txt:1122
+#: en/git-fast-import.txt:1145
#, priority:100
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1129
+#: en/git-fast-import.txt:1152
#, priority:100
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1132
+#: en/git-fast-import.txt:1155
#, no-wrap, priority:100
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1137
+#: en/git-fast-import.txt:1160
#, priority:100
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1141
+#: en/git-fast-import.txt:1164
#, priority:100
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1144
+#: en/git-fast-import.txt:1167
#, priority:100
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1149
+#: en/git-fast-import.txt:1172
#, priority:100
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1178
#, priority:100
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1159
+#: en/git-fast-import.txt:1182
#, priority:100
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1161
+#: en/git-fast-import.txt:1184
#, no-wrap, priority:100
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1168
+#: en/git-fast-import.txt:1191
#, priority:100
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1175
+#: en/git-fast-import.txt:1198
#, priority:100
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1203
#, no-wrap, priority:100
msgid ""
"\tmkfifo fast-import-output\n"
@@ -21675,49 +21730,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1184
+#: en/git-fast-import.txt:1207
#, priority:100
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1188
+#: en/git-fast-import.txt:1211
#, priority:100
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1213
#, no-wrap, priority:100
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1196
+#: en/git-fast-import.txt:1219
#, priority:100
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1203
+#: en/git-fast-import.txt:1226
#, priority:100
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1211
+#: en/git-fast-import.txt:1234
#, priority:100
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1236
#, priority:100
msgid "An example crash:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1229
+#: en/git-fast-import.txt:1252
#, no-wrap, priority:100
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
@@ -21737,7 +21792,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1256
#, no-wrap, priority:100
msgid ""
"\t$ git fast-import <in\n"
@@ -21746,7 +21801,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1239
+#: en/git-fast-import.txt:1262
#, no-wrap, priority:100
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
@@ -21757,13 +21812,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1241
+#: en/git-fast-import.txt:1264
#, no-wrap, priority:100
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1251
+#: en/git-fast-import.txt:1274
#, no-wrap, priority:100
msgid ""
"\tMost Recent Commands Before Crash\n"
@@ -21778,13 +21833,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1252
+#: en/git-fast-import.txt:1275
#, no-wrap, priority:100
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1255
+#: en/git-fast-import.txt:1278
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
@@ -21792,25 +21847,25 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1256
+#: en/git-fast-import.txt:1279
#, no-wrap, priority:100
msgid "active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1259
+#: en/git-fast-import.txt:1282
#, priority:100
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1260
+#: en/git-fast-import.txt:1283
#, priority:100
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1264
+#: en/git-fast-import.txt:1287
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
@@ -21819,7 +21874,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1270
+#: en/git-fast-import.txt:1293
#, no-wrap, priority:100
msgid ""
"status : active loaded dirty\n"
@@ -21831,314 +21886,314 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1274
+#: en/git-fast-import.txt:1297
#, priority:100
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1277
+#: en/git-fast-import.txt:1300
#, no-wrap, priority:100
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1280
+#: en/git-fast-import.txt:1303
#, priority:100
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1282
+#: en/git-fast-import.txt:1305
#, no-wrap, priority:100
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1290
+#: en/git-fast-import.txt:1313
#, priority:100
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1294
+#: en/git-fast-import.txt:1317
#, priority:100
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1296
+#: en/git-fast-import.txt:1319
#, no-wrap, priority:100
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1301
+#: en/git-fast-import.txt:1324
#, priority:100
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1305
+#: en/git-fast-import.txt:1328
#, priority:100
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1307
+#: en/git-fast-import.txt:1330
#, no-wrap, priority:100
msgid "Handling Renames"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1312
+#: en/git-fast-import.txt:1335
#, priority:100
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1337
#, no-wrap, priority:100
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1341
#, priority:100
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1325
+#: en/git-fast-import.txt:1348
#, priority:100
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1331
+#: en/git-fast-import.txt:1354
#, priority:100
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1337
+#: en/git-fast-import.txt:1360
#, priority:100
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1363
#, priority:100
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1342
+#: en/git-fast-import.txt:1365
#, no-wrap, priority:100
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1346
+#: en/git-fast-import.txt:1369
#, priority:100
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1353
+#: en/git-fast-import.txt:1376
#, priority:100
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1358
+#: en/git-fast-import.txt:1381
#, priority:100
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1360
+#: en/git-fast-import.txt:1383
#, no-wrap, priority:100
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1367
+#: en/git-fast-import.txt:1390
#, priority:100
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1369
+#: en/git-fast-import.txt:1392
#, no-wrap, priority:100
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1399
#, priority:100
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1379
+#: en/git-fast-import.txt:1402
#, no-wrap, priority:100
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1385
+#: en/git-fast-import.txt:1408
#, priority:100
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1393
+#: en/git-fast-import.txt:1416
#, priority:100
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1423
#, priority:100
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1407
+#: en/git-fast-import.txt:1430
#, priority:100
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1415
+#: en/git-fast-import.txt:1438
#, priority:100
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1417
+#: en/git-fast-import.txt:1440
#, no-wrap, priority:100
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1423
+#: en/git-fast-import.txt:1446
#, priority:100
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1448
#, no-wrap, priority:100
msgid "per object"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1432
+#: en/git-fast-import.txt:1455
#, priority:100
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1438
+#: en/git-fast-import.txt:1461
#, priority:100
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1440
+#: en/git-fast-import.txt:1463
#, no-wrap, priority:100
msgid "per mark"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1446
+#: en/git-fast-import.txt:1469
#, priority:100
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1448
+#: en/git-fast-import.txt:1471
#, no-wrap, priority:100
msgid "per branch"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1474
#, priority:100
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1457
+#: en/git-fast-import.txt:1480
#, priority:100
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1464
+#: en/git-fast-import.txt:1487
#, priority:100
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1468
+#: en/git-fast-import.txt:1491
#, priority:100
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1496
#, priority:100
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1498
#, no-wrap, priority:100
msgid "per active tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1480
+#: en/git-fast-import.txt:1503
#, priority:100
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1482
+#: en/git-fast-import.txt:1505
#, no-wrap, priority:100
msgid "per active file entry"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1488
+#: en/git-fast-import.txt:1511
#, priority:100
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1493
+#: en/git-fast-import.txt:1516
#, priority:100
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1495
+#: en/git-fast-import.txt:1518
#, no-wrap, priority:100
msgid "SIGNALS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1501
+#: en/git-fast-import.txt:1524
#, priority:100
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
#. type: Title =
#: en/git-fetch-pack.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-fetch-pack(1)"
msgstr "git-fetch-pack(1)"
@@ -22150,7 +22205,7 @@ msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:16
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git fetch-pack' [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag]\n"
"\t[--upload-pack=<git-upload-pack>]\n"
@@ -22208,7 +22263,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:60 en/git-pack-objects.txt:208 en/git-send-pack.txt:64
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--thin"
msgstr "--thin"
@@ -22220,7 +22275,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:64 en/git-pack-objects.txt:83
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--include-tag"
msgstr "--include-tag"
@@ -22262,7 +22317,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:99
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--deepen-relative"
msgstr "--deepen-relative"
@@ -22280,7 +22335,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:107 en/git-index-pack.txt:77
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--check-self-contained-and-connected"
msgstr "--check-self-contained-and-connected"
@@ -22304,7 +22359,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:86
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<refs>..."
msgstr ""
@@ -22322,7 +22377,7 @@ msgstr ""
#. type: Title =
#: en/git-fetch.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "git-fetch(1)"
msgstr "git-fetch(1)"
@@ -22334,7 +22389,7 @@ msgstr "Scarica oggetti e riferimenti da un altro repository"
#. type: Plain text
#: en/git-fetch.txt:16
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git fetch' [<options>] [<repository> [<refspec>...]]\n"
"'git fetch' [<options>] <group>\n"
@@ -22609,7 +22664,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:215 en/git-push.txt:435
-#, no-wrap, ignore-same, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "`-`"
msgstr "`-`"
@@ -22621,7 +22676,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:216
-#, no-wrap, ignore-same, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "`t`"
msgstr "`t`"
@@ -22675,7 +22730,7 @@ msgstr "--summary"
#. type: Plain text
#: en/git-fetch.txt:226
-#, priority:220
+#, ignore-ellipsis, priority:220
msgid "For a successfully fetched ref, the summary shows the old and new values of the ref in a form suitable for using as an argument to `git log` (this is `<old>..<new>` in most cases, and `<old>...<new>` for forced non-fast-forward updates)."
msgstr ""
@@ -22692,7 +22747,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1041
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -22785,7 +22840,7 @@ msgstr ""
#. type: Title =
#: en/git-filter-branch.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-filter-branch(1)"
msgstr "git-filter-branch(1)"
@@ -22797,7 +22852,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:18
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git filter-branch' [--setup <command>] [--subdirectory-filter <directory>]\n"
"\t[--env-filter <command>] [--tree-filter <command>]\n"
@@ -22808,20 +22863,32 @@ msgid ""
"\t[--state-branch <branch>] [--] [<rev-list options>...]\n"
msgstr ""
+#. type: Title -
+#: en/git-filter-branch.txt:20
+#, no-wrap, priority:100
+msgid "WARNING"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:31
+#, priority:100
+msgid "'git filter-branch' has a plethora of pitfalls that can produce non-obvious manglings of the intended history rewrite (and can leave you with little time to investigate such problems since it has such abysmal performance). These safety and performance issues cannot be backward compatibly fixed and as such, its use is not recommended. Please use an alternative history filtering tool such as https://github.com/newren/git-filter-repo/[git filter-repo]. If you still need to use 'git filter-branch', please carefully read <<SAFETY>> (and <<PERFORMANCE>>) to learn about the land mines of filter-branch, and then vigilantly avoid as many of the hazards listed there as reasonably possible."
+msgstr ""
+
#. type: Plain text
-#: en/git-filter-branch.txt:27
+#: en/git-filter-branch.txt:40
#, priority:100
msgid "Lets you rewrite Git revision history by rewriting the branches mentioned in the <rev-list options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge information) will be preserved."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:34
+#: en/git-filter-branch.txt:47
#, priority:100
msgid "The command will only rewrite the _positive_ refs mentioned in the command line (e.g. if you pass 'a..b', only 'b' will be rewritten). If you specify no filters, the commits will be recommitted without any changes, which would normally have no effect. Nevertheless, this may be useful in the future for compensating for some Git bugs or such, therefore such a usage is permitted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:39
+#: en/git-filter-branch.txt:52
#, no-wrap, priority:100
msgid ""
"*NOTE*: This command honors `.git/info/grafts` file and refs in\n"
@@ -22831,7 +22898,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:48
+#: en/git-filter-branch.txt:61
#, no-wrap, priority:100
msgid ""
"*WARNING*! The rewritten history will have different object names for all\n"
@@ -22845,337 +22912,337 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:52
+#: en/git-filter-branch.txt:65
#, priority:100
msgid "Always verify that the rewritten version is correct: The original refs, if different from the rewritten ones, will be stored in the namespace 'refs/original/'."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:56
+#: en/git-filter-branch.txt:69
#, priority:100
msgid "Note that since this operation is very I/O expensive, it might be a good idea to redirect the temporary directory off-disk with the `-d` option, e.g. on tmpfs. Reportedly the speedup is very noticeable."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:59
+#: en/git-filter-branch.txt:72
#, no-wrap, priority:100
msgid "Filters"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:71
+#: en/git-filter-branch.txt:84
#, priority:100
msgid "The filters are applied in the order as listed below. The <command> argument is always evaluated in the shell context using the 'eval' command (with the notable exception of the commit filter, for technical reasons). Prior to that, the `$GIT_COMMIT` environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, and GIT_COMMITTER_DATE are taken from the current commit and exported to the environment, in order to affect the author and committer identities of the replacement commit created by linkgit:git-commit-tree[1] after the filters have run."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:74
+#: en/git-filter-branch.txt:87
#, priority:100
msgid "If any evaluation of <command> returns a non-zero exit status, the whole operation will be aborted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:80
+#: en/git-filter-branch.txt:93
#, priority:100
msgid "A 'map' function is available that takes an \"original sha1 id\" argument and outputs a \"rewritten sha1 id\" if the commit has been already rewritten, and \"original sha1 id\" otherwise; the 'map' function can return several ids on separate lines if your commit filter emitted multiple commits."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:85
+#: en/git-filter-branch.txt:98
#, no-wrap, priority:100
msgid "--setup <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:91
+#: en/git-filter-branch.txt:104
#, priority:100
msgid "This is not a real filter executed for each commit but a one time setup just before the loop. Therefore no commit-specific variables are defined yet. Functions or variables defined here can be used or modified in the following filter steps except the commit filter, for technical reasons."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:92
+#: en/git-filter-branch.txt:105
#, no-wrap, priority:100
msgid "--subdirectory-filter <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:96
+#: en/git-filter-branch.txt:109
#, priority:100
msgid "Only look at the history which touches the given subdirectory. The result will contain that directory (and only that) as its project root. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:97
+#: en/git-filter-branch.txt:110
#, no-wrap, priority:100
msgid "--env-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:102
+#: en/git-filter-branch.txt:115
#, priority:100
msgid "This filter may be used if you only need to modify the environment in which the commit will be performed. Specifically, you might want to rewrite the author/committer name/email/time environment variables (see linkgit:git-commit-tree[1] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:103
+#: en/git-filter-branch.txt:116
#, no-wrap, priority:100
msgid "--tree-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:110
+#: en/git-filter-branch.txt:123
#, priority:100
msgid "This is the filter for rewriting the tree and its contents. The argument is evaluated in shell with the working directory set to the root of the checked out tree. The new tree is then used as-is (new files are auto-added, disappeared files are auto-removed - neither .gitignore files nor any other ignore rules *HAVE ANY EFFECT*!)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:111
+#: en/git-filter-branch.txt:124
#, no-wrap, priority:100
msgid "--index-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:117
-#, priority:100
+#: en/git-filter-branch.txt:130
+#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the index. It is similar to the tree filter but does not check out the tree, which makes it much faster. Frequently used with `git rm --cached --ignore-unmatch ...`, see EXAMPLES below. For hairy cases, see linkgit:git-update-index[1]."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:118
+#: en/git-filter-branch.txt:131
#, no-wrap, priority:100
msgid "--parent-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:125
-#, priority:100
+#: en/git-filter-branch.txt:138
+#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the commit's parent list. It will receive the parent string on stdin and shall output the new parent string on stdout. The parent string is in the format described in linkgit:git-commit-tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and \"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:126
+#: en/git-filter-branch.txt:139
#, no-wrap, priority:100
msgid "--msg-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:131
+#: en/git-filter-branch.txt:144
#, priority:100
msgid "This is the filter for rewriting the commit messages. The argument is evaluated in the shell with the original commit message on standard input; its standard output is used as the new commit message."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:132
+#: en/git-filter-branch.txt:145
#, no-wrap, priority:100
msgid "--commit-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:138
-#, priority:100
+#: en/git-filter-branch.txt:151
+#, ignore-ellipsis, priority:100
msgid "This is the filter for performing the commit. If this filter is specified, it will be called instead of the 'git commit-tree' command, with arguments of the form \"<TREE_ID> [(-p <PARENT_COMMIT_ID>)...]\" and the log message on stdin. The commit id is expected on stdout."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:142
+#: en/git-filter-branch.txt:155
#, priority:100
msgid "As a special extension, the commit filter may emit multiple commit ids; in that case, the rewritten children of the original commit will have all of them as parents."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:147
+#: en/git-filter-branch.txt:160
#, priority:100
msgid "You can use the 'map' convenience function in this filter, and other convenience functions, too. For example, calling 'skip_commit \"$@\"' will leave out the current commit (but not its changes! If you want that, use 'git rebase' instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:151
+#: en/git-filter-branch.txt:164
#, priority:100
msgid "You can also use the `git_commit_non_empty_tree \"$@\"` instead of `git commit-tree \"$@\"` if you don't wish to keep commits with a single parent and that makes no change to the tree."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:152
+#: en/git-filter-branch.txt:165
#, no-wrap, priority:100
msgid "--tag-name-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:158
+#: en/git-filter-branch.txt:171
#, priority:100
msgid "This is the filter for rewriting tag names. When passed, it will be called for every tag ref that points to a rewritten object (or to a tag object which points to a rewritten object). The original tag name is passed via standard input, and the new tag name is expected on standard output."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:163
+#: en/git-filter-branch.txt:176
#, priority:100
msgid "The original tags are not deleted, but can be overwritten; use \"--tag-name-filter cat\" to simply update the tags. In this case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:174
+#: en/git-filter-branch.txt:187
#, priority:100
msgid "Nearly proper rewriting of tag objects is supported. If the tag has a message attached, a new tag object will be created with the same message, author, and timestamp. If the tag has a signature attached, the signature will be stripped. It is by definition impossible to preserve signatures. The reason this is \"nearly\" proper, is because ideally if the tag did not change (points to the same object, has the same name, etc.) it should retain any signature. That is not the case, signatures will always be removed, buyer beware. There is also no support for changing the author or timestamp (or the tag message for that matter). Tags which point to other tags will be rewritten to point to the underlying commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:175
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-filter-branch.txt:188
+#, ignore-same, no-wrap, priority:100
msgid "--prune-empty"
msgstr "--prune-empty"
#. type: Plain text
-#: en/git-filter-branch.txt:182
+#: en/git-filter-branch.txt:195
#, priority:100
msgid "Some filters will generate empty commits that leave the tree untouched. This option instructs git-filter-branch to remove such commits if they have exactly one or zero non-pruned parents; merge commits will therefore remain intact. This option cannot be used together with `--commit-filter`, though the same effect can be achieved by using the provided `git_commit_non_empty_tree` function in a commit filter."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:183
+#: en/git-filter-branch.txt:196
#, no-wrap, priority:100
msgid "--original <namespace>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:186
+#: en/git-filter-branch.txt:199
#, priority:100
msgid "Use this option to set the namespace where the original commits will be stored. The default value is 'refs/original'."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:187
+#: en/git-filter-branch.txt:200
#, no-wrap, priority:100
msgid "-d <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:194
+#: en/git-filter-branch.txt:207
#, priority:100
msgid "Use this option to set the path to the temporary directory used for rewriting. When applying a tree filter, the command needs to temporarily check out the tree to some directory, which may consume considerable space in case of large projects. By default it does this in the `.git-rewrite/` directory but you can override that choice by this parameter."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:200
+#: en/git-filter-branch.txt:213
#, priority:100
msgid "'git filter-branch' refuses to start with an existing temporary directory or when there are already refs starting with 'refs/original/', unless forced."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:201
+#: en/git-filter-branch.txt:214
#, no-wrap, priority:100
msgid "--state-branch <branch>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:206
+#: en/git-filter-branch.txt:219
#, priority:100
msgid "This option will cause the mapping from old to new objects to be loaded from named branch upon startup and saved as a new commit to that branch upon exit, enabling incremental of large trees. If '<branch>' does not exist it will be created."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:207
-#, no-wrap, priority:100
+#: en/git-filter-branch.txt:220
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<rev-list options>..."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:212
+#: en/git-filter-branch.txt:225
#, priority:100
msgid "Arguments for 'git rev-list'. All positive refs included by these options are rewritten. You may also specify options such as `--all`, but you must use `--` to separate them from the 'git filter-branch' options. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:216
+#: en/git-filter-branch.txt:229
#, no-wrap, priority:100
msgid "Remap to ancestor"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:223
+#: en/git-filter-branch.txt:236
#, priority:100
msgid "By using linkgit:git-rev-list[1] arguments, e.g., path limiters, you can limit the set of revisions which get rewritten. However, positive refs on the command line are distinguished: we don't let them be excluded by such limiters. For this purpose, they are instead rewritten to point at the nearest ancestor that was not excluded."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:231
+#: en/git-filter-branch.txt:244
#, priority:100
msgid "On success, the exit status is `0`. If the filter can't find any commits to rewrite, the exit status is `2`. On any other error, the exit status may be any other non-zero value."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:238
+#: en/git-filter-branch.txt:251
#, priority:100
msgid "Suppose you want to remove a file (containing confidential information or copyright violation) from all commits:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:241
+#: en/git-filter-branch.txt:254
#, no-wrap, priority:100
msgid "git filter-branch --tree-filter 'rm filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:246
+#: en/git-filter-branch.txt:259
#, priority:100
msgid "However, if the file is absent from the tree of some commit, a simple `rm filename` will fail for that tree and commit. Thus you may instead want to use `rm -f filename` as the script."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:252
+#: en/git-filter-branch.txt:265
#, priority:100
msgid "Using `--index-filter` with 'git rm' yields a significantly faster version. Like with using `rm filename`, `git rm --cached filename` will fail if the file is absent from the tree of a commit. If you want to \"completely forget\" a file, it does not matter when it entered history, so we also add `--ignore-unmatch`:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:255
+#: en/git-filter-branch.txt:268
#, no-wrap, priority:100
msgid "git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:258
+#: en/git-filter-branch.txt:271
#, priority:100
msgid "Now, you will get the rewritten history saved in HEAD."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:261
+#: en/git-filter-branch.txt:274
#, priority:100
msgid "To rewrite the repository to look as if `foodir/` had been its project root, and discard all other history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:264
+#: en/git-filter-branch.txt:277
#, no-wrap, priority:100
msgid "git filter-branch --subdirectory-filter foodir -- --all\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:269
+#: en/git-filter-branch.txt:282
#, priority:100
msgid "Thus you can, e.g., turn a library subdirectory into a repository of its own. Note the `--` that separates 'filter-branch' options from revision options, and the `--all` to rewrite all branches and tags."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:273
+#: en/git-filter-branch.txt:286
#, priority:100
msgid "To set a commit (which typically is at the tip of another history) to be the parent of the current initial commit, in order to paste the other history behind the current history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:276
+#: en/git-filter-branch.txt:289
#, no-wrap, priority:100
msgid "git filter-branch --parent-filter 'sed \"s/^\\$/-p <graft-id>/\"' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:282
+#: en/git-filter-branch.txt:295
#, priority:100
msgid "(if the parent string is empty - which happens when we are dealing with the initial commit - add graftcommit as a parent). Note that this assumes history with a single root (that is, no merge without common ancestors happened). If this is not the case, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:286
+#: en/git-filter-branch.txt:299
#, no-wrap, priority:100
msgid ""
"git filter-branch --parent-filter \\\n"
@@ -23183,13 +23250,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:289
+#: en/git-filter-branch.txt:302
#, priority:100
msgid "or even simpler:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:293
+#: en/git-filter-branch.txt:306
#, no-wrap, priority:100
msgid ""
"git replace --graft $commit-id $graft-id\n"
@@ -23197,13 +23264,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:296
+#: en/git-filter-branch.txt:309
#, priority:100
msgid "To remove commits authored by \"Darl McBribe\" from the history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:305
+#: en/git-filter-branch.txt:318
#, no-wrap, priority:100
msgid ""
"git filter-branch --commit-filter '\n"
@@ -23216,13 +23283,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:308
+#: en/git-filter-branch.txt:321
#, priority:100
msgid "The function 'skip_commit' is defined as follows:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:320
+#: en/git-filter-branch.txt:333
#, no-wrap, priority:100
msgid ""
"skip_commit()\n"
@@ -23238,13 +23305,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:327
+#: en/git-filter-branch.txt:340
#, priority:100
msgid "The shift magic first throws away the tree id and then the -p parameters. Note that this handles merges properly! In case Darl committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 as their parents instead of the merge commit."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:332
+#: en/git-filter-branch.txt:345
#, no-wrap, priority:100
msgid ""
"*NOTE* the changes introduced by the commits, and which are not reverted\n"
@@ -23254,13 +23321,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:336
+#: en/git-filter-branch.txt:349
#, priority:100
msgid "You can rewrite the commit log messages using `--msg-filter`. For example, 'git svn-id' strings in a repository created by 'git svn' can be removed this way:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:341
+#: en/git-filter-branch.txt:354
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23269,13 +23336,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:345
+#: en/git-filter-branch.txt:358
#, priority:100
msgid "If you need to add 'Acked-by' lines to, say, the last 10 commits (none of which is a merge), use this command:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:351
+#: en/git-filter-branch.txt:364
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23285,13 +23352,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:357
+#: en/git-filter-branch.txt:370
#, priority:100
msgid "The `--env-filter` option can be used to modify committer and/or author identity. For example, if you found out that your commits have the wrong identity due to a misconfigured user.email, you can make a correction, before publishing the project, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:369
+#: en/git-filter-branch.txt:382
#, no-wrap, priority:100
msgid ""
"git filter-branch --env-filter '\n"
@@ -23307,19 +23374,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:375
+#: en/git-filter-branch.txt:388
#, priority:100
msgid "To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will point to the top-most revision that a 'git rev-list' of this range will print."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:377
+#: en/git-filter-branch.txt:390
#, priority:100
msgid "Consider this history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:382
+#: en/git-filter-branch.txt:395
#, no-wrap, priority:100
msgid ""
" D--E--F--G--H\n"
@@ -23328,39 +23395,39 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:385
+#: en/git-filter-branch.txt:398
#, priority:100
msgid "To rewrite only commits D,E,F,G,H, but leave A, B and C alone, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:388
-#, no-wrap, priority:100
+#: en/git-filter-branch.txt:401
+#, ignore-ellipsis, no-wrap, priority:100
msgid "git filter-branch ... C..H\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:391
+#: en/git-filter-branch.txt:404
#, priority:100
msgid "To rewrite commits E,F,G,H, use one of these:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:395
-#, no-wrap, priority:100
+#: en/git-filter-branch.txt:408
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"git filter-branch ... C..H --not D\n"
"git filter-branch ... D..H --not C\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:398
+#: en/git-filter-branch.txt:411
#, priority:100
msgid "To move the whole tree into a subdirectory, or remove it from there:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:405
+#: en/git-filter-branch.txt:418
#, no-wrap, priority:100
msgid ""
"git filter-branch --index-filter \\\n"
@@ -23371,92 +23438,284 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-filter-branch.txt:410
+#: en/git-filter-branch.txt:423
#, no-wrap, priority:100
msgid "CHECKLIST FOR SHRINKING A REPOSITORY"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:418
+#: en/git-filter-branch.txt:431
#, priority:100
msgid "git-filter-branch can be used to get rid of a subset of files, usually with some combination of `--index-filter` and `--subdirectory-filter`. People expect the resulting repository to be smaller than the original, but you need a few more steps to actually make it smaller, because Git tries hard not to lose your objects until you tell it to. First make sure that:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:422
+#: en/git-filter-branch.txt:435
#, priority:100
msgid "You really removed all variants of a filename, if a blob was moved over its lifetime. `git log --name-only --follow --all -- filename` can help you find renames."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:425
+#: en/git-filter-branch.txt:438
#, priority:100
msgid "You really filtered all refs: use `--tag-name-filter cat -- --all` when calling git-filter-branch."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:428
+#: en/git-filter-branch.txt:441
#, priority:100
msgid "Then there are two ways to get a smaller repository. A safer way is to clone, that keeps your original intact."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:432
+#: en/git-filter-branch.txt:445
#, priority:100
msgid "Clone it with `git clone file:///path/to/repo`. The clone will not have the removed objects. See linkgit:git-clone[1]. (Note that cloning with a plain path just hardlinks everything!)"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:437
+#: en/git-filter-branch.txt:450
#, priority:100
msgid "If you really don't want to clone it, for whatever reasons, check the following points instead (in this order). This is a very destructive approach, so *make a backup* or go back to cloning it. You have been warned."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:441
+#: en/git-filter-branch.txt:454
#, priority:100
msgid "Remove the original refs backed up by git-filter-branch: say `git for-each-ref --format=\"%(refname)\" refs/original/ | xargs -n 1 git update-ref -d`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:443
+#: en/git-filter-branch.txt:456
#, priority:100
msgid "Expire all reflogs with `git reflog expire --expire=now --all`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:447
+#: en/git-filter-branch.txt:460
#, priority:100
msgid "Garbage collect all unreferenced objects with `git gc --prune=now` (or if your git-gc is not new enough to support arguments to `--prune`, use `git repack -ad; git prune` instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:459
+#: en/git-filter-branch.txt:467
#, priority:100
-msgid "git-filter-branch allows you to make complex shell-scripted rewrites of your Git history, but you probably don't need this flexibility if you're simply _removing unwanted data_ like large files or passwords. For those operations you may want to consider http://rtyley.github.io/bfg-repo-cleaner/[The BFG Repo-Cleaner], a JVM-based alternative to git-filter-branch, typically at least 10-50x faster for those use-cases, and with quite different characteristics:"
+msgid "The performance of git-filter-branch is glacially slow; its design makes it impossible for a backward-compatible implementation to ever be fast:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:467
+#: en/git-filter-branch.txt:473
#, priority:100
-msgid "Any particular version of a file is cleaned exactly _once_. The BFG, unlike git-filter-branch, does not give you the opportunity to handle a file differently based on where or when it was committed within your history. This constraint gives the core performance benefit of The BFG, and is well-suited to the task of cleansing bad data - you don't care _where_ the bad data is, you just want it _gone_."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:473
+#: en/git-filter-branch.txt:476
+#, priority:100
+msgid "If you try and cheat and try to make git-filter-branch only work on files modified in a commit, then two things happen"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:482
+#, priority:100
+msgid "you run into problems with deletions whenever the user is simply trying to rename files (because attempting to delete files that don't exist looks like a no-op; it takes some chicanery to remap deletes across file renames when the renames happen via arbitrary user-provided shell)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:488
+#, priority:100
+msgid "even if you succeed at the map-deletes-for-renames chicanery, you still technically violate backward compatibility because users are allowed to filter files in ways that depend upon topology of commits instead of filtering solely based on file contents or names (though this has not been observed in the wild)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:494
+#, priority:100
+msgid "Even if you don't need to edit files but only want to e.g. rename or remove some and thus can avoid checking out each file (i.e. you can use --index-filter), you still are passing shell snippets for your filters. This means that for every commit, you have to have a prepared git repo where those filters can be run. That's a significant setup."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:505
+#, priority:100
+msgid "Further, several additional files are created or updated per commit by git-filter-branch. Some of these are for supporting the convenience functions provided by git-filter-branch (such as map()), while others are for keeping track of internal state (but could have also been accessed by user filters; one of git-filter-branch's regression tests does so). This essentially amounts to using the filesystem as an IPC mechanism between git-filter-branch and the user-provided filters. Disks tend to be a slow IPC mechanism, and writing these files also effectively represents a forced synchronization point between separate processes that we hit with every commit."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:511
+#, priority:100
+msgid "The user-provided shell commands will likely involve a pipeline of commands, resulting in the creation of many processes per commit. Creating and running another process takes a widely varying amount of time between operating systems, but on any platform it is very slow relative to invoking a function."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:517
+#, priority:100
+msgid "git-filter-branch itself is written in shell, which is kind of slow. This is the one performance issue that could be backward-compatibly fixed, but compared to the above problems that are intrinsic to the design of git-filter-branch, the language of the tool itself is a relatively minor issue."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:528
+#, priority:100
+msgid "Side note: Unfortunately, people tend to fixate on the written-in-shell aspect and periodically ask if git-filter-branch could be rewritten in another language to fix the performance issues. Not only does that ignore the bigger intrinsic problems with the design, it'd help less than you'd expect: if git-filter-branch itself were not shell, then the convenience functions (map(), skip_commit(), etc) and the `--setup` argument could no longer be executed once at the beginning of the program but would instead need to be prepended to every user filter (and thus re-executed with every commit)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:539
+#, priority:100
+msgid "The https://github.com/newren/git-filter-repo/[git filter-repo] tool is an alternative to git-filter-branch which does not suffer from these performance problems or the safety problems (mentioned below). For those with existing tooling which relies upon git-filter-branch, 'git repo-filter' also provides https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], a drop-in git-filter-branch replacement (with a few caveats). While filter-lamely suffers from all the same safety issues as git-filter-branch, it at least ameloriates the performance issues a little."
+msgstr ""
+
+#. type: Title -
+#: en/git-filter-branch.txt:542
+#, no-wrap, priority:100
+msgid "SAFETY"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:547
+#, priority:100
+msgid "git-filter-branch is riddled with gotchas resulting in various ways to easily corrupt repos or end up with a mess worse than what you started with:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:560
+#, priority:100
+msgid "Someone can have a set of \"working and tested filters\" which they document or provide to a coworker, who then runs them on a different OS where the same commands are not working/tested (some examples in the git-filter-branch manpage are also affected by this). BSD vs. GNU userland differences can really bite. If lucky, error messages are spewed. But just as likely, the commands either don't do the filtering requested, or silently corrupt by making some unwanted change. The unwanted change may only affect a few commits, so it's not necessarily obvious either. (The fact that problems won't necessarily be obvious means they are likely to go unnoticed until the rewritten history is in use for quite a while, at which point it's really hard to justify another flag-day for another rewrite.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:570
+#, priority:100
+msgid "Filenames with spaces are often mishandled by shell snippets since they cause problems for shell pipelines. Not everyone is familiar with find -print0, xargs -0, git-ls-files -z, etc. Even people who are familiar with these may assume such flags are not relevant because someone else renamed any such files in their repo back before the person doing the filtering joined the project. And often, even those familiar with handling arguments with spaces may not do so just because they aren't in the mindset of thinking about everything that could possibly go wrong."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:580
+#, priority:100
+msgid "Non-ascii filenames can be silently removed despite being in a desired directory. Keeping only wanted paths is often done using pipelines like `git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`. ls-files will only quote filenames if needed, so folks may not notice that one of the files didn't match the regex (at least not until it's much too late). Yes, someone who knows about core.quotePath can avoid this (unless they have other special characters like \\t, \\n, or \"), and people who use ls-files -z with something other than grep can avoid this, but that doesn't mean they will."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:586
+#, priority:100
+msgid "Similarly, when moving files around, one can find that filenames with non-ascii or special characters end up in a different directory, one that includes a double quote character. (This is technically the same issue as above with quoting, but perhaps an interesting different way that it can and has manifested as a problem.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:594
+#, priority:100
+msgid "It's far too easy to accidentally mix up old and new history. It's still possible with any tool, but git-filter-branch almost invites it. If lucky, the only downside is users getting frustrated that they don't know how to shrink their repo and remove the old stuff. If unlucky, they merge old and new history and end up with multiple \"copies\" of each commit, some of which have unwanted or sensitive files and others which don't. This comes about in multiple different ways:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:597
+#, priority:100
+msgid "the default to only doing a partial history rewrite ('--all' is not the default and few examples show it)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:599
+#, priority:100
+msgid "the fact that there's no automatic post-run cleanup"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:602
+#, priority:100
+msgid "the fact that --tag-name-filter (when used to rename tags) doesn't remove the old tags but just adds new ones with the new name"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:611
+#, priority:100
+msgid "the fact that little educational information is provided to inform users of the ramifications of a rewrite and how to avoid mixing old and new history. For example, this man page discusses how users need to understand that they need to rebase their changes for all their branches on top of new history (or delete and reclone), but that's only one of multiple concerns to consider. See the \"DISCUSSION\" section of the git filter-repo manual page for more details."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:614
+#, priority:100
+msgid "Annotated tags can be accidentally converted to lightweight tags, due to either of two issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:619
#, priority:100
-msgid "By default The BFG takes full advantage of multi-core machines, cleansing commit file-trees in parallel. git-filter-branch cleans commits sequentially (i.e. in a single-threaded manner), though it _is_ possible to write filters that include their own parallelism, in the scripts executed against each commit."
+msgid "Someone can do a history rewrite, realize they messed up, restore from the backups in refs/original/, and then redo their git-filter-branch command. (The backup in refs/original/ is not a real backup; it dereferences tags first.)"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:478
+#: en/git-filter-branch.txt:624
#, priority:100
-msgid "The http://rtyley.github.io/bfg-repo-cleaner/#examples[command options] are much more restrictive than git-filter branch, and dedicated just to the tasks of removing unwanted data- e.g: `--strip-blobs-bigger-than 1M`."
+msgid "Running git-filter-branch with either --tags or --all in your <rev-list options>. In order to retain annotated tags as annotated, you must use --tag-name-filter (and must not have restored from refs/original/ in a previously botched rewrite)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:629
+#, priority:100
+msgid "Any commit messages that specify an encoding will become corrupted by the rewrite; git-filter-branch ignores the encoding, takes the original bytes, and feeds it to commit-tree without telling it the proper encoding. (This happens whether or not --msg-filter is used.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:633
+#, priority:100
+msgid "Commit messages (even if they are all UTF-8) by default become corrupted due to not being updated -- any references to other commit hashes in commit messages will now refer to no-longer-extant commits."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:644
+#, priority:100
+msgid "There are no facilities for helping users find what unwanted crud they should delete, which means they are much more likely to have incomplete or partial cleanups that sometimes result in confusion and people wasting time trying to understand. (For example, folks tend to just look for big files to delete instead of big directories or extensions, and once they do so, then sometime later folks using the new repository who are going through history will notice a build artifact directory that has some files but not others, or a cache of dependencies (node_modules or similar) which couldn't have ever been functional since it's missing some files.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:647
+#, priority:100
+msgid "If --prune-empty isn't specified, then the filtering process can create hoards of confusing empty commits"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:651
+#, priority:100
+msgid "If --prune-empty is specified, then intentionally placed empty commits from before the filtering operation are also pruned instead of just pruning commits that became empty due to filtering rules."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:654
+#, ignore-ellipsis, priority:100
+msgid "If --prune empty is specified, sometimes empty commits are missed and left around anyway (a somewhat rare bug, but it happens...)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:658
+#, priority:100
+msgid "A minor issue, but users who have a goal to update all names and emails in a repository may be led to --env-filter which will only update authors and committers, missing taggers."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:664
+#, priority:100
+msgid "If the user provides a --tag-name-filter that maps multiple tags to the same name, no warning or error is provided; git-filter-branch simply overwrites each tag in some undocumented pre-defined order resulting in only one tag at the end. (A git-filter-branch regression test requires this surprising behavior.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:667
+#, priority:100
+msgid "Also, the poor performance of git-filter-branch often leads to safety issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:683
+#, priority:100
+msgid "Coming up with the correct shell snippet to do the filtering you want is sometimes difficult unless you're just doing a trivial modification such as deleting a couple files. Unfortunately, people often learn if the snippet is right or wrong by trying it out, but the rightness or wrongness can vary depending on special circumstances (spaces in filenames, non-ascii filenames, funny author names or emails, invalid timezones, presence of grafts or replace objects, etc.), meaning they may have to wait a long time, hit an error, then restart. The performance of git-filter-branch is so bad that this cycle is painful, reducing the time available to carefully re-check (to say nothing about what it does to the patience of the person doing the rewrite even if they do technically have more time available). This problem is extra compounded because errors from broken filters may not be shown for a long time and/or get lost in a sea of output. Even worse, broken filters often just result in silent incorrect rewrites."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:691
+#, priority:100
+msgid "To top it all off, even when users finally find working commands, they naturally want to share them. But they may be unaware that their repo didn't have some special cases that someone else's does. So, when someone else with a different repository runs the same commands, they get hit by the problems above. Or, the user just runs commands that really were vetted for special cases, but they run it on a different OS where it doesn't work, as noted above."
msgstr ""
#. type: Title =
#: en/git-fmt-merge-msg.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-fmt-merge-msg(1)"
msgstr "git-fmt-merge-msg(1)"
@@ -23487,7 +23746,7 @@ msgid "This command is intended mostly for internal use by scripts automatically
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:64
+#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:68
#, no-wrap, priority:240
msgid "--log[=<n>]"
msgstr ""
@@ -23499,8 +23758,8 @@ msgid "In addition to branch names, populate the log message with one-line descr
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:65
-#, no-wrap, ignore-same, no-wrap, priority:240
+#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:69
+#, ignore-same, no-wrap, priority:240
msgid "--no-log"
msgstr "--no-log"
@@ -23512,7 +23771,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:38
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]summary"
msgstr "--[no-]summary"
@@ -23548,7 +23807,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:56
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "merge.summary"
msgstr "merge.summary"
@@ -23574,7 +23833,7 @@ msgstr ""
#. type: Title =
#: en/git-for-each-ref.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-for-each-ref(1)"
msgstr "git-for-each-ref(1)"
@@ -23586,7 +23845,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:16
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git for-each-ref' [--count=<count>] [--shell|--perl|--python|--tcl]\n"
"\t\t [(--sort=<key>)...] [--format=<format>] [<pattern>...]\n"
@@ -23603,7 +23862,7 @@ msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:29 en/git-show-ref.txt:88
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<pattern>..."
msgstr ""
@@ -23651,25 +23910,25 @@ msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:65
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--shell"
msgstr "--shell"
#. type: Labeled list
#: en/git-for-each-ref.txt:66
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--perl"
msgstr "--perl"
#. type: Labeled list
#: en/git-for-each-ref.txt:67
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--python"
msgstr "--python"
#. type: Labeled list
#: en/git-for-each-ref.txt:68
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--tcl"
msgstr "--tcl"
@@ -23891,7 +24150,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:197
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Left-, middle-, or right-align the content between %(align:...) and %(end). The \"align:\" is followed by `width=<width>` and `position=<position>` in any order separated by a comma, where the `<position>` is either left, right or middle, default being left and `<width>` is the total length of the content with alignment. For brevity, the \"width=\" and/or \"position=\" prefixes may be omitted, and bare <width> and <position> used instead. For instance, `%(align:<width>,<position>)`. If the contents length is more than the width then no alignment is performed. If used with `--quote` everything in between %(align:...) and %(end) is quoted, but if nested then only the topmost level performs quoting."
msgstr ""
@@ -23903,7 +24162,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:210
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Used as %(if)...%(then)...%(end) or %(if)...%(then)...%(else)...%(end). If there is an atom with value or string literal after the %(if) then everything after the %(then) is printed, else if the %(else) atom is used, then everything after %(else) is printed. We ignore space when evaluating the string before %(then), this is useful when we use the %(HEAD) atom which prints either \"*\" or \" \" and we want to apply the 'if' condition only on the 'HEAD' ref. Append \":equals=<string>\" or \":notequals=<string>\" to compare the value between the %(if:...) and %(then) atoms with the given string."
msgstr ""
@@ -24123,7 +24382,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:361
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "An example to show the usage of %(if)...%(then)...%(else)...%(end). This prefixes the current branch with a star."
msgstr ""
@@ -24135,7 +24394,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:369
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "An example to show the usage of %(if)...%(then)...%(end). This prints the authorname, if present."
msgstr ""
@@ -24147,7 +24406,7 @@ msgstr ""
#. type: Title =
#: en/git-format-patch.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-format-patch(1)"
msgstr "git-format-patch(1)"
@@ -24169,9 +24428,9 @@ msgid ""
"\t\t [--signature-file=<file>]\n"
"\t\t [-n | --numbered | -N | --no-numbered]\n"
"\t\t [--start-number <n>] [--numbered-files]\n"
-"\t\t [--in-reply-to=Message-Id] [--suffix=.<sfx>]\n"
+"\t\t [--in-reply-to=<message id>] [--suffix=.<sfx>]\n"
"\t\t [--ignore-if-in-upstream]\n"
-"\t\t [--rfc] [--subject-prefix=Subject-Prefix]\n"
+"\t\t [--rfc] [--subject-prefix=<subject prefix>]\n"
"\t\t [(--reroll-count|-v) <n>]\n"
"\t\t [--to=<email>] [--cc=<email>]\n"
"\t\t [--[no-]cover-letter] [--quiet]\n"
@@ -24220,523 +24479,524 @@ msgid "By default, each output file is numbered sequentially from 1, and uses th
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:70
+#: en/git-format-patch.txt:71
#, priority:100
-msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`."
+msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`. All directory components will be created."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:74
+#: en/git-format-patch.txt:75
#, priority:100
msgid "By default, the subject of a single patch is \"[PATCH] \" followed by the concatenation of lines from the commit message up to the first blank line (see the DISCUSSION section of linkgit:git-commit[1])."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:78
+#: en/git-format-patch.txt:79
#, priority:100
msgid "When multiple patches are output, the subject prefix will instead be \"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. To omit patch numbers from the subject, use `-N`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:83
+#: en/git-format-patch.txt:84
#, priority:100
msgid "If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a `Message-Id` header to reference."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:89
+#: en/git-format-patch.txt:90
#, fuzzy, no-wrap, priority:100
msgid "-<n>"
msgstr "<n>"
#. type: Plain text
-#: en/git-format-patch.txt:91
+#: en/git-format-patch.txt:92
#, priority:100
msgid "Prepare patches from the topmost <n> commits."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:92
+#: en/git-format-patch.txt:93
#, no-wrap, priority:100
msgid "-o <dir>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:93
+#: en/git-format-patch.txt:94
#, no-wrap, priority:100
msgid "--output-directory <dir>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:96
+#: en/git-format-patch.txt:97
#, priority:100
msgid "Use <dir> to store the resulting files, instead of the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:98 en/git-shortlog.txt:30
-#, no-wrap, ignore-same, no-wrap, priority:260
+#: en/git-format-patch.txt:99 en/git-shortlog.txt:30
+#, ignore-same, no-wrap, priority:260
msgid "--numbered"
msgstr "--numbered"
#. type: Plain text
-#: en/git-format-patch.txt:100
+#: en/git-format-patch.txt:101
#, priority:100
msgid "Name output in '[PATCH n/m]' format, even with a single patch."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:102
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-format-patch.txt:103
+#, ignore-same, no-wrap, priority:100
msgid "--no-numbered"
msgstr "--no-numbered"
#. type: Plain text
-#: en/git-format-patch.txt:104
+#: en/git-format-patch.txt:105
#, priority:100
msgid "Name output in '[PATCH]' format."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:105
+#: en/git-format-patch.txt:106
#, no-wrap, priority:100
msgid "--start-number <n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:107
+#: en/git-format-patch.txt:108
#, fuzzy, priority:100
msgid "Start numbering the patches at <n> instead of 1."
msgstr "inizia a numerare le patch da <n> anzich챕 da 1"
#. type: Labeled list
-#: en/git-format-patch.txt:108
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-format-patch.txt:109
+#, ignore-same, no-wrap, priority:100
msgid "--numbered-files"
msgstr "--numbered-files"
#. type: Plain text
-#: en/git-format-patch.txt:111
+#: en/git-format-patch.txt:112
#, priority:100
msgid "Output file names will be a simple number sequence without the default first line of the commit appended."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:113
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-format-patch.txt:114
+#, ignore-same, no-wrap, priority:100
msgid "--keep-subject"
msgstr "--keep-subject"
#. type: Plain text
-#: en/git-format-patch.txt:116
+#: en/git-format-patch.txt:117
#, priority:100
msgid "Do not strip/add '[PATCH]' from the first line of the commit log message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:122
+#: en/git-format-patch.txt:123
#, priority:100
msgid "Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:123 en/git-pack-objects.txt:59
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-format-patch.txt:124 en/git-pack-objects.txt:59
+#, ignore-same, no-wrap, priority:100
msgid "--stdout"
msgstr "--stdout"
#. type: Plain text
-#: en/git-format-patch.txt:126
+#: en/git-format-patch.txt:127
#, priority:100
msgid "Print all commits to the standard output in mbox format, instead of creating a file for each one."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:127
+#: en/git-format-patch.txt:128
#, no-wrap, priority:100
msgid "--attach[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:131
+#: en/git-format-patch.txt:132
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: attachment`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:132
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-format-patch.txt:133
+#, ignore-same, no-wrap, priority:100
msgid "--no-attach"
msgstr "--no-attach"
#. type: Plain text
-#: en/git-format-patch.txt:135
+#: en/git-format-patch.txt:136
#, priority:100
msgid "Disable the creation of an attachment, overriding the configuration setting."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:136
+#: en/git-format-patch.txt:137
#, no-wrap, priority:100
msgid "--inline[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:140
+#: en/git-format-patch.txt:141
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: inline`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:141
+#: en/git-format-patch.txt:142
#, no-wrap, priority:100
msgid "--thread[=<style>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:142
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-format-patch.txt:143
+#, ignore-same, no-wrap, priority:100
msgid "--no-thread"
msgstr "--no-thread"
#. type: Plain text
-#: en/git-format-patch.txt:147
+#: en/git-format-patch.txt:148
#, priority:100
msgid "Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the first. Also controls generation of the `Message-Id` header to reference."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:153
+#: en/git-format-patch.txt:154
#, priority:100
msgid "The optional <style> argument can be either `shallow` or `deep`. 'shallow' threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order. 'deep' threading makes every mail a reply to the previous one."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:157
+#: en/git-format-patch.txt:158
#, priority:100
msgid "The default is `--no-thread`, unless the `format.thread` configuration is set. If `--thread` is specified without a style, it defaults to the style specified by `format.thread` if any, or else `shallow`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:161
+#: en/git-format-patch.txt:162
#, priority:100
msgid "Beware that the default for 'git send-email' is to thread emails itself. If you want `git format-patch` to take care of threading, you will want to ensure that threading is disabled for `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:162
-#, no-wrap, priority:100
-msgid "--in-reply-to=Message-Id"
-msgstr ""
+#: en/git-format-patch.txt:163
+#, fuzzy, no-wrap, priority:100
+#| msgid "--no-message-id"
+msgid "--in-reply-to=<message id>"
+msgstr "--no-message-id"
#. type: Plain text
-#: en/git-format-patch.txt:166
+#: en/git-format-patch.txt:167
#, priority:100
-msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given Message-Id, which avoids breaking threads to provide a new patch series."
+msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given <message id>, which avoids breaking threads to provide a new patch series."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:167
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-format-patch.txt:168
+#, ignore-same, no-wrap, priority:100
msgid "--ignore-if-in-upstream"
msgstr "--ignore-if-in-upstream"
#. type: Plain text
-#: en/git-format-patch.txt:173
+#: en/git-format-patch.txt:174
#, priority:100
msgid "Do not include a patch that matches a commit in <until>..<since>. This will examine all patches reachable from <since> but not from <until> and compare them with the patches being generated, and any patch that matches is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:174
+#: en/git-format-patch.txt:175
#, no-wrap, priority:100
-msgid "--subject-prefix=<Subject-Prefix>"
+msgid "--subject-prefix=<subject prefix>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:179
+#: en/git-format-patch.txt:180
#, priority:100
-msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<Subject-Prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
+msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<subject prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:180
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-format-patch.txt:181
+#, ignore-same, no-wrap, priority:100
msgid "--rfc"
msgstr "--rfc"
#. type: Plain text
-#: en/git-format-patch.txt:184
+#: en/git-format-patch.txt:185
#, priority:100
msgid "Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For Comments\"; use this when sending an experimental patch for discussion rather than application."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:185
+#: en/git-format-patch.txt:186
#, no-wrap, priority:100
msgid "-v <n>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:186
+#: en/git-format-patch.txt:187
#, no-wrap, priority:100
msgid "--reroll-count=<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:193
+#: en/git-format-patch.txt:194
#, priority:100
msgid "Mark the series as the <n>-th iteration of the topic. The output filenames have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default, but configurable via the `--subject-prefix` option) has ` v<n>` appended to it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:194
+#: en/git-format-patch.txt:195
#, no-wrap, priority:100
msgid "--to=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:199
+#: en/git-format-patch.txt:200
#, priority:100
msgid "Add a `To:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-to` discards all `To:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:200
+#: en/git-format-patch.txt:201
#, no-wrap, priority:100
msgid "--cc=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:205
+#: en/git-format-patch.txt:206
#, priority:100
msgid "Add a `Cc:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-cc` discards all `Cc:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:206
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-format-patch.txt:207
+#, ignore-same, no-wrap, priority:100
msgid "--from"
msgstr "--from"
#. type: Labeled list
-#: en/git-format-patch.txt:207
+#: en/git-format-patch.txt:208
#, no-wrap, priority:100
msgid "--from=<ident>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:213
+#: en/git-format-patch.txt:214
#, priority:100
msgid "Use `ident` in the `From:` header of each commit email. If the author ident of the commit is not textually identical to the provided `ident`, place a `From:` header in the body of the message with the original author. If no `ident` is given, use the committer ident."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:220
+#: en/git-format-patch.txt:221
#, priority:100
msgid "Note that this option is only useful if you are actually sending the emails and want to identify yourself as the sender, but retain the original author (and `git am` will correctly pick up the in-body header). Note also that `git send-email` already handles this transformation for you, and this option should not be used if you are feeding the result to `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:221
+#: en/git-format-patch.txt:222
#, no-wrap, priority:100
msgid "--add-header=<header>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:228
+#: en/git-format-patch.txt:229
#, priority:100
msgid "Add an arbitrary header to the email headers. This is in addition to any configured headers, and may be used multiple times. For example, `--add-header=\"Organization: git-foo\"`. The negated form `--no-add-header` discards *all* (`To:`, `Cc:`, and custom) headers added so far from config or command line."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:229
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-format-patch.txt:230
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]cover-letter"
msgstr "--[no-]cover-letter"
#. type: Plain text
-#: en/git-format-patch.txt:233
+#: en/git-format-patch.txt:234
#, priority:100
msgid "In addition to the patches, generate a cover letter file containing the branch description, shortlog and the overall diffstat. You can fill in a description in the file before sending it out."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:234
+#: en/git-format-patch.txt:235
#, no-wrap, priority:100
msgid "--interdiff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:242
+#: en/git-format-patch.txt:243
#, priority:100
msgid "As a reviewer aid, insert an interdiff into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` is a single revision naming the tip of the previous series which shares a common base with the series being formatted (for example `git format-patch --cover-letter --interdiff=feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:243
+#: en/git-format-patch.txt:244
#, no-wrap, priority:100
msgid "--range-diff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:254
+#: en/git-format-patch.txt:255
#, priority:100
msgid "As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1]) into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` can be a single revision naming the tip of the previous series if it shares a common base with the series being formatted (for example `git format-patch --cover-letter --range-diff=feature/v1 -3 feature/v2`), or a revision range if the two versions of the series are disjoint (for example `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:259
+#: en/git-format-patch.txt:260
#, priority:100
msgid "Note that diff options passed to the command affect how the primary product of `format-patch` is generated, and they are not passed to the underlying `range-diff` machinery used to generate the cover-letter material (this may change in the future)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:260
+#: en/git-format-patch.txt:261
#, no-wrap, priority:100
msgid "--creation-factor=<percent>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:265
+#: en/git-format-patch.txt:266
#, priority:100
msgid "Used with `--range-diff`, tweak the heuristic which matches up commits between the previous and current series of patches by adjusting the creation/deletion cost fudge factor. See linkgit:git-range-diff[1]) for details."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:266
+#: en/git-format-patch.txt:267
#, no-wrap, priority:100
msgid "--notes[=<ref>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:267 en/pretty-options.txt:81
-#, no-wrap, ignore-same, no-wrap, priority:260
+#: en/git-format-patch.txt:268 en/pretty-options.txt:81
+#, ignore-same, no-wrap, priority:260
msgid "--no-notes"
msgstr "--no-notes"
#. type: Plain text
-#: en/git-format-patch.txt:270
+#: en/git-format-patch.txt:271
#, priority:100
msgid "Append the notes (see linkgit:git-notes[1]) for the commit after the three-dash line."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:278
+#: en/git-format-patch.txt:279
#, priority:100
msgid "The expected use case of this is to write supporting explanation for the commit that does not belong to the commit log message proper, and include it with the patch submission. While one can simply write these explanations after `format-patch` has run but before sending, keeping them as Git notes allows them to be maintained between versions of the patch series (but see the discussion of the `notes.rewrite` configuration options in linkgit:git-notes[1] to use this workflow)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:281
+#: en/git-format-patch.txt:282
#, priority:100
msgid "The default is `--no-notes`, unless the `format.notes` configuration is set."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:282
+#: en/git-format-patch.txt:283
#, no-wrap, priority:100
msgid "--[no-]signature=<signature>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:287
+#: en/git-format-patch.txt:288
#, priority:100
msgid "Add a signature to each message produced. Per RFC 3676 the signature is separated from the body by a line with '-- ' on it. If the signature option is omitted the signature defaults to the Git version number."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:288
+#: en/git-format-patch.txt:289
#, no-wrap, priority:100
msgid "--signature-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:290
+#: en/git-format-patch.txt:291
#, priority:100
msgid "Works just like --signature except the signature is read from a file."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:291
+#: en/git-format-patch.txt:292
#, no-wrap, priority:100
msgid "--suffix=.<sfx>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:296
+#: en/git-format-patch.txt:297
#, priority:100
msgid "Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is `--suffix=.txt`. Leaving this empty will remove the `.patch` suffix."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:299
+#: en/git-format-patch.txt:300
#, priority:100
msgid "Note that the leading character does not have to be a dot; for example, you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:303
+#: en/git-format-patch.txt:304
#, priority:100
msgid "Do not print the names of the generated files to standard output."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:304
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-format-patch.txt:305
+#, ignore-same, no-wrap, priority:100
msgid "--no-binary"
msgstr "--no-binary"
#. type: Plain text
-#: en/git-format-patch.txt:309
+#: en/git-format-patch.txt:310
#, priority:100
msgid "Do not output contents of changes in binary files, instead display a notice that those files changed. Patches generated using this option cannot be applied properly, but they are still useful for code review."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:310
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-format-patch.txt:311
+#, ignore-same, no-wrap, priority:100
msgid "--zero-commit"
msgstr "--zero-commit"
#. type: Plain text
-#: en/git-format-patch.txt:313
+#: en/git-format-patch.txt:314
#, priority:100
msgid "Output an all-zero hash in each patch's From header instead of the hash of the commit."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:314
+#: en/git-format-patch.txt:315
#, no-wrap, priority:100
msgid "--base=<commit>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:318
+#: en/git-format-patch.txt:320
#, priority:100
-msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details."
+msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details. If <commit> is \"auto\", a base commit is automatically chosen."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:325
+#: en/git-format-patch.txt:327
#, priority:100
msgid "Treat the revision argument as a <revision range>, even if it is just a single commit (that would normally be treated as a <since>). Note that root commits included in the specified range are always formatted as creation patches, independently of this flag."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:328
+#: en/git-format-patch.txt:330
#, priority:100
msgid "Show progress reports on stderr as patches are generated."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:335
+#: en/git-format-patch.txt:338
#, priority:100
-msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To\" or \"Cc:\" headers, configure attachments, and sign off patches with configuration variables."
+msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To:\" or \"Cc:\" headers, configure attachments, change the patch output directory, and sign off patches with configuration variables."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:347
+#: en/git-format-patch.txt:351
#, no-wrap, priority:100
msgid ""
"[format]\n"
@@ -24748,17 +25008,18 @@ msgid ""
"\tcc = <email>\n"
"\tattach [ = mime-boundary-string ]\n"
"\tsignOff = true\n"
-"\tcoverletter = auto\n"
+"\toutputDirectory = <directory>\n"
+"\tcoverLetter = auto\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:356
+#: en/git-format-patch.txt:360
#, priority:100
msgid "The patch produced by 'git format-patch' is in UNIX mailbox format, with a fixed \"magic\" time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:366
+#: en/git-format-patch.txt:370
#, no-wrap, priority:100
msgid ""
"From 8f72bad1baf19a53459661343e21d6491c3908d3 Mon Sep 17 00:00:00 2001\n"
@@ -24772,7 +25033,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:369
+#: en/git-format-patch.txt:373
#, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -24780,41 +25041,41 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:372
-#, no-wrap, priority:100
+#: en/git-format-patch.txt:376
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"Do the same for ia64 so we can have sleek & trim looking\n"
"...\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:380
-#, priority:100
+#: en/git-format-patch.txt:384
+#, ignore-ellipsis, priority:100
msgid "Typically it will be placed in a MUA's drafts folder, edited to add timely commentary that should not go in the changelog after the three dashes, and then sent as a message whose body, in our example, starts with \"arch/arm config files were...\". On the receiving end, readers can save interesting patches in a UNIX mailbox and apply them with linkgit:git-am[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:386
+#: en/git-format-patch.txt:390
#, priority:100
msgid "When a patch is part of an ongoing discussion, the patch generated by 'git format-patch' can be tweaked to take advantage of the 'git am --scissors' feature. After your response to the discussion comes a line that consists solely of \"`-- >8 --`\" (scissors and perforation), followed by the patch with unnecessary header fields removed:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:390
-#, no-wrap, priority:100
+#: en/git-format-patch.txt:394
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"...\n"
"> So we should do such-and-such.\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:392
+#: en/git-format-patch.txt:396
#, no-wrap, priority:100
msgid "Makes sense to me. How about this patch?\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:395
+#: en/git-format-patch.txt:399
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
@@ -24822,69 +25083,69 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:398
-#, no-wrap, priority:100
+#: en/git-format-patch.txt:402
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
"...\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:406
+#: en/git-format-patch.txt:410
#, priority:100
msgid "When sending a patch this way, most often you are sending your own patch, so in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit `From:` and `Date:` lines from the patch file. The patch title is likely to be different from the subject of the discussion the patch is in response to, so it is likely that you would want to keep the Subject: line, like the example above."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:408
+#: en/git-format-patch.txt:412
#, no-wrap, priority:100
msgid "Checking for patch corruption"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:411
+#: en/git-format-patch.txt:415
#, priority:100
msgid "Many mailers if not set up properly will corrupt whitespace. Here are two common types of corruption:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:413
+#: en/git-format-patch.txt:417
#, priority:100
msgid "Empty context lines that do not have _any_ whitespace."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:416
+#: en/git-format-patch.txt:420
#, priority:100
msgid "Non-empty context lines that have one extra whitespace at the beginning."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:418
+#: en/git-format-patch.txt:422
#, priority:100
msgid "One way to test if your MUA is set up correctly is:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:422
+#: en/git-format-patch.txt:426
#, priority:100
msgid "Send the patch to yourself, exactly the way you would, except with To: and Cc: lines that do not contain the list and maintainer address."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:425
+#: en/git-format-patch.txt:429
#, priority:100
msgid "Save that patch to a file in UNIX mailbox format. Call it a.patch, say."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:427
+#: en/git-format-patch.txt:431
#, priority:100
msgid "Apply it:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:432
+#: en/git-format-patch.txt:436
#, no-wrap, priority:100
msgid ""
"$ git fetch <project> master:test-apply\n"
@@ -24894,175 +25155,175 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:434
+#: en/git-format-patch.txt:438
#, priority:100
msgid "If it does not apply correctly, there can be various reasons."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:439
+#: en/git-format-patch.txt:443
#, priority:100
msgid "The patch itself does not apply cleanly. That is _bad_ but does not have much to do with your MUA. You might want to rebase the patch with linkgit:git-rebase[1] before regenerating it in this case."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:444
+#: en/git-format-patch.txt:448
#, priority:100
msgid "The MUA corrupted your patch; \"am\" would complain that the patch does not apply. Look in the .git/rebase-apply/ subdirectory and see what 'patch' file contains and check for the common corruption patterns mentioned above."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:452
+#: en/git-format-patch.txt:456
#, priority:100
msgid "While at it, check the 'info' and 'final-commit' files as well. If what is in 'final-commit' is not exactly what you would want to see in the commit log message, it is very likely that the receiver would end up hand editing the log message when applying your patch. Things like \"Hi, this is my first patch.\\n\" in the patch e-mail should come after the three-dash line that signals the end of the commit message."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:454
+#: en/git-format-patch.txt:458
#, no-wrap, priority:100
msgid "MUA-SPECIFIC HINTS"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:457
+#: en/git-format-patch.txt:461
#, priority:100
msgid "Here are some hints on how to successfully submit patches inline using various mailers."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:459
+#: en/git-format-patch.txt:463
#, no-wrap, priority:100
msgid "GMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:465
+#: en/git-format-patch.txt:469
#, priority:100
msgid "GMail does not have any way to turn off line wrapping in the web interface, so it will mangle any emails that you send. You can however use \"git send-email\" and send your patches through the GMail SMTP server, or use any IMAP email client to connect to the google IMAP server and forward the emails through that."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:468
+#: en/git-format-patch.txt:472
#, priority:100
msgid "For hints on using 'git send-email' to send your patches through the GMail SMTP server, see the EXAMPLE section of linkgit:git-send-email[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:471
+#: en/git-format-patch.txt:475
#, priority:100
msgid "For hints on submission using the IMAP interface, see the EXAMPLE section of linkgit:git-imap-send[1]."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:473
+#: en/git-format-patch.txt:477
#, no-wrap, priority:100
msgid "Thunderbird"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:477
+#: en/git-format-patch.txt:481
#, priority:100
msgid "By default, Thunderbird will both wrap emails as well as flag them as being 'format=flowed', both of which will make the resulting email unusable by Git."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:481
+#: en/git-format-patch.txt:485
#, priority:100
msgid "There are three different approaches: use an add-on to turn off line wraps, configure Thunderbird to not mangle patches, or use an external editor to keep Thunderbird from mangling the patches."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:483
+#: en/git-format-patch.txt:487
#, no-wrap, priority:100
msgid "Approach #1 (add-on)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:491
+#: en/git-format-patch.txt:495
#, priority:100
msgid "Install the Toggle Word Wrap add-on that is available from https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you can tick off. Now you can compose the message as you otherwise do (cut + paste, 'git format-patch' | 'git imap-send', etc), but you have to insert line breaks manually in any text that you type."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:493
+#: en/git-format-patch.txt:497
#, no-wrap, priority:100
msgid "Approach #2 (configuration)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:495
+#: en/git-format-patch.txt:499
#, priority:100
msgid "Three steps:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:499
-#, priority:100
+#: en/git-format-patch.txt:503
+#, ignore-ellipsis, priority:100
msgid "Configure your mail server composition as plain text: Edit...Account Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:501
+#: en/git-format-patch.txt:505
#, priority:100
msgid "Configure your general composition window to not wrap."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:504
+#: en/git-format-patch.txt:508
#, priority:100
msgid "In Thunderbird 2: Edit..Preferences..Composition, wrap plain text messages at 0"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:510
+#: en/git-format-patch.txt:514
#, priority:100
msgid "In Thunderbird 3: Edit..Preferences..Advanced..Config Editor. Search for \"mail.wrap_long_lines\". Toggle it to make sure it is set to `false`. Also, search for \"mailnews.wraplength\" and set the value to 0."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:515
+#: en/git-format-patch.txt:519
#, priority:100
msgid "Disable the use of format=flowed: Edit..Preferences..Advanced..Config Editor. Search for \"mailnews.send_plaintext_flowed\". Toggle it to make sure it is set to `false`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:519
+#: en/git-format-patch.txt:523
#, priority:100
msgid "After that is done, you should be able to compose email as you otherwise would (cut + paste, 'git format-patch' | 'git imap-send', etc), and the patches will not be mangled."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:521
+#: en/git-format-patch.txt:525
#, no-wrap, priority:100
msgid "Approach #3 (external editor)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:526
+#: en/git-format-patch.txt:530
#, priority:100
msgid "The following Thunderbird extensions are needed: AboutConfig from http://aboutconfig.mozdev.org/ and External Editor from http://globs.org/articles.php?lng=en&pg=8"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:528
+#: en/git-format-patch.txt:532
#, priority:100
msgid "Prepare the patch as a text file using your method of choice."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:533
+#: en/git-format-patch.txt:537
#, priority:100
msgid "Before opening a compose window, use Edit->Account Settings to uncheck the \"Compose messages in HTML format\" setting in the \"Composition & Addressing\" panel of the account to be used to send the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:537
+#: en/git-format-patch.txt:541
#, priority:100
msgid "In the main Thunderbird window, 'before' you open the compose window for the patch, use Tools->about:config to set the following to the indicated values:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:541
+#: en/git-format-patch.txt:545
#, no-wrap, priority:100
msgid ""
"\tmailnews.send_plaintext_flowed => false\n"
@@ -25070,25 +25331,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:544
+#: en/git-format-patch.txt:548
#, priority:100
msgid "Open a compose window and click the external editor icon."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:547
+#: en/git-format-patch.txt:551
#, priority:100
msgid "In the external editor window, read in the patch file and exit the editor normally."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:550
+#: en/git-format-patch.txt:554
#, priority:100
msgid "Side note: it may be possible to do step 2 with about:config and the following settings but no one's tried yet."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:555
+#: en/git-format-patch.txt:559
#, no-wrap, priority:100
msgid ""
"\tmail.html_compose => false\n"
@@ -25097,91 +25358,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:560
+#: en/git-format-patch.txt:564
#, priority:100
msgid "There is a script in contrib/thunderbird-patch-inline which can help you include patches with Thunderbird in an easy way. To use it, do the steps above and then use the script as the external editor."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:562
+#: en/git-format-patch.txt:566
#, no-wrap, priority:100
msgid "KMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:564
+#: en/git-format-patch.txt:568
#, priority:100
msgid "This should help you to submit patches inline using KMail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:566
+#: en/git-format-patch.txt:570
#, priority:100
msgid "Prepare the patch as a text file."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:568
+#: en/git-format-patch.txt:572
#, priority:100
msgid "Click on New Mail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:571
+#: en/git-format-patch.txt:575
#, priority:100
msgid "Go under \"Options\" in the Composer window and be sure that \"Word wrap\" is not set."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:573
-#, priority:100
+#: en/git-format-patch.txt:577
+#, ignore-ellipsis, priority:100
msgid "Use Message -> Insert file... and insert the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:576
+#: en/git-format-patch.txt:580
#, priority:100
msgid "Back in the compose window: add whatever other text you wish to the message, complete the addressing and subject fields, and press send."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:578
+#: en/git-format-patch.txt:582
#, no-wrap, priority:100
msgid "BASE TREE INFORMATION"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:587
+#: en/git-format-patch.txt:591
#, priority:100
msgid "The base tree information block is used for maintainers or third party testers to know the exact state the patch series applies to. It consists of the 'base commit', which is a well-known commit that is part of the stable part of the project history everybody else works off of, and zero or more 'prerequisite patches', which are well-known patches in flight that is not yet part of the 'base commit' that need to be applied on top of 'base commit' in topological order before the patches can be applied."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:593
+#: en/git-format-patch.txt:597
#, priority:100
msgid "The 'base commit' is shown as \"base-commit: \" followed by the 40-hex of the commit object name. A 'prerequisite patch' is shown as \"prerequisite-patch-id: \" followed by the 40-hex 'patch id', which can be obtained by passing the patch through the `git patch-id --stable` command."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:597
+#: en/git-format-patch.txt:601
#, priority:100
msgid "Imagine that on top of the public commit P, you applied well-known patches X, Y and Z from somebody else, and then built your three-patch series A, B, C, the history would be like:"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:600
+#: en/git-format-patch.txt:604
#, no-wrap, priority:100
msgid "---P---X---Y---Z---A---B---C\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:607
+#: en/git-format-patch.txt:611
#, priority:100
msgid "With `git format-patch --base=P -3 C` (or variants thereof, e.g. with `--cover-letter` or using `Z..C` instead of `-3 C` to specify the range), the base tree information block is shown at the end of the first message the command outputs (either the first patch, or the cover letter), like this:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:613
+#: en/git-format-patch.txt:617
#, no-wrap, priority:100
msgid ""
"base-commit: P\n"
@@ -25191,13 +25452,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:616
+#: en/git-format-patch.txt:620
#, priority:100
msgid "For non-linear topology, such as"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:621
+#: en/git-format-patch.txt:625
#, no-wrap, priority:100
msgid ""
"---P---X---A---M---C\n"
@@ -25206,98 +25467,98 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:626
+#: en/git-format-patch.txt:630
#, priority:100
msgid "You can also use `git format-patch --base=P -3 C` to generate patches for A, B and C, and the identifiers for P, X, Y, Z are appended at the end of the first message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:632
+#: en/git-format-patch.txt:636
#, priority:100
msgid "If set `--base=auto` in cmdline, it will track base commit automatically, the base commit will be the merge base of tip commit of the remote-tracking branch and revision-range specified in cmdline. For a local branch, you need to track a remote branch by `git branch --set-upstream-to` before using this option."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:638
+#: en/git-format-patch.txt:642
#, priority:100
msgid "Extract commits between revisions R1 and R2, and apply them on top of the current branch using 'git am' to cherry-pick them:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:641
+#: en/git-format-patch.txt:645
#, no-wrap, priority:100
msgid "$ git format-patch -k --stdout R1..R2 | git am -3 -k\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:645
+#: en/git-format-patch.txt:649
#, priority:100
msgid "Extract all commits which are in the current branch but not in the origin branch:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:648
+#: en/git-format-patch.txt:652
#, no-wrap, priority:100
msgid "$ git format-patch origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:651
+#: en/git-format-patch.txt:655
#, priority:100
msgid "For each commit a separate file is created in the current directory."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:654
+#: en/git-format-patch.txt:658
#, priority:100
msgid "Extract all commits that lead to 'origin' since the inception of the project:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:657
+#: en/git-format-patch.txt:661
#, no-wrap, priority:100
msgid "$ git format-patch --root origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:660
+#: en/git-format-patch.txt:664
#, priority:100
msgid "The same as the previous one:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:663
+#: en/git-format-patch.txt:667
#, no-wrap, priority:100
msgid "$ git format-patch -M -B origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:670
+#: en/git-format-patch.txt:674
#, priority:100
msgid "Additionally, it detects and handles renames and complete rewrites intelligently to produce a renaming patch. A renaming patch reduces the amount of text output, and generally makes it easier to review. Note that non-Git \"patch\" programs won't understand renaming patches, so use it only when you know the recipient uses Git to apply your patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:673
+#: en/git-format-patch.txt:677
#, priority:100
msgid "Extract three topmost commits from the current branch and format them as e-mailable patches:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:676
+#: en/git-format-patch.txt:680
#, no-wrap, priority:100
msgid "$ git format-patch -3\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:681
+#: en/git-format-patch.txt:685
#, ignore-same, priority:100
msgid "linkgit:git-am[1], linkgit:git-send-email[1]"
msgstr "linkgit:git-am[1], linkgit:git-send-email[1]"
#. type: Title =
#: en/git-fsck-objects.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-fsck-objects(1)"
msgstr "git-fsck-objects(1)"
@@ -25309,7 +25570,7 @@ msgstr "Verifica la connessione e la validit횪 degli oggetti nel database"
#. type: Plain text
#: en/git-fsck-objects.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git fsck-objects' ...\n"
msgstr ""
@@ -25321,7 +25582,7 @@ msgstr ""
#. type: Title =
#: en/git-fsck.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-fsck(1)"
msgstr "git-fsck(1)"
@@ -25355,7 +25616,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:30
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--unreachable"
msgstr "--unreachable"
@@ -25367,7 +25628,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:34
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]dangling"
msgstr "--[no-]dangling"
@@ -25391,7 +25652,7 @@ msgstr "segnala i tag"
#. type: Labeled list
#: en/git-fsck.txt:44
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--cache"
msgstr "--cache"
@@ -25403,7 +25664,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:48
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-reflogs"
msgstr "--no-reflogs"
@@ -25415,7 +25676,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:54
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--full"
msgstr "--full"
@@ -25427,7 +25688,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:64
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--connectivity-only"
msgstr "--connectivity-only"
@@ -25445,7 +25706,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:77 en/git-index-pack.txt:74 en/git-unpack-objects.txt:44
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--strict"
msgstr "--strict"
@@ -25463,7 +25724,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:88
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--lost-found"
msgstr "--lost-found"
@@ -25475,7 +25736,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:94
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--name-objects"
msgstr "--name-objects"
@@ -25595,7 +25856,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:164
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "GIT_OBJECT_DIRECTORY"
msgstr "GIT_OBJECT_DIRECTORY"
@@ -25607,7 +25868,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:167
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "GIT_INDEX_FILE"
msgstr "GIT_INDEX_FILE"
@@ -25619,7 +25880,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:170
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "GIT_ALTERNATE_OBJECT_DIRECTORIES"
msgstr "GIT_ALTERNATE_OBJECT_DIRECTORIES"
@@ -25631,7 +25892,7 @@ msgstr ""
#. type: Title =
#: en/git-gc.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-gc(1)"
msgstr "git-gc(1)"
@@ -25667,7 +25928,7 @@ msgstr ""
#. type: Labeled list
#: en/git-gc.txt:37 en/git-read-tree.txt:72
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--aggressive"
msgstr "--aggressive"
@@ -25679,7 +25940,7 @@ msgstr ""
#. type: Labeled list
#: en/git-gc.txt:44
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--auto"
msgstr "--auto"
@@ -25697,7 +25958,7 @@ msgstr ""
#. type: Plain text
#: en/git-gc.txt:55
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Once housekeeping is triggered by exceeding the limits of configuration options such as `gc.auto` and `gc.autoPackLimit`, all other housekeeping tasks (e.g. rerere, working trees, reflog...) will be performed as well."
msgstr ""
@@ -25715,7 +25976,7 @@ msgstr ""
#. type: Labeled list
#: en/git-gc.txt:65 en/git-pack-refs.txt:57
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-prune"
msgstr "--no-prune"
@@ -25739,7 +26000,7 @@ msgstr ""
#. type: Labeled list
#: en/git-gc.txt:75
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--keep-largest-pack"
msgstr "--keep-largest-pack"
@@ -25786,50 +26047,50 @@ msgid "The below documentation is the same as what's found in linkgit:git-config
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:127
+#: en/git-gc.txt:126
#, priority:100
-msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, refs saved by 'git filter-branch' in refs/original/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
+msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, notes saved by 'git notes' under refs/notes/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:134
+#: en/git-gc.txt:133
#, priority:100
msgid "On the other hand, when 'git gc' runs concurrently with another process, there is a risk of it deleting an object that the other process is using but hasn't created a reference to. This may just cause the other process to fail or may corrupt the repository if the other process later adds a reference to the deleted object. Git has two features that significantly mitigate this problem:"
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:137
+#: en/git-gc.txt:136
#, priority:100
msgid "Any object with modification time newer than the `--prune` date is kept, along with everything reachable from it."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:141
+#: en/git-gc.txt:140
#, priority:100
msgid "Most operations that add an object to the database update the modification time of the object if it is already present so that #1 applies."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:145
+#: en/git-gc.txt:144
#, priority:100
msgid "However, these features fall short of a complete solution, so users who run commands concurrently have to live with some risk of corruption (which seems to be low in practice)."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:151
+#: en/git-gc.txt:150
#, priority:100
msgid "The 'git gc --auto' command will run the 'pre-auto-gc' hook. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:159
+#: en/git-gc.txt:158
#, ignore-same, priority:100
msgid "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
msgstr "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
#. type: Title =
#: en/git-get-tar-commit-id.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-get-tar-commit-id(1)"
msgstr "git-get-tar-commit-id(1)"
@@ -25859,7 +26120,7 @@ msgstr ""
#. type: Title =
#: en/git-grep.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-grep(1)"
msgstr "git-grep(1)"
@@ -25871,7 +26132,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:32
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git grep' [-a | --text] [-I] [--textconv] [-i | --ignore-case] [-w | --word-regexp]\n"
"\t [-v | --invert-match] [-h|-H] [--full-name]\n"
@@ -25999,7 +26260,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:82
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--untracked"
msgstr "--untracked"
@@ -26011,7 +26272,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:86
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-exclude-standard"
msgstr "--no-exclude-standard"
@@ -26023,7 +26284,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:90 en/git-ls-files.txt:98
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--exclude-standard"
msgstr "--exclude-standard"
@@ -26088,8 +26349,8 @@ msgid "For each <pathspec> given on command line, descend at most <depth> levels
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:399
-#, no-wrap, ignore-same, no-wrap, priority:220
+#: en/git-grep.txt:128 en/git-submodule.txt:400
+#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
@@ -26101,7 +26362,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:131
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-recursive"
msgstr "--no-recursive"
@@ -26113,7 +26374,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:135
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--word-regexp"
msgstr "--word-regexp"
@@ -26125,7 +26386,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:141
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--invert-match"
msgstr "--invert-match"
@@ -26143,7 +26404,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:152 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--full-name"
msgstr "--full-name"
@@ -26161,7 +26422,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:159 en/rev-list-options.txt:83
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--extended-regexp"
msgstr "--extended-regexp"
@@ -26173,7 +26434,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:161 en/rev-list-options.txt:78
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--basic-regexp"
msgstr "--basic-regexp"
@@ -26185,7 +26446,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:166 en/rev-list-options.txt:93
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--perl-regexp"
msgstr "--perl-regexp"
@@ -26209,7 +26470,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:174 en/rev-list-options.txt:88
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--fixed-strings"
msgstr "--fixed-strings"
@@ -26221,7 +26482,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:179
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--line-number"
msgstr "--line-number"
@@ -26233,7 +26494,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:182
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--column"
msgstr "--column"
@@ -26245,7 +26506,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:187
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--files-with-matches"
msgstr "--files-with-matches"
@@ -26257,7 +26518,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:190
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--files-without-match"
msgstr "--files-without-match"
@@ -26293,7 +26554,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:212
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--only-matching"
msgstr "--only-matching"
@@ -26304,8 +26565,8 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:951
-#, no-wrap, ignore-same, no-wrap, priority:260
+#: en/git-grep.txt:217 en/rev-list-options.txt:967
+#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -26329,7 +26590,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:230
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--break"
msgstr "--break"
@@ -26341,7 +26602,7 @@ msgstr "stampa una riga vuota fra le corrispondenze in file differenti"
#. type: Labeled list
#: en/git-grep.txt:233
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--heading"
msgstr "--heading"
@@ -26353,7 +26614,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:238
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--show-function"
msgstr "--show-function"
@@ -26454,134 +26715,158 @@ msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:280
+#: en/git-grep.txt:277
+#, priority:100
+msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:282
+#, priority:100
+msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:287
+#, priority:100
+msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:291
+#, priority:100
+msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:297
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:281
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-grep.txt:298
+#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:282
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-grep.txt:299
+#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:283 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
-#, no-wrap, ignore-same, no-wrap, priority:260
+#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:284
-#, no-wrap, priority:100
+#: en/git-grep.txt:301
+#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:289
+#: en/git-grep.txt:306
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:290 en/rev-list-options.txt:65
-#, no-wrap, ignore-same, no-wrap, priority:260
+#: en/git-grep.txt:307 en/rev-list-options.txt:65
+#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:294
+#: en/git-grep.txt:311
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:299
+#: en/git-grep.txt:316
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:300
-#, no-wrap, priority:100
+#: en/git-grep.txt:317
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:303
+#: en/git-grep.txt:320
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:307
+#: en/git-grep.txt:324
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:328
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:318
+#: en/git-grep.txt:335
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:321
+#: en/git-grep.txt:338
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:322
+#: en/git-grep.txt:339
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:325
+#: en/git-grep.txt:342
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:326
+#: en/git-grep.txt:343
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:329
+#: en/git-grep.txt:346
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:330
+#: en/git-grep.txt:347
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:332
+#: en/git-grep.txt:349
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
#. type: Title =
#: en/git-gui.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-gui(1)"
msgstr "git-gui(1)"
@@ -26792,30 +27077,18 @@ msgstr ""
#. type: Plain text
#: en/git-gui.txt:116
#, priority:100
-msgid "A 'git gui' development repository can be obtained from:"
+msgid "The official repository of the 'git gui' project can be found at:"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:118
#, no-wrap, priority:100
-msgid " git clone git://repo.or.cz/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:122
-#, no-wrap, priority:100
-msgid " git clone http://repo.or.cz/r/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:124
-#, priority:100
-msgid "or browsed online at http://repo.or.cz/w/git-gui.git/[]."
+msgid " https://github.com/prati0100/git-gui.git/\n"
msgstr ""
#. type: Title =
#: en/git-hash-object.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-hash-object(1)"
msgstr "git-hash-object(1)"
@@ -26827,7 +27100,7 @@ msgstr "Calcola l'ID oggetto e crea facoltativamente un blob da un file"
#. type: Plain text
#: en/git-hash-object.txt:14
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git hash-object' [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin [--literally]] [--] <file>...\n"
"'git hash-object' [-t <type>] [-w] --stdin-paths [--no-filters]\n"
@@ -26865,7 +27138,7 @@ msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:35
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--stdin-paths"
msgstr "--stdin-paths"
@@ -26883,7 +27156,7 @@ msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:49
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-filters"
msgstr "--no-filters"
@@ -26895,7 +27168,7 @@ msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:55
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--literally"
msgstr "--literally"
@@ -26907,7 +27180,7 @@ msgstr ""
#. type: Title =
#: en/git-help.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-help(1)"
msgstr "git-help(1)"
@@ -26957,7 +27230,7 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:38
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Note that `git --help ...` is identical to `git help ...` because the former is internally converted into the latter."
msgstr ""
@@ -26987,7 +27260,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:55
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--config"
msgstr "--config"
@@ -26999,7 +27272,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:60
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--guides"
msgstr "--guides"
@@ -27011,7 +27284,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:65
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--info"
msgstr "--info"
@@ -27023,7 +27296,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:70
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--man"
msgstr "--man"
@@ -27041,7 +27314,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:80
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--web"
msgstr "--web"
@@ -27065,7 +27338,7 @@ msgstr ""
#. type: Title ~
#: en/git-help.txt:94
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "help.format"
msgstr "help.format"
@@ -27266,7 +27539,7 @@ msgstr ""
#. type: Title =
#: en/git-http-backend.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-http-backend(1)"
msgstr "git-http-backend(1)"
@@ -27407,7 +27680,7 @@ msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:102
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\tAuthType Basic\n"
"\tAuthName \"Git Access\"\n"
@@ -27425,7 +27698,7 @@ msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:115
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"<LocationMatch \"^/git/.*/git-receive-pack$\">\n"
"\tAuthType Basic\n"
@@ -27449,7 +27722,7 @@ msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:136
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"<Location /git/private>\n"
"\tAuthType Basic\n"
@@ -27599,7 +27872,7 @@ msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:231
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"auth.require = (\n"
"\t\"/\" => (\n"
@@ -27694,7 +27967,7 @@ msgstr ""
#. type: Title =
#: en/git-http-fetch.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-http-fetch(1)"
msgstr "git-http-fetch(1)"
@@ -27778,7 +28051,7 @@ msgstr ""
#. type: Labeled list
#: en/git-http-fetch.txt:43
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--recover"
msgstr "--recover"
@@ -27790,7 +28063,7 @@ msgstr ""
#. type: Title =
#: en/git-http-push.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-http-push(1)"
msgstr "git-http-push(1)"
@@ -27802,7 +28075,7 @@ msgstr "Esegue il push di oggetti su un altro repository tramite HTTP/DAV"
#. type: Plain text
#: en/git-http-push.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>...]\n"
msgstr ""
@@ -27871,7 +28144,7 @@ msgstr ""
#. type: Labeled list
#: en/git-http-push.txt:54 en/git-send-pack.txt:98
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<ref>..."
msgstr ""
@@ -27943,7 +28216,7 @@ msgstr ""
#. type: Title =
#: en/git-imap-send.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-imap-send(1)"
msgstr "git-imap-send(1)"
@@ -27985,7 +28258,7 @@ msgstr "non visualizzare messaggi"
#. type: Labeled list
#: en/git-imap-send.txt:40
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--curl"
msgstr "--curl"
@@ -27997,7 +28270,7 @@ msgstr ""
#. type: Labeled list
#: en/git-imap-send.txt:45
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-curl"
msgstr "--no-curl"
@@ -28135,7 +28408,7 @@ msgstr ""
#. type: Title =
#: en/git-index-pack.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-index-pack(1)"
msgstr "git-index-pack(1)"
@@ -28186,7 +28459,7 @@ msgstr ""
#. type: Labeled list
#: en/git-index-pack.txt:48
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--fix-thin"
msgstr "--fix-thin"
@@ -28240,7 +28513,7 @@ msgstr ""
#. type: Labeled list
#: en/git-index-pack.txt:80
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--fsck-objects"
msgstr "--fsck-objects"
@@ -28294,7 +28567,7 @@ msgstr ""
#. type: Title =
#: en/git-init-db.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-init-db(1)"
msgstr "git-init-db(1)"
@@ -28318,7 +28591,7 @@ msgstr ""
#. type: Title =
#: en/git-init.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "git-init(1)"
msgstr "git-init(1)"
@@ -28565,7 +28838,7 @@ msgstr ""
#. type: Title =
#: en/git-instaweb.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-instaweb(1)"
msgstr "git-instaweb(1)"
@@ -28598,7 +28871,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:28
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--httpd"
msgstr "--httpd"
@@ -28610,7 +28883,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:37
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--module-path"
msgstr "--module-path"
@@ -28622,7 +28895,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:42
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--port"
msgstr "--port"
@@ -28634,7 +28907,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:46
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--browser"
msgstr "--browser"
@@ -28652,7 +28925,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:54
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--start"
msgstr "--start"
@@ -28670,7 +28943,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:59
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--stop"
msgstr "--stop"
@@ -28688,7 +28961,7 @@ msgstr "--restart"
#. type: Labeled list
#: en/git-instaweb.txt:65
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--restart"
msgstr "--restart"
@@ -28724,7 +28997,7 @@ msgstr ""
#. type: Title =
#: en/git-interpret-trailers.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-interpret-trailers(1)"
msgstr "git-interpret-trailers(1)"
@@ -28736,7 +29009,7 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git interpret-trailers' [<options>] [(--trailer <token>[(=|:)<value>])...] [<file>...]\n"
"'git interpret-trailers' [<options>] [--parse] [<file>...]\n"
@@ -28810,7 +29083,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:74
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--in-place"
msgstr "--in-place"
@@ -28822,7 +29095,7 @@ msgstr "modifica i file sul posto"
#. type: Labeled list
#: en/git-interpret-trailers.txt:77
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--trim-empty"
msgstr "--trim-empty"
@@ -28852,7 +29125,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:88
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-where"
msgstr "--no-where"
@@ -28870,7 +29143,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:96
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-if-exists"
msgstr "--no-if-exists"
@@ -28888,7 +29161,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:105
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-if-missing"
msgstr "--no-if-missing"
@@ -28900,7 +29173,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:113
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--only-trailers"
msgstr "--only-trailers"
@@ -28912,7 +29185,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:116
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--only-input"
msgstr "--only-input"
@@ -28924,7 +29197,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:121
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--unfold"
msgstr "--unfold"
@@ -28936,7 +29209,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:125
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--parse"
msgstr "--parse"
@@ -28948,7 +29221,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:129
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-divider"
msgstr "--no-divider"
@@ -29394,7 +29667,7 @@ msgstr "linkgit:git-commit[1], linkgit:git-format-patch[1], linkgit:git-config[1
#. type: Title =
#: en/git-log.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "git-log(1)"
msgstr "git-log(1)"
@@ -29406,7 +29679,7 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:13
-#, fuzzy, no-wrap, priority:260
+#, fuzzy, ignore-ellipsis, no-wrap, priority:260
msgid "'git log' [<options>] [<revision range>] [[--] <path>...]\n"
msgstr "git log [<opzioni>] [<intervallo-revisioni>] [[--] <percorso>...]"
@@ -29424,7 +29697,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:27
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--follow"
msgstr "--follow"
@@ -29436,7 +29709,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:31
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--no-decorate"
msgstr "--no-decorate"
@@ -29472,7 +29745,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:48
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--source"
msgstr "--source"
@@ -29484,7 +29757,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:52
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--[no-]use-mailmap"
msgstr "--[no-]use-mailmap"
@@ -29496,13 +29769,13 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:57
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--full-diff"
msgstr "--full-diff"
#. type: Plain text
#: en/git-log.txt:63
-#, priority:260
+#, ignore-ellipsis, priority:260
msgid "Without this flag, `git log -p <path>...` shows commits that touch the specified paths, and diffs about the same specified paths. With this, the full diff is shown for commits that touch the specified paths; this means that \"<path>...\" limits only commits, and doesn't limit diff for those commits."
msgstr ""
@@ -29514,7 +29787,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:67
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--log-size"
msgstr "--log-size"
@@ -29556,7 +29829,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:93 en/git-shortlog.txt:72
-#, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:260
msgid "[--] <path>..."
msgstr ""
@@ -29706,7 +29979,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:182
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "format.pretty"
msgstr "format.pretty"
@@ -29718,7 +29991,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:186
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "i18n.logOutputEncoding"
msgstr "i18n.logOutputEncoding"
@@ -29730,7 +30003,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:191
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "log.date"
msgstr "log.date"
@@ -29748,7 +30021,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:200
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "log.follow"
msgstr "log.follow"
@@ -29760,7 +30033,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:206
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "log.showRoot"
msgstr "log.showRoot"
@@ -29772,7 +30045,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:212
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "log.showSignature"
msgstr "log.showSignature"
@@ -29820,7 +30093,7 @@ msgstr ""
#. type: Title =
#: en/git-ls-files.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-ls-files(1)"
msgstr "git-ls-files(1)"
@@ -29832,7 +30105,7 @@ msgstr "Visualizza informazioni sui file nell'indice e nell'albero di lavoro"
#. type: Plain text
#: en/git-ls-files.txt:23
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git ls-files' [-z] [-t] [-v] [-f]\n"
"\t\t(--[cached|deleted|others|ignored|stage|unmerged|killed|modified])*\n"
@@ -29867,7 +30140,7 @@ msgstr "visualizza file in cache nell'output (impostazione predefinita)"
#. type: Labeled list
#: en/git-ls-files.txt:40
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--deleted"
msgstr "--deleted"
@@ -29879,7 +30152,7 @@ msgstr "visualizza file eliminati nell'output"
#. type: Labeled list
#: en/git-ls-files.txt:44
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--modified"
msgstr "--modified"
@@ -29891,7 +30164,7 @@ msgstr "visualizza file modificati nell'output"
#. type: Labeled list
#: en/git-ls-files.txt:48
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--others"
msgstr "--others"
@@ -29903,7 +30176,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:52
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--ignored"
msgstr "--ignored"
@@ -29915,7 +30188,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:60
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--stage"
msgstr "--stage"
@@ -29927,7 +30200,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:63
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--directory"
msgstr "--directory"
@@ -29939,7 +30212,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:67
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-empty-directory"
msgstr "--no-empty-directory"
@@ -29951,7 +30224,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:71 en/git-update-index.txt:67
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--unmerged"
msgstr "--unmerged"
@@ -29963,7 +30236,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:75
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--killed"
msgstr "--killed"
@@ -30029,7 +30302,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:102
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--error-unmatch"
msgstr "--error-unmatch"
@@ -30179,7 +30452,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:165
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--eol"
msgstr "--eol"
@@ -30301,7 +30574,7 @@ msgstr "linkgit:git-read-tree[1], linkgit:gitignore[5]"
#. type: Title =
#: en/git-ls-remote.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-ls-remote(1)"
msgstr "git-ls-remote(1)"
@@ -30313,7 +30586,7 @@ msgstr ""
#. type: Plain text
#: en/git-ls-remote.txt:15
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git ls-remote' [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
"\t [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n"
@@ -30331,7 +30604,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:25 en/git-show-ref.txt:40
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--heads"
msgstr "--heads"
@@ -30343,7 +30616,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:33
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--refs"
msgstr "--refs"
@@ -30379,7 +30652,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:52
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--get-url"
msgstr "--get-url"
@@ -30391,7 +30664,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:57
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--symref"
msgstr "--symref"
@@ -30421,40 +30694,40 @@ msgstr ""
#. type: Plain text
#: en/git-ls-remote.txt:91
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
-#. type: Plain text
-#: en/git-ls-remote.txt:110
+#. type: delimited block -
+#: en/git-ls-remote.txt:111
#, no-wrap, priority:100
msgid ""
-"\t$ git ls-remote --tags ./.\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"\t$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
-"\t5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"\tc781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
-"\t$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
-"\t$ git ls-remote --tags korg v\\*\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"$ git ls-remote --tags ./.\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
+"$ git ls-remote --tags korg v\\*\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:114
+#: en/git-ls-remote.txt:116
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
#. type: Title =
#: en/git-ls-tree.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-ls-tree(1)"
msgstr "git-ls-tree(1)"
@@ -30466,7 +30739,7 @@ msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:15
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git ls-tree' [-d] [-r] [-t] [-l] [-z]\n"
"\t [--name-only] [--name-status] [--full-name] [--full-tree] [--abbrev[=<n>]]\n"
@@ -30547,7 +30820,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-tree.txt:76
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "[<path>...]"
msgstr ""
@@ -30595,7 +30868,7 @@ msgstr ""
#. type: Title =
#: en/git-mailinfo.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-mailinfo(1)"
msgstr "git-mailinfo(1)"
@@ -30745,7 +31018,7 @@ msgstr ""
#. type: Title =
#: en/git-mailsplit.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-mailsplit(1)"
msgstr "git-mailsplit(1)"
@@ -30757,7 +31030,7 @@ msgstr ""
#. type: Plain text
#: en/git-mailsplit.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git mailsplit' [-b] [-f<nn>] [-d<prec>] [--keep-cr] [--mboxrd]\n"
"\t\t-o<directory> [--] [(<mbox>|<Maildir>)...]\n"
@@ -30843,7 +31116,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mailsplit.txt:48
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--keep-cr"
msgstr "--keep-cr"
@@ -30855,7 +31128,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mailsplit.txt:51
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--mboxrd"
msgstr "--mboxrd"
@@ -30867,7 +31140,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-base.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-merge-base(1)"
msgstr "git-merge-base(1)"
@@ -30879,7 +31152,7 @@ msgstr "Trova il maggior numero possibile di antenati comuni per un merge"
#. type: Plain text
#: en/git-merge-base.txt:17
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git merge-base' [-a|--all] <commit> <commit>...\n"
"'git merge-base' [-a|--all] --octopus <commit>...\n"
@@ -30920,7 +31193,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:43
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--octopus"
msgstr "--octopus"
@@ -30932,7 +31205,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:48 en/git-show-branch.txt:90
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--independent"
msgstr "--independent"
@@ -30944,7 +31217,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:55
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--is-ancestor"
msgstr "--is-ancestor"
@@ -30955,8 +31228,8 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:358
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-merge-base.txt:60 en/git-rebase.txt:376
+#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -30984,242 +31257,242 @@ msgstr ""
msgid "For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:86
+#. type: delimited block .
+#: en/git-merge-base.txt:87
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---B\n"
-"\t /\n"
-"\t---o---1---o---o---o---A\n"
+"\t o---o---o---B\n"
+"\t/\n"
+"---o---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:88
+#: en/git-merge-base.txt:90
#, priority:100
msgid "the merge base between 'A' and 'B' is '1'."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:92
+#: en/git-merge-base.txt:94
#, priority:100
msgid "Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the merge base between 'A' and a hypothetical commit 'M', which is a merge between 'B' and 'C'. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:98
+#. type: delimited block .
+#: en/git-merge-base.txt:101
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---C\n"
-"\t /\n"
-"\t / o---o---o---B\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---C\n"
+" /\n"
+" / o---o---o---B\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:101
+#: en/git-merge-base.txt:105
#, priority:100
msgid "the result of `git merge-base A B C` is '1'. This is because the equivalent topology with a merge commit 'M' between 'B' and 'C' is:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:108
+#. type: delimited block .
+#: en/git-merge-base.txt:113
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---o\n"
-"\t / \\\n"
-"\t / o---o---o---o---M\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---o\n"
+" / \\\n"
+" / o---o---o---o---M\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:112
+#: en/git-merge-base.txt:118
#, priority:100
msgid "and the result of `git merge-base A M` is '1'. Commit '2' is also a common ancestor between 'A' and 'M', but '1' is a better common ancestor, because '2' is an ancestor of '1'. Hence, '2' is not a merge base."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:115
+#: en/git-merge-base.txt:121
#, priority:100
msgid "The result of `git merge-base --octopus A B C` is '2', because '2' is the best common ancestor of all commits."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:118
+#: en/git-merge-base.txt:124
#, priority:100
msgid "When the history involves criss-cross merges, there can be more than one 'best' common ancestor for two commits. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:124
+#. type: delimited block .
+#: en/git-merge-base.txt:131
#, no-wrap, priority:100
msgid ""
-"\t---1---o---A\n"
-"\t \\ /\n"
-"\t X\n"
-"\t / \\\n"
-"\t---2---o---o---B\n"
+"---1---o---A\n"
+" \\ /\n"
+" X\n"
+" / \\\n"
+"---2---o---o---B\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:128
+#: en/git-merge-base.txt:136
#, priority:100
msgid "both '1' and '2' are merge-bases of A and B. Neither one is better than the other (both are 'best' merge bases). When the `--all` option is not given, it is unspecified which best one is output."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:133
+#: en/git-merge-base.txt:141
#, priority:100
msgid "A common idiom to check \"fast-forward-ness\" between two commits A and B is (or at least used to be) to compute the merge base between A and B, and check if it is the same as A, in which case, A is an ancestor of B. You will see this idiom used often in older scripts."
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:139
-#, no-wrap, priority:100
+#. type: delimited block .
+#: en/git-merge-base.txt:148
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tA=$(git rev-parse --verify A)\n"
-"\tif test \"$A\" = \"$(git merge-base A B)\"\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"A=$(git rev-parse --verify A)\n"
+"if test \"$A\" = \"$(git merge-base A B)\"\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:141
+#: en/git-merge-base.txt:151
#, priority:100
msgid "In modern git, you can say this in a more direct way:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:146
-#, no-wrap, priority:100
+#. type: delimited block .
+#: en/git-merge-base.txt:157
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tif git merge-base --is-ancestor A B\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"if git merge-base --is-ancestor A B\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:148
+#: en/git-merge-base.txt:160
#, priority:100
msgid "instead."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:150
+#: en/git-merge-base.txt:162
#, no-wrap, priority:100
msgid "Discussion on fork-point mode"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:156
+#: en/git-merge-base.txt:168
#, priority:100
msgid "After working on the `topic` branch created with `git switch -c topic origin/master`, the history of remote-tracking branch `origin/master` may have been rewound and rebuilt, leading to a history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:164
+#. type: delimited block .
+#: en/git-merge-base.txt:177
#, no-wrap, priority:100
msgid ""
-"\t o---B2\n"
-"\t /\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t \\\n"
-"\t B0\n"
-"\t \\\n"
-"\t D0---D1---D (topic)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\\n"
+"\t B0\n"
+"\t \\\n"
+"\t D0---D1---D (topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:170
+#: en/git-merge-base.txt:184
#, priority:100
msgid "where `origin/master` used to point at commits B0, B1, B2 and now it points at B, and your `topic` branch was started on top of it back when `origin/master` was at B0, and you built three commits, D0, D1, and D, on top of it. Imagine that you now want to rebase the work you did on the topic on top of the updated origin/master."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:176
+#: en/git-merge-base.txt:190
#, priority:100
msgid "In such a case, `git merge-base origin/master topic` would return the parent of B0 in the above picture, but B0^..D is *not* the range of commits you would want to replay on top of B (it includes B0, which is not what you wrote; it is a commit the other side discarded when it moved its tip from B0 to B1)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:184
+#: en/git-merge-base.txt:198
#, priority:100
msgid "`git merge-base --fork-point origin/master topic` is designed to help in such a case. It takes not only B but also B0, B1, and B2 (i.e. old tips of the remote-tracking branches your repository's reflog knows about) into account to see on which commit your topic branch was built and finds B0, allowing you to replay only the commits on your topic, excluding the commits the other side later discarded."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:186
+#: en/git-merge-base.txt:200
#, priority:100
msgid "Hence"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:188
+#: en/git-merge-base.txt:202
#, no-wrap, priority:100
msgid " $ fork_point=$(git merge-base --fork-point origin/master topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:190
+#: en/git-merge-base.txt:204
#, priority:100
msgid "will find B0, and"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:192
+#: en/git-merge-base.txt:206
#, no-wrap, priority:100
msgid " $ git rebase --onto origin/master $fork_point topic\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:195
+#: en/git-merge-base.txt:209
#, priority:100
msgid "will replay D0, D1 and D on top of B to create a new history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:203
+#. type: delimited block .
+#: en/git-merge-base.txt:218
#, no-wrap, priority:100
msgid ""
-"\t\t\t o---B2\n"
-"\t\t\t/\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t\t\\ \\\n"
-"\t\t B0 D0'--D1'--D' (topic - updated)\n"
-"\t\t \\\n"
-"\t\t D0---D1---D (topic - old)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\ \\\n"
+"\t B0 D0'--D1'--D' (topic - updated)\n"
+"\t \\\n"
+"\t D0---D1---D (topic - old)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:210
+#: en/git-merge-base.txt:226
#, priority:100
msgid "A caveat is that older reflog entries in your repository may be expired by `git gc`. If B0 no longer appears in the reflog of the remote-tracking branch `origin/master`, the `--fork-point` mode obviously cannot find it and fails, avoiding to give a random and useless result (such as the parent of B0, like the same command without the `--fork-point` option gives)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:221
+#: en/git-merge-base.txt:237
#, priority:100
msgid "Also, the remote-tracking branch you use the `--fork-point` mode with must be the one your topic forked from its tip. If you forked from an older commit than the tip, this mode would not find the fork point (imagine in the above sample history B0 did not exist, origin/master started at B1, moved to B2 and then B, and you forked your topic at origin/master^ when origin/master was B1; the shape of the history would be the same as above, without B0, and the parent of B1 is what `git merge-base origin/master topic` correctly finds, but the `--fork-point` mode will not, because it is not one of the commits that used to be at the tip of origin/master)."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:224
+#: en/git-merge-base.txt:240
#, no-wrap, priority:100
msgid "See also"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:228
+#: en/git-merge-base.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
msgstr "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
#. type: Title =
#: en/git-merge-file.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-merge-file(1)"
msgstr "git-merge-file(1)"
@@ -31305,7 +31578,7 @@ msgstr "non emettere avvisi in caso di conflitti"
#. type: Labeled list
#: en/git-merge-file.txt:70
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--diff3"
msgstr "--diff3"
@@ -31317,7 +31590,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-file.txt:75
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--union"
msgstr "--union"
@@ -31353,7 +31626,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-index.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-merge-index(1)"
msgstr "git-merge-index(1)"
@@ -31423,38 +31696,38 @@ msgstr ""
msgid "Examples:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:62
+#. type: delimited block -
+#: en/git-merge-index.txt:63
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
-" This is MM from the original tree.\t\t\t# original\n"
-" This is modified MM in the branch A.\t\t\t# merge1\n"
-" This is modified MM in the branch B.\t\t\t# merge2\n"
-" This is modified MM in the branch B.\t\t\t# current contents\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
+"This is MM from the original tree.\t\t# original\n"
+"This is modified MM in the branch A.\t\t# merge1\n"
+"This is modified MM in the branch B.\t\t# merge2\n"
+"This is modified MM in the branch B.\t\t# current contents\n"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:71
+#. type: delimited block -
+#: en/git-merge-index.txt:74
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
-" cat: : No such file or directory\n"
-" This is added AA in the branch A.\n"
-" This is added AA in the branch B.\n"
-" This is added AA in the branch B.\n"
-" fatal: merge program failed\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
+"cat: : No such file or directory\n"
+"This is added AA in the branch A.\n"
+"This is added AA in the branch B.\n"
+"This is added AA in the branch B.\n"
+"fatal: merge program failed\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-index.txt:76
+#: en/git-merge-index.txt:80
#, priority:100
msgid "where the latter example shows how 'git merge-index' will stop trying to merge once anything has returned an error (i.e., `cat` returned an error for the AA file, because it didn't exist in the original, and thus 'git merge-index' didn't even try to merge the MM thing)."
msgstr ""
#. type: Title =
#: en/git-merge-one-file.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-merge-one-file(1)"
msgstr "git-merge-one-file(1)"
@@ -31568,7 +31841,7 @@ msgstr ""
#. type: Title =
#: en/git-mergetool.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "git-mergetool(1)"
msgstr "git-mergetool(1)"
@@ -31580,7 +31853,7 @@ msgstr "Esegue gli strumenti di risoluzione conflitti di merge per risolvere i c
#. type: Plain text
#: en/git-mergetool.txt:12
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
msgstr ""
@@ -31652,7 +31925,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mergetool.txt:83
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--gui"
msgstr "--gui"
@@ -31664,7 +31937,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mergetool.txt:90
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--no-gui"
msgstr "--no-gui"
@@ -31700,7 +31973,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-tree.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-merge-tree(1)"
msgstr "git-merge-tree(1)"
@@ -31730,7 +32003,7 @@ msgstr ""
#. type: Title =
#: en/git-merge.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "git-merge(1)"
msgstr "git-merge(1)"
@@ -31742,10 +32015,10 @@ msgstr "Unisce due o pi첫 cronologie di sviluppo"
#. type: Plain text
#: en/git-merge.txt:17
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n"
-"\t[-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
+"\t[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
"\t[--[no-]allow-unrelated-histories]\n"
"\t[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]\n"
"'git merge' (--continue | --abort | --quit)\n"
@@ -32217,7 +32490,7 @@ msgstr "linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes
#. type: Title =
#: en/git-mktag.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-mktag(1)"
msgstr "git-mktag(1)"
@@ -32275,7 +32548,7 @@ msgstr ""
#. type: Title =
#: en/git-mktree.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-mktree(1)"
msgstr "git-mktree(1)"
@@ -32305,7 +32578,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mktree.txt:26
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--missing"
msgstr "--missing"
@@ -32323,7 +32596,7 @@ msgstr ""
#. type: Title =
#: en/git-mv.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "git-mv(1)"
msgstr "git-mv(1)"
@@ -32335,7 +32608,7 @@ msgstr "Sposta o rinomina un file, una directory o un collegamento simbolico"
#. type: Plain text
#: en/git-mv.txt:13
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "'git mv' <options>... <args>...\n"
msgstr ""
@@ -32347,7 +32620,7 @@ msgstr "Sposta o rinomina un file, una directory o un collegamento simbolico"
#. type: Plain text
#: en/git-mv.txt:20
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
" git mv [-v] [-f] [-n] [-k] <source> <destination>\n"
" git mv [-v] [-f] [-n] [-k] <source> ... <destination directory>\n"
@@ -32403,7 +32676,7 @@ msgstr ""
#. type: Title =
#: en/git-name-rev.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-name-rev(1)"
msgstr "git-name-rev(1)"
@@ -32415,7 +32688,7 @@ msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:14
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git name-rev' [--tags] [--refs=<pattern>]\n"
"\t ( --all | --stdin | <commit-ish>... )\n"
@@ -32471,7 +32744,7 @@ msgstr ""
#. type: Labeled list
#: en/git-name-rev.txt:57
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-undefined"
msgstr "--no-undefined"
@@ -32521,7 +32794,7 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-notes(1)"
msgstr "git-notes(1)"
@@ -32533,7 +32806,7 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:23
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git notes' [list [<object>]]\n"
"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -32826,7 +33099,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:281 en/merge-options.txt:108
+#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -32839,7 +33112,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--commit"
msgstr "--commit"
@@ -32869,7 +33142,7 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Commit notes are blobs containing extra information about an object (usually information to supplement a commit's message). These blobs are taken from notes refs. A notes ref is usually a branch which contains \"files\" whose paths are the object names for the objects they describe, with some directory separators included for performance reasons footnote:[Permitted pathnames have the form 'ab'`/`'cd'`/`'ef'`/`'...'`/`'abcdef...': a sequence of directory names of two hexadecimal digits each followed by a filename with the rest of the object ID.]."
msgstr ""
@@ -32935,7 +33208,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:288
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -32974,7 +33247,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:313
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "core.notesRef"
msgstr "core.notesRef"
@@ -33082,7 +33355,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
@@ -33094,7 +33367,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
@@ -33112,7 +33385,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:389
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
@@ -33124,7 +33397,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
@@ -33142,7 +33415,7 @@ msgstr ""
#. type: Title =
#: en/git-p4.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4(1)"
msgstr "git-p4(1)"
@@ -33154,7 +33427,7 @@ msgstr "Importa dati da, o invia dati a, repository Perforce"
#. type: Plain text
#: en/git-p4.txt:16
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git p4 clone' [<sync options>] [<clone options>] <p4 depot path>...\n"
"'git p4 sync' [<sync options>] [<p4 depot path>...]\n"
@@ -33537,7 +33810,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:236
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--detect-branches"
msgstr "--detect-branches"
@@ -33561,7 +33834,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:245
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--silent"
msgstr "--silent"
@@ -33573,7 +33846,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:248
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--detect-labels"
msgstr "--detect-labels"
@@ -33585,7 +33858,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:253 en/git-p4.txt:389
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--import-labels"
msgstr "--import-labels"
@@ -33597,7 +33870,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:256
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--import-local"
msgstr "--import-local"
@@ -33633,7 +33906,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:280
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--keep-path"
msgstr "--keep-path"
@@ -33645,7 +33918,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:288
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--use-client-spec"
msgstr "--use-client-spec"
@@ -33729,7 +34002,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:323
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--preserve-user"
msgstr "--preserve-user"
@@ -33741,7 +34014,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:327
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--export-labels"
msgstr "--export-labels"
@@ -33759,7 +34032,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:336
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--prepare-p4-only"
msgstr "--prepare-p4-only"
@@ -33771,7 +34044,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:343
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--shelve"
msgstr "--shelve"
@@ -33806,7 +34079,7 @@ msgid "Conflicts can occur when applying a commit to p4. When this happens, the
msgstr ""
#. type: Labeled list
-#: en/git-p4.txt:359 en/git-submodule.txt:270
+#: en/git-p4.txt:359 en/git-submodule.txt:271
#, no-wrap, priority:220
msgid "--branch <branch>"
msgstr ""
@@ -33831,7 +34104,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:368
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--disable-rebase"
msgstr "--disable-rebase"
@@ -33843,7 +34116,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:372
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--disable-p4sync"
msgstr "--disable-p4sync"
@@ -33897,7 +34170,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:395
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--origin"
msgstr "--origin"
@@ -33987,7 +34260,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:445
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "The full syntax for a p4 view is documented in 'p4 help views'. 'git p4' knows only a subset of the view syntax. It understands multi-line mappings, overlays with '+', exclusions with '-' and double-quotes around whitespace. Of the possible wildcards, 'git p4' only handles '...', and only when it is at the end of the path. 'git p4' will complain if it encounters an unhandled wildcard."
msgstr ""
@@ -34029,7 +34302,7 @@ msgstr ""
#. type: delimited block -
#: en/git-p4.txt:475
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"//depot/main/...\n"
"//depot/branch1/...\n"
@@ -34043,7 +34316,7 @@ msgstr ""
#. type: delimited block -
#: en/git-p4.txt:480
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "//depot/main/... //depot/branch1/...\n"
msgstr ""
@@ -34101,7 +34374,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:521
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.user"
msgstr "git-p4.user"
@@ -34113,7 +34386,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:525
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.password"
msgstr "git-p4.password"
@@ -34125,7 +34398,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:530
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.port"
msgstr "git-p4.port"
@@ -34137,7 +34410,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:535
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.host"
msgstr "git-p4.host"
@@ -34149,7 +34422,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:540
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.client"
msgstr "git-p4.client"
@@ -34161,7 +34434,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:544
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.retries"
msgstr "git-p4.retries"
@@ -34179,7 +34452,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:552
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.syncFromOrigin"
msgstr "git-p4.syncFromOrigin"
@@ -34191,7 +34464,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:559
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.branchUser"
msgstr "git-p4.branchUser"
@@ -34203,7 +34476,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:565
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.branchList"
msgstr "git-p4.branchList"
@@ -34235,7 +34508,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:580
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.importLabels"
msgstr "git-p4.importLabels"
@@ -34247,7 +34520,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:583
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.labelImportRegexp"
msgstr "git-p4.labelImportRegexp"
@@ -34259,7 +34532,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:587
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.useClientSpec"
msgstr "git-p4.useClientSpec"
@@ -34271,7 +34544,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:593
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.pathEncoding"
msgstr "git-p4.pathEncoding"
@@ -34283,7 +34556,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:600
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.largeFileSystem"
msgstr "git-p4.largeFileSystem"
@@ -34301,7 +34574,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:611
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.largeFileExtensions"
msgstr "git-p4.largeFileExtensions"
@@ -34313,7 +34586,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:615
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.largeFileThreshold"
msgstr "git-p4.largeFileThreshold"
@@ -34325,7 +34598,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:620
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.largeFileCompressedThreshold"
msgstr "git-p4.largeFileCompressedThreshold"
@@ -34337,7 +34610,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:626
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.largeFilePush"
msgstr "git-p4.largeFilePush"
@@ -34349,7 +34622,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:630
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.keepEmptyCommits"
msgstr "git-p4.keepEmptyCommits"
@@ -34361,7 +34634,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:634
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.mapUser"
msgstr "git-p4.mapUser"
@@ -34391,7 +34664,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:647
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.detectRenames"
msgstr "git-p4.detectRenames"
@@ -34403,7 +34676,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:651
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.detectCopies"
msgstr "git-p4.detectCopies"
@@ -34415,7 +34688,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:655
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.detectCopiesHarder"
msgstr "git-p4.detectCopiesHarder"
@@ -34427,7 +34700,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:658
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.preserveUser"
msgstr "git-p4.preserveUser"
@@ -34451,7 +34724,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:667
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.skipSubmitEdit"
msgstr "git-p4.skipSubmitEdit"
@@ -34463,7 +34736,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:672
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.skipSubmitEditCheck"
msgstr "git-p4.skipSubmitEditCheck"
@@ -34475,7 +34748,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:677
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.allowSubmit"
msgstr "git-p4.allowSubmit"
@@ -34487,7 +34760,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:684
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.skipUserNameCheck"
msgstr "git-p4.skipUserNameCheck"
@@ -34499,7 +34772,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:689
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.attemptRCSCleanup"
msgstr "git-p4.attemptRCSCleanup"
@@ -34511,7 +34784,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:695
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.exportLabels"
msgstr "git-p4.exportLabels"
@@ -34523,7 +34796,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:698
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.labelExportRegexp"
msgstr "git-p4.labelExportRegexp"
@@ -34535,7 +34808,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:702
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.conflict"
msgstr "git-p4.conflict"
@@ -34547,7 +34820,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:706
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.disableRebase"
msgstr "git-p4.disableRebase"
@@ -34601,7 +34874,7 @@ msgstr ""
#. type: Title =
#: en/git-pack-objects.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-pack-objects(1)"
msgstr "git-pack-objects(1)"
@@ -34673,7 +34946,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:63
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--revs"
msgstr "--revs"
@@ -34685,7 +34958,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:72 en/rev-list-options.txt:715
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--unpacked"
msgstr "--unpacked"
@@ -34745,7 +35018,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:126
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--honor-pack-keep"
msgstr "--honor-pack-keep"
@@ -34781,7 +35054,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:147
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--non-empty"
msgstr "--non-empty"
@@ -34793,7 +35066,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:157
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--all-progress"
msgstr "--all-progress"
@@ -34805,7 +35078,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:168
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--all-progress-implied"
msgstr "--all-progress-implied"
@@ -34823,7 +35096,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:177
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-reuse-delta"
msgstr "--no-reuse-delta"
@@ -34835,7 +35108,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:184
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-reuse-object"
msgstr "--no-reuse-object"
@@ -34859,7 +35132,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:199 en/git-show-branch.txt:67 en/rev-list-options.txt:350 en/rev-list-options.txt:483
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--sparse"
msgstr "--sparse"
@@ -34883,7 +35156,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:218
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--shallow"
msgstr "--shallow"
@@ -34895,7 +35168,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:223
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--delta-base-offset"
msgstr "--delta-base-offset"
@@ -34919,7 +35192,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:254
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--keep-true-parents"
msgstr "--keep-true-parents"
@@ -34942,8 +35215,8 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:263 en/rev-list-options.txt:760
-#, no-wrap, ignore-same, no-wrap, priority:260
+#: en/git-pack-objects.txt:263 en/rev-list-options.txt:776
+#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -34954,13 +35227,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:266 en/rev-list-options.txt:767
+#: en/git-pack-objects.txt:266 en/rev-list-options.txt:783
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:269 en/rev-list-options.txt:770
+#: en/git-pack-objects.txt:269 en/rev-list-options.txt:786
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -34972,7 +35245,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:276 en/rev-list-options.txt:777
+#: en/git-pack-objects.txt:276 en/rev-list-options.txt:793
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -34984,8 +35257,8 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:281 en/rev-list-options.txt:785
-#, no-wrap, ignore-same, no-wrap, priority:260
+#: en/git-pack-objects.txt:281 en/rev-list-options.txt:801
+#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -34997,7 +35270,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:288 en/git-repack.txt:157
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--keep-unreachable"
msgstr "--keep-unreachable"
@@ -35009,7 +35282,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:294
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--pack-loose-unreachable"
msgstr "--pack-loose-unreachable"
@@ -35021,7 +35294,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:298
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--unpack-unreachable"
msgstr "--unpack-unreachable"
@@ -35033,7 +35306,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:301 en/git-repack.txt:164
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--delta-islands"
msgstr "--delta-islands"
@@ -35148,7 +35421,7 @@ msgstr "linkgit:git-rev-list[1] linkgit:git-repack[1] linkgit:git-prune-packed[1
#. type: Title =
#: en/git-pack-redundant.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-pack-redundant(1)"
msgstr "git-pack-redundant(1)"
@@ -35160,7 +35433,7 @@ msgstr ""
#. type: Plain text
#: en/git-pack-redundant.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git pack-redundant' [ --verbose ] [ --alt-odb ] < --all | .pack filename ... >\n"
msgstr ""
@@ -35190,7 +35463,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-redundant.txt:35
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--alt-odb"
msgstr "--alt-odb"
@@ -35214,7 +35487,7 @@ msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1] linkgit:git-prune-pack
#. type: Title =
#: en/git-pack-refs.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-pack-refs(1)"
msgstr "git-pack-refs(1)"
@@ -35274,7 +35547,7 @@ msgstr ""
#. type: Title =
#: en/git-parse-remote.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-parse-remote(1)"
msgstr "git-parse-remote(1)"
@@ -35298,7 +35571,7 @@ msgstr ""
#. type: Title =
#: en/git-patch-id.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-patch-id(1)"
msgstr "git-patch-id(1)"
@@ -35340,7 +35613,7 @@ msgstr ""
#. type: Labeled list
#: en/git-patch-id.txt:33
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--stable"
msgstr "--stable"
@@ -35370,7 +35643,7 @@ msgstr ""
#. type: Labeled list
#: en/git-patch-id.txt:50
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--unstable"
msgstr "--unstable"
@@ -35388,7 +35661,7 @@ msgstr ""
#. type: Title =
#: en/git-prune-packed.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-prune-packed(1)"
msgstr "git-prune-packed(1)"
@@ -35448,7 +35721,7 @@ msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Title =
#: en/git-prune.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-prune(1)"
msgstr "git-prune(1)"
@@ -35460,7 +35733,7 @@ msgstr "Elimina tutti gli oggetti non raggiungibili dal database oggetti"
#. type: Plain text
#: en/git-prune.txt:13
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
msgstr "git prune [-n] [-v] [--progress] [--expire <tempo>] [--] [<head>...]"
@@ -35514,7 +35787,7 @@ msgstr ""
#. type: Labeled list
#: en/git-prune.txt:54
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<head>..."
msgstr ""
@@ -35556,7 +35829,7 @@ msgstr "linkgit:git-fsck[1], linkgit:git-gc[1], linkgit:git-reflog[1]"
#. type: Title =
#: en/git-pull.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "git-pull(1)"
msgstr "git-pull(1)"
@@ -35568,7 +35841,7 @@ msgstr "Esegue il fetch e l'integrazione con un altro repository o un branch loc
#. type: Plain text
#: en/git-pull.txt:13
-#, fuzzy, no-wrap, priority:220
+#, fuzzy, ignore-ellipsis, no-wrap, priority:220
msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
msgstr "git pull [<opzioni>] [<repository> [<specificatore riferimento>...]]"
@@ -35732,7 +36005,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pull.txt:133 en/git-svn.txt:261
-#, no-wrap, ignore-same, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--no-rebase"
msgstr "--no-rebase"
@@ -35743,14 +36016,14 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:502
-#, no-wrap, ignore-same, no-wrap, priority:220
+#: en/git-pull.txt:136 en/git-rebase.txt:524
+#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:503
-#, no-wrap, ignore-same, no-wrap, priority:220
+#: en/git-pull.txt:137 en/git-rebase.txt:525
+#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -35904,7 +36177,7 @@ msgstr "linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]"
#. type: Title =
#: en/git-push.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "git-push(1)"
msgstr "git-push(1)"
@@ -35916,7 +36189,7 @@ msgstr "Aggiorna i riferimenti remoti insieme agli oggetti associati"
#. type: Plain text
#: en/git-push.txt:18
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]\n"
"\t [--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]\n"
@@ -35946,7 +36219,7 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:39
-#, priority:220
+#, ignore-ellipsis, priority:220
msgid "When the command line does not specify what to push with `<refspec>...` arguments or `--all`, `--mirror`, `--tags` options, the command finds the default `<refspec>` by consulting `remote.*.push` configuration, and if it is not found, honors `push.default` configuration to decide what to push (See linkgit:git-config[1] for the meaning of `push.default`)."
msgstr ""
@@ -35970,7 +36243,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:56
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid "<refspec>..."
msgstr ""
@@ -36114,7 +36387,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:191
-#, no-wrap, ignore-same, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--follow-tags"
msgstr "--follow-tags"
@@ -36126,7 +36399,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:199 en/git-send-pack.txt:73
-#, no-wrap, ignore-same, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--[no-]signed"
msgstr "--[no-]signed"
@@ -36144,7 +36417,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:210
-#, no-wrap, ignore-same, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--[no-]atomic"
msgstr "--[no-]atomic"
@@ -36186,7 +36459,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:234
-#, no-wrap, ignore-same, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--[no-]force-with-lease"
msgstr "--[no-]force-with-lease"
@@ -36330,7 +36603,7 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:343
-#, priority:220
+#, ignore-ellipsis, priority:220
msgid "Note that `--force` applies to all the refs that are pushed, hence using it with `push.default` set to `matching` or with multiple push destinations configured with `remote.*.push` may overwrite refs other than the current branch (including local refs that are strictly behind their remote counterpart). To force a push to only one branch, use a `+` in front of the refspec to push (e.g `git push origin +master` to force a push to the `master` branch). See the `<refspec>...` section above for details."
msgstr ""
@@ -36354,7 +36627,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:355
-#, no-wrap, ignore-same, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--[no-]thin"
msgstr "--[no-]thin"
@@ -36384,7 +36657,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:393
-#, no-wrap, ignore-same, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--[no-]verify"
msgstr "--[no-]verify"
@@ -36462,7 +36735,7 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:445
-#, priority:220
+#, ignore-ellipsis, priority:220
msgid "For a successfully pushed ref, the summary shows the old and new values of the ref in a form suitable for using as an argument to `git log` (this is `<old>..<new>` in most cases, and `<old>...<new>` for forced non-fast-forward updates)."
msgstr ""
@@ -36723,7 +36996,7 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:616
-#, priority:220
+#, ignore-ellipsis, priority:220
msgid "See the section describing `<refspec>...` above for a discussion of the matching semantics."
msgstr ""
@@ -36819,7 +37092,7 @@ msgstr ""
#. type: Title =
#: en/git-quiltimport.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-quiltimport(1)"
msgstr "git-quiltimport(1)"
@@ -36911,7 +37184,7 @@ msgstr ""
#. type: Title =
#: en/git-read-tree.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-read-tree(1)"
msgstr "git-read-tree(1)"
@@ -36957,7 +37230,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:40
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--reset"
msgstr "--reset"
@@ -36993,7 +37266,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:66
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--trivial"
msgstr "--trivial"
@@ -37065,7 +37338,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:118
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]recurse-submodules"
msgstr "--[no-]recurse-submodules"
@@ -37077,7 +37350,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:124
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-sparse-checkout"
msgstr "--no-sparse-checkout"
@@ -37089,7 +37362,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:128
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--empty"
msgstr "--empty"
@@ -37424,7 +37697,7 @@ msgstr ""
#. type: delimited block -
#: en/git-read-tree.txt:357
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git fetch git://.... linus\n"
"$ LT=`git rev-parse FETCH_HEAD`\n"
@@ -37478,7 +37751,7 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:405
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "'git read-tree' and other merge-based commands ('git merge', 'git checkout'...) can help maintaining the skip-worktree bitmap and working directory update. `$GIT_DIR/info/sparse-checkout` is used to define the skip-worktree reference bitmap. When 'git read-tree' needs to update the working directory, it resets the skip-worktree bit in the index based on this file, which uses the same syntax as .gitignore files. If an entry matches a pattern in this file, skip-worktree will not be set on that entry. Otherwise, skip-worktree will be set."
msgstr ""
@@ -37528,7 +37801,7 @@ msgstr "linkgit:git-write-tree[1]; linkgit:git-ls-files[1]; linkgit:gitignore[5]
#. type: Title =
#: en/git-rebase.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-rebase(1)"
msgstr "git-rebase(1)"
@@ -37542,8 +37815,8 @@ msgstr "Riapplica dei commit dopo l'ultimo commit di un branch"
#: en/git-rebase.txt:16
#, no-wrap, priority:100
msgid ""
-"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
-"\t[<upstream> [<branch>]]\n"
+"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>]\n"
+"\t[--onto <newbase> | --keep-base] [<upstream> [<branch>]]\n"
"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
"\t--root [<branch>]\n"
"'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch)\n"
@@ -37858,516 +38131,546 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:219
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:220
+#, ignore-same, no-wrap, priority:100
+msgid "--keep-base"
+msgstr "--keep-base"
+
#. type: Plain text
-#: en/git-rebase.txt:224
+#: en/git-rebase.txt:225
+#, ignore-ellipsis, priority:100
+msgid "Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running 'git rebase --keep-base <upstream> <branch>' is equivalent to running 'git rebase --onto <upstream>... <upstream>'."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:230
+#, priority:100
+msgid "This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:235
+#, priority:100
+msgid "Although both this option and --fork-point find the merge base between <upstream> and <branch>, this option uses the merge base as the _starting point_ on which new commits will be created, whereas --fork-point uses the merge base to determine the _set of commits_ which will be rebased."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#, priority:100
+msgid "See also INCOMPATIBLE OPTIONS below."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:242
#, priority:100
msgid "Upstream branch to compare against. May be any valid commit, not just an existing branch name. Defaults to the configured upstream for the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:230
+#: en/git-rebase.txt:248
#, priority:100
msgid "Restart the rebasing process after having resolved a merge conflict."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237
+#: en/git-rebase.txt:255
#, priority:100
msgid "Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:242
+#: en/git-rebase.txt:260
#, priority:100
msgid "Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:243 en/git-rebase.txt:538
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-rebase.txt:261 en/git-rebase.txt:560
+#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:246
+#: en/git-rebase.txt:264
#, priority:100
msgid "Keep the commits that do not change anything from its parents in the result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:248 en/git-rebase.txt:255 en/git-rebase.txt:280 en/git-rebase.txt:293 en/git-rebase.txt:302 en/git-rebase.txt:344 en/git-rebase.txt:379 en/git-rebase.txt:386 en/git-rebase.txt:393 en/git-rebase.txt:405 en/git-rebase.txt:445 en/git-rebase.txt:470 en/git-rebase.txt:482 en/git-rebase.txt:501
-#, priority:100
-msgid "See also INCOMPATIBLE OPTIONS below."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rebase.txt:253
+#: en/git-rebase.txt:271
#, priority:100
msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:258
+#: en/git-rebase.txt:276
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:259 en/git-rebase.txt:539
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-rebase.txt:277 en/git-rebase.txt:561
+#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:261
+#: en/git-rebase.txt:279
#, fuzzy, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr "modifica l'elenco todo durante un rebase interattivo"
#. type: Plain text
-#: en/git-rebase.txt:266
+#: en/git-rebase.txt:284
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:272
+#: en/git-rebase.txt:290
#, priority:100
msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:278
+#: en/git-rebase.txt:296
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:286
+#: en/git-rebase.txt:304
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:291
+#: en/git-rebase.txt:309
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:294
+#: en/git-rebase.txt:312
#, fuzzy, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr "--strategy-option"
#. type: Labeled list
-#: en/git-rebase.txt:295
+#: en/git-rebase.txt:313
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:300
+#: en/git-rebase.txt:318
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:317
+#: en/git-rebase.txt:335
#, fuzzy, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr "sii silenzioso. implica --no-stat"
#. type: Plain text
-#: en/git-rebase.txt:321
+#: en/git-rebase.txt:339
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:325
+#: en/git-rebase.txt:343
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:329
+#: en/git-rebase.txt:347
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:332
+#: en/git-rebase.txt:350
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:333 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
-#, no-wrap, ignore-same, no-wrap, priority:240
+#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:336
+#: en/git-rebase.txt:354
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:345 en/merge-options.txt:47
-#, no-wrap, ignore-same, no-wrap, priority:240
+#: en/git-rebase.txt:363 en/merge-options.txt:43
+#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:346
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-rebase.txt:364
+#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:351
+#: en/git-rebase.txt:369
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:357
+#: en/git-rebase.txt:375
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:359
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-rebase.txt:377
+#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:363
+#: en/git-rebase.txt:381
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:387
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:372
+#: en/git-rebase.txt:390
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:394
+#, priority:100
+msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:399
#, priority:100
msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:384
+#: en/git-rebase.txt:406
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:391
+#: en/git-rebase.txt:413
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:421
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:403
+#: en/git-rebase.txt:425
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:407
+#: en/git-rebase.txt:429
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:415
+#: en/git-rebase.txt:437
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:422
+#: en/git-rebase.txt:444
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:426
+#: en/git-rebase.txt:448
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges`, but in contrast to that option works well in interactive rebases: commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:430
-#, priority:100
+#: en/git-rebase.txt:452
+#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:432
+#: en/git-rebase.txt:454
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:434 en/git-rebase.txt:535 en/git-svn.txt:680
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-rebase.txt:456 en/git-rebase.txt:557 en/git-svn.txt:680
+#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:439
+#: en/git-rebase.txt:461
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:443
+#: en/git-rebase.txt:465
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:446
+#: en/git-rebase.txt:468
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:447
+#: en/git-rebase.txt:469
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:474
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:455
+#: en/git-rebase.txt:477
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:457
-#, no-wrap, priority:100
+#: en/git-rebase.txt:479
+#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:459
+#: en/git-rebase.txt:481
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:461
-#, no-wrap, priority:100
+#: en/git-rebase.txt:483
+#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:487
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:490
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:480
+#: en/git-rebase.txt:502
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:483
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-rebase.txt:505
+#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:484
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-rebase.txt:506
+#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:495
-#, priority:100
+#: en/git-rebase.txt:517
+#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:499
+#: en/git-rebase.txt:521
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:509
+#: en/git-rebase.txt:531
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:510
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-rebase.txt:532
+#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:511
-#, no-wrap, ignore-same, no-wrap, priority:100
+#: en/git-rebase.txt:533
+#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:514
+#: en/git-rebase.txt:536
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:516
+#: en/git-rebase.txt:538
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:519
+#: en/git-rebase.txt:541
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:523
+#: en/git-rebase.txt:545
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:527
+#: en/git-rebase.txt:549
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:530
+#: en/git-rebase.txt:552
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:553
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:555
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Plain text
-#: en/git-rebase.txt:534
+#: en/git-rebase.txt:556
#, ignore-same, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:537
+#: en/git-rebase.txt:559
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:540
+#: en/git-rebase.txt:562
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:542
+#: en/git-rebase.txt:564
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:544
+#: en/git-rebase.txt:566
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:567
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:546
+#: en/git-rebase.txt:568
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:547
+#: en/git-rebase.txt:569
#, priority:100
-msgid "--rebase-merges and --strategy"
+msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:548
+#: en/git-rebase.txt:570
#, priority:100
-msgid "--rebase-merges and --strategy-option"
+msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:550
+#: en/git-rebase.txt:572
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:575
#, no-wrap, priority:100
msgid "There are some subtle differences how the backends behave.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:556
+#: en/git-rebase.txt:578
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38375,7 +38678,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:561
+#: en/git-rebase.txt:583
#, no-wrap, priority:100
msgid ""
"The am backend drops any \"empty\" commits, regardless of whether the\n"
@@ -38385,7 +38688,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:588
#, no-wrap, priority:100
msgid ""
"The interactive backend drops commits by default that\n"
@@ -38395,7 +38698,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:591
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38403,7 +38706,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:573
+#: en/git-rebase.txt:595
#, no-wrap, priority:100
msgid ""
"Directory rename heuristics are enabled in the merge and interactive\n"
@@ -38412,146 +38715,146 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:597
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:577
+#: en/git-rebase.txt:599
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:582
+#: en/git-rebase.txt:604
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:587
+#: en/git-rebase.txt:609
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:589
+#: en/git-rebase.txt:611
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:596
+#: en/git-rebase.txt:618
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:598
+#: en/git-rebase.txt:620
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:600
+#: en/git-rebase.txt:622
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:601
+#: en/git-rebase.txt:623
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:602
+#: en/git-rebase.txt:624
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:603
+#: en/git-rebase.txt:625
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:605
+#: en/git-rebase.txt:627
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:607
+#: en/git-rebase.txt:629
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:631
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:610
+#: en/git-rebase.txt:632
#, fuzzy, priority:100
msgid "commit"
msgstr "`commit`"
#. type: Plain text
-#: en/git-rebase.txt:612
+#: en/git-rebase.txt:634
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:614
+#: en/git-rebase.txt:636
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:615
+#: en/git-rebase.txt:637
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:616
+#: en/git-rebase.txt:638
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:644
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:646
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:626
+#: en/git-rebase.txt:648
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:653
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:636
-#, no-wrap, priority:100
+#: en/git-rebase.txt:658
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
"pick fa1afe1 The oneline of the next commit\n"
@@ -38559,73 +38862,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:641
+#: en/git-rebase.txt:663
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:668
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:649
+#: en/git-rebase.txt:671
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:652
+#: en/git-rebase.txt:674
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:655
+#: en/git-rebase.txt:677
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:685
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:667
+#: en/git-rebase.txt:689
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:693
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:696
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:699
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:680
+#: en/git-rebase.txt:702
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:687
+#: en/git-rebase.txt:709
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -38636,26 +38939,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:691
+#: en/git-rebase.txt:713
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:694
+#: en/git-rebase.txt:716
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:701
+#: en/git-rebase.txt:723
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:710
-#, no-wrap, priority:100
+#: en/git-rebase.txt:732
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
"fixup f1a5c00 Fix to feature XXX\n"
@@ -38667,31 +38970,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:715
+#: en/git-rebase.txt:737
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:720
-#, priority:100
+#: en/git-rebase.txt:742
+#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:745
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:727
+#: en/git-rebase.txt:749
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:759
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -38705,85 +39008,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:740
+#: en/git-rebase.txt:762
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:746
+#: en/git-rebase.txt:768
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:750
+#: en/git-rebase.txt:772
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:752
+#: en/git-rebase.txt:774
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:756
+#: en/git-rebase.txt:778
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:760
+#: en/git-rebase.txt:782
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:763
+#: en/git-rebase.txt:785
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:765
+#: en/git-rebase.txt:787
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:767
+#: en/git-rebase.txt:789
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:794
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:775
+#: en/git-rebase.txt:797
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:804
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:809
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:816
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38794,13 +39097,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:819
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:826
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38811,14 +39114,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:808
+#: en/git-rebase.txt:830
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:815
-#, no-wrap, priority:100
+#: en/git-rebase.txt:837
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
"\t \\\t\t\t \\\n"
@@ -38828,73 +39131,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:822
+#: en/git-rebase.txt:844
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:824
+#: en/git-rebase.txt:846
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:825
+#: en/git-rebase.txt:847
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:829
+#: en/git-rebase.txt:851
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:836
+#: en/git-rebase.txt:859
#, priority:100
-msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or `filter-branch`."
+msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:839
+#: en/git-rebase.txt:862
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:867
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:848
+#: en/git-rebase.txt:871
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:850
+#: en/git-rebase.txt:873
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:875
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:858
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38905,19 +39208,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:885
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:866
+#: en/git-rebase.txt:889
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:894
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -38927,67 +39230,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:876
+#: en/git-rebase.txt:899
#, priority:100
-msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge-base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
+msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:880
+#: en/git-rebase.txt:903
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:883
+#: en/git-rebase.txt:906
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:886
+#: en/git-rebase.txt:909
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:888
+#: en/git-rebase.txt:911
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:893
+#: en/git-rebase.txt:916
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:895
+#: en/git-rebase.txt:918
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:926
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:907
+#: en/git-rebase.txt:930
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:912
+#: en/git-rebase.txt:935
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:922
+#: en/git-rebase.txt:945
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -39001,25 +39304,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:929
+#: en/git-rebase.txt:952
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:932
+#: en/git-rebase.txt:955
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:935 en/git-rebase.txt:1012
+#: en/git-rebase.txt:958 en/git-rebase.txt:1035
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:941
+#: en/git-rebase.txt:964
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39030,7 +39333,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:946
+#: en/git-rebase.txt:969
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39040,7 +39343,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:950
+#: en/git-rebase.txt:973
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39049,55 +39352,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:954
+#: en/git-rebase.txt:977
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:962
+#: en/git-rebase.txt:985
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:992
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:975
+#: en/git-rebase.txt:998
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:978
+#: en/git-rebase.txt:1001
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1008
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:989
+#: en/git-rebase.txt:1012
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:996
+#: en/git-rebase.txt:1019
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1003
+#: en/git-rebase.txt:1026
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39108,13 +39411,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1009
+#: en/git-rebase.txt:1032
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1015
+#: en/git-rebase.txt:1038
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39122,7 +39425,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1022
+#: en/git-rebase.txt:1045
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39134,7 +39437,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1049
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39143,37 +39446,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1035
+#: en/git-rebase.txt:1058
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1037
+#: en/git-rebase.txt:1060
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1039
+#: en/git-rebase.txt:1062
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1043
+#: en/git-rebase.txt:1066
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1068
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1072
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -39183,7 +39486,7 @@ msgstr ""
#. type: Title =
#: en/git-receive-pack.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-receive-pack(1)"
msgstr "git-receive-pack(1)"
@@ -39273,7 +39576,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:66
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_PUSH_CERT_SIGNER`"
msgstr "`GIT_PUSH_CERT_SIGNER`"
@@ -39285,7 +39588,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:70
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_PUSH_CERT_KEY`"
msgstr "`GIT_PUSH_CERT_KEY`"
@@ -39297,7 +39600,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:73
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_PUSH_CERT_STATUS`"
msgstr "`GIT_PUSH_CERT_STATUS`"
@@ -39309,7 +39612,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:78
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_PUSH_CERT_NONCE`"
msgstr "`GIT_PUSH_CERT_NONCE`"
@@ -39321,13 +39624,13 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:85
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_PUSH_CERT_NONCE_STATUS`"
msgstr "`GIT_PUSH_CERT_NONCE_STATUS`"
#. type: Labeled list
#: en/git-receive-pack.txt:86
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`UNSOLICITED`"
msgstr "`UNSOLICITED`"
@@ -39339,7 +39642,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:89
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`MISSING`"
msgstr "`MISSING`"
@@ -39351,7 +39654,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:91
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`BAD`"
msgstr "`BAD`"
@@ -39363,7 +39666,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:93
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`OK`"
msgstr "`OK`"
@@ -39375,7 +39678,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:95
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`SLOP`"
msgstr "`SLOP`"
@@ -39387,7 +39690,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:100
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_PUSH_CERT_NONCE_SLOP`"
msgstr "`GIT_PUSH_CERT_NONCE_SLOP`"
@@ -39481,124 +39784,124 @@ msgstr ""
msgid "Using this hook, it is easy to generate mails describing the updates to the repository. This example script sends one mail message per ref listing the commits pushed to the repository, and logs the push certificates of signed pushes with good signatures to a logger service:"
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:191
+#. type: delimited block -
+#: en/git-receive-pack.txt:192
#, no-wrap, priority:100
msgid ""
-"\t#!/bin/sh\n"
-"\t# mail out commit update information.\n"
-"\twhile read oval nval ref\n"
-"\tdo\n"
-"\t\tif expr \"$oval\" : '0*$' >/dev/null\n"
-"\t\tthen\n"
-"\t\t\techo \"Created a new ref, with the following commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\"\n"
-"\t\telse\n"
-"\t\t\techo \"New commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
-"\t\tfi |\n"
-"\t\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
-"\tdone\n"
-"\t# log signed push certificate, if any\n"
-"\tif test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"#!/bin/sh\n"
+"# mail out commit update information.\n"
+"while read oval nval ref\n"
+"do\n"
+"\tif expr \"$oval\" : '0*$' >/dev/null\n"
"\tthen\n"
-"\t\t(\n"
-"\t\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
-"\t\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
-"\t\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
-"\tfi\n"
-"\texit 0\n"
+"\t\techo \"Created a new ref, with the following commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\"\n"
+"\telse\n"
+"\t\techo \"New commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
+"\tfi |\n"
+"\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
+"done\n"
+"# log signed push certificate, if any\n"
+"if test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"then\n"
+"\t(\n"
+"\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
+"\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
+"\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
+"fi\n"
+"exit 0\n"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:194
+#: en/git-receive-pack.txt:196
#, priority:100
msgid "The exit code from this hook invocation is ignored, however a non-zero exit code will generate an error message."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:200
+#: en/git-receive-pack.txt:202
#, priority:100
msgid "Note that it is possible for refname to not have sha1-new when this hook runs. This can easily occur if another user modifies the ref after it was updated by 'git-receive-pack', but before the hook was able to evaluate it. It is recommended that hooks rely on sha1-new rather than the current value of refname."
msgstr ""
#. type: Title -
-#: en/git-receive-pack.txt:202
+#: en/git-receive-pack.txt:204
#, no-wrap, priority:100
msgid "POST-UPDATE HOOK"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:207
+#: en/git-receive-pack.txt:209
#, priority:100
msgid "After all other processing, if at least one ref was updated, and if $GIT_DIR/hooks/post-update file exists and is executable, then post-update will be called with the list of refs that have been updated. This can be used to implement any repository wide cleanup tasks."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:211
+#: en/git-receive-pack.txt:213
#, priority:100
msgid "The exit code from this hook invocation is ignored; the only thing left for 'git-receive-pack' to do at that point is to exit itself anyway."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:214
+#: en/git-receive-pack.txt:216
#, priority:100
msgid "This hook can be used, for example, to run `git update-server-info` if the repository is packed and is served via a dumb transport."
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:217
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/git-receive-pack.txt:220
+#, fuzzy, no-wrap, priority:100
msgid ""
-"\t#!/bin/sh\n"
-"\texec git update-server-info\n"
-msgstr ""
+"#!/bin/sh\n"
+"exec git update-server-info\n"
+msgstr "git-update-server-info(1)"
#. type: Title -
-#: en/git-receive-pack.txt:220
+#: en/git-receive-pack.txt:224
#, no-wrap, priority:100
msgid "QUARANTINE ENVIRONMENT"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:227
+#: en/git-receive-pack.txt:231
#, priority:100
msgid "When `receive-pack` takes in objects, they are placed into a temporary \"quarantine\" directory within the `$GIT_DIR/objects` directory and migrated into the main object store only after the `pre-receive` hook has completed. If the push fails before then, the temporary directory is removed entirely."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:229
+#: en/git-receive-pack.txt:233
#, priority:100
msgid "This has a few user-visible effects and caveats:"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:235
+#: en/git-receive-pack.txt:239
#, priority:100
msgid "Pushes which fail due to problems with the incoming pack, missing objects, or due to the `pre-receive` hook will not leave any on-disk data. This is usually helpful to prevent repeated failed pushes from filling up your disk, but can make debugging more challenging."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:238
+#: en/git-receive-pack.txt:242
#, priority:100
msgid "Any objects created by the `pre-receive` hook will be created in the quarantine directory (and migrated only if it succeeds)."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:244
+#: en/git-receive-pack.txt:248
#, priority:100
msgid "The `pre-receive` hook MUST NOT update any refs to point to quarantined objects. Other programs accessing the repository will not be able to see the objects (and if the pre-receive hook fails, those refs would become corrupted). For safety, any ref updates from within `pre-receive` are automatically rejected."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:249
+#: en/git-receive-pack.txt:253
#, ignore-same, priority:100
msgid "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
msgstr "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
#. type: Title =
#: en/git-reflog.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-reflog(1)"
msgstr "git-reflog(1)"
@@ -39616,7 +39919,7 @@ msgstr ""
#. type: Plain text
#: en/git-reflog.txt:27
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git reflog' ['show'] [log-options] [<ref>]\n"
"'git reflog expire' [--expire=<time>] [--expire-unreachable=<time>]\n"
@@ -39689,7 +39992,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:75 en/rev-list-options.txt:193
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--single-worktree"
msgstr "--single-worktree"
@@ -39725,7 +40028,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:98
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--updateref"
msgstr "--updateref"
@@ -39737,7 +40040,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:103
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--rewrite"
msgstr "--rewrite"
@@ -39749,7 +40052,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:108
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--stale-fix"
msgstr "--stale-fix"
@@ -39791,7 +40094,7 @@ msgstr ""
#. type: Title =
#: en/git-remote-ext.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-remote-ext(1)"
msgstr "git-remote-ext(1)"
@@ -39803,7 +40106,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:12
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
msgstr ""
@@ -39857,7 +40160,7 @@ msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:34 en/pretty-formats.txt:189
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%s'"
msgstr "'%s'"
@@ -39869,7 +40172,7 @@ msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:38 en/pretty-formats.txt:186
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%S'"
msgstr "'%S'"
@@ -39917,7 +40220,7 @@ msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:61 en/git-remote-fd.txt:33
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "GIT_TRANSLOOP_DEBUG"
msgstr "GIT_TRANSLOOP_DEBUG"
@@ -39935,25 +40238,25 @@ msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:67
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "GIT_EXT_SERVICE"
msgstr "GIT_EXT_SERVICE"
#. type: Plain text
#: en/git-remote-ext.txt:70
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Set to long name (git-upload-pack, etc...) of service helper needs to invoke."
msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:71
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "GIT_EXT_SERVICE_NOPREFIX"
msgstr "GIT_EXT_SERVICE_NOPREFIX"
#. type: Plain text
#: en/git-remote-ext.txt:74
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Set to long name (upload-pack, etc...) of service helper needs to invoke."
msgstr ""
@@ -40043,7 +40346,7 @@ msgstr "linkgit:gitremote-helpers[7]"
#. type: Title =
#: en/git-remote-fd.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-remote-fd(1)"
msgstr "git-remote-fd(1)"
@@ -40121,7 +40424,7 @@ msgstr ""
#. type: Title =
#: en/git-remote.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "git-remote(1)"
msgstr "git-remote(1)"
@@ -40133,7 +40436,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:25
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git remote' [-v | --verbose]\n"
"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
@@ -40452,7 +40755,7 @@ msgstr ""
#. type: delimited block -
#: en/git-remote.txt:235
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"$ git remote\n"
"origin\n"
@@ -40504,7 +40807,7 @@ msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-repack.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-repack(1)"
msgstr "git-repack(1)"
@@ -40612,7 +40915,7 @@ msgstr ""
#. type: Labeled list
#: en/git-repack.txt:127
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--write-bitmap-index"
msgstr "--write-bitmap-index"
@@ -40624,7 +40927,7 @@ msgstr ""
#. type: Labeled list
#: en/git-repack.txt:134
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--pack-kept-objects"
msgstr "--pack-kept-objects"
@@ -40684,7 +40987,7 @@ msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
#. type: Title =
#: en/git-replace.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-replace(1)"
msgstr "git-replace(1)"
@@ -40696,7 +40999,7 @@ msgstr "Crea, elenca, elimina i riferimenti per sostituire oggetti"
#. type: Plain text
#: en/git-replace.txt:17
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git replace' [-f] <object> <replacement>\n"
"'git replace' [-f] --edit <object>\n"
@@ -40816,19 +41119,19 @@ msgstr ""
#. type: Labeled list
#: en/git-replace.txt:86
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "--graft <commit> [<parent>...]"
msgstr ""
#. type: Plain text
#: en/git-replace.txt:93
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Create a graft commit. A new commit is created with the same content as <commit> except that its parents will be [<parent>...] instead of <commit>'s parents. A replacement ref is then created to replace <commit> with the newly created commit. Use `--convert-graft-file` to convert a `$GIT_DIR/info/grafts` file and use replace refs instead."
msgstr ""
#. type: Labeled list
#: en/git-replace.txt:94
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--convert-graft-file"
msgstr "--convert-graft-file"
@@ -40919,7 +41222,7 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:131
#, priority:100
-msgid "linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and linkgit:git-rebase[1], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
+msgid "linkgit:git-hash-object[1], linkgit:git-rebase[1], and https://github.com/newren/git-filter-repo[git-filter-repo], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
msgstr ""
#. type: Plain text
@@ -40942,13 +41245,14 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:158
-#, priority:100
-msgid "linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1]"
-msgstr ""
+#, fuzzy, priority:100
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] https://github.com/newren/git-filter-repo[git-filter-repo]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title =
#: en/git-request-pull.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-request-pull(1)"
msgstr "git-request-pull(1)"
@@ -41080,7 +41384,7 @@ msgstr ""
#. type: Title =
#: en/git-rerere.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-rerere(1)"
msgstr "git-rerere(1)"
@@ -41244,7 +41548,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rerere.txt:121
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git switch topic\n"
"\t$ git merge master\n"
@@ -41276,7 +41580,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rerere.txt:145
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git switch topic\n"
"\t$ git merge master\n"
@@ -41369,7 +41673,7 @@ msgstr ""
#. type: Title =
#: en/git-reset.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "git-reset(1)"
msgstr "git-reset(1)"
@@ -41381,7 +41685,7 @@ msgstr "Ripristina l'HEAD corrente allo stato specificato"
#. type: Plain text
#: en/git-reset.txt:14
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git reset' [-q] [<tree-ish>] [--] <paths>...\n"
"'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...]\n"
@@ -41396,7 +41700,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:22
-#, fuzzy, no-wrap, priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "'git reset' [-q] [<tree-ish>] [--] <paths>..."
msgstr "git reset [-q] [<espressione albero>] [--] <percorsi>..."
@@ -41408,7 +41712,7 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:30
-#, priority:280
+#, ignore-ellipsis, priority:280
msgid "This means that `git reset <paths>` is the opposite of `git add <paths>`. This command is equivalent to `git restore [--source=<tree-ish>] --staged <paths>...`."
msgstr ""
@@ -41420,7 +41724,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:38
-#, fuzzy, no-wrap, priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...]"
msgstr "git reset --patch [<espressione albero>] [--] [<percorsi>...]"
@@ -41450,7 +41754,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:54
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--soft"
msgstr "--soft"
@@ -41462,7 +41766,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:60
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--mixed"
msgstr "--mixed"
@@ -41480,7 +41784,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:68
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--hard"
msgstr "--hard"
@@ -41516,7 +41820,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:99
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--no-quiet"
msgstr "--no-quiet"
@@ -41575,7 +41879,7 @@ msgstr ""
#. type: delimited block -
#: en/git-reset.txt:138
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git commit ...\n"
"$ git reset --soft HEAD^ <1>\n"
@@ -41648,7 +41952,7 @@ msgstr ""
#. type: delimited block -
#: en/git-reset.txt:170
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git commit ...\n"
"$ git reset --hard HEAD~3 <1>\n"
@@ -41668,7 +41972,7 @@ msgstr ""
#. type: delimited block -
#: en/git-reset.txt:190
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git pull <1>\n"
"Auto-merging nitfol\n"
@@ -41713,7 +42017,7 @@ msgstr ""
#. type: delimited block -
#: en/git-reset.txt:215
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git pull <1>\n"
"Auto-merging nitfol\n"
@@ -41736,7 +42040,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:228 en/git-stash.txt:229
+#: en/git-reset.txt:228 en/git-stash.txt:230
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -41839,7 +42143,7 @@ msgstr ""
#. type: delimited block -
#: en/git-reset.txt:289
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git tag start\n"
"$ git switch -c branch1\n"
@@ -41882,7 +42186,7 @@ msgstr ""
#. type: delimited block -
#: en/git-reset.txt:317
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git reset -N HEAD^ <1>\n"
"$ git add -p <2>\n"
@@ -42096,7 +42400,7 @@ msgstr ""
#. type: Title =
#: en/git-restore.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-restore(1)"
msgstr "git-restore(1)"
@@ -42108,7 +42412,7 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] <pathspec>...\n"
"'git restore' (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [<pathspec>...]\n"
@@ -42182,7 +42486,7 @@ msgstr ""
#. type: Labeled list
#: en/git-restore.txt:59
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--staged"
msgstr "--staged"
@@ -42218,7 +42522,7 @@ msgstr ""
#. type: Labeled list
#: en/git-restore.txt:96
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--ignore-unmerged"
msgstr "--ignore-unmerged"
@@ -42348,7 +42652,7 @@ msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
#. type: Title =
#: en/git-revert.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-revert(1)"
msgstr "git-revert(1)"
@@ -42360,7 +42664,7 @@ msgstr ""
#. type: Plain text
#: en/git-revert.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] <commit>...\n"
"'git revert' (--continue | --skip | --abort | --quit)\n"
@@ -42452,7 +42756,7 @@ msgstr ""
#. type: Title =
#: en/git-rev-list.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-rev-list(1)"
msgstr "git-rev-list(1)"
@@ -42463,102 +42767,49 @@ msgid "git-rev-list - Lists commit objects in reverse chronological order"
msgstr "Elenca gli oggetti commit in ordine cronologico inverso"
#. type: Plain text
-#: en/git-rev-list.txt:65
-#, no-wrap, priority:100
-msgid ""
-"'git rev-list' [ --max-count=<number> ]\n"
-"\t [ --skip=<number> ]\n"
-"\t [ --max-age=<timestamp> ]\n"
-"\t [ --min-age=<timestamp> ]\n"
-"\t [ --sparse ]\n"
-"\t [ --merges ]\n"
-"\t [ --no-merges ]\n"
-"\t [ --min-parents=<number> ]\n"
-"\t [ --no-min-parents ]\n"
-"\t [ --max-parents=<number> ]\n"
-"\t [ --no-max-parents ]\n"
-"\t [ --first-parent ]\n"
-"\t [ --remove-empty ]\n"
-"\t [ --full-history ]\n"
-"\t [ --not ]\n"
-"\t [ --all ]\n"
-"\t [ --branches[=<pattern>] ]\n"
-"\t [ --tags[=<pattern>] ]\n"
-"\t [ --remotes[=<pattern>] ]\n"
-"\t [ --glob=<glob-pattern> ]\n"
-"\t [ --ignore-missing ]\n"
-"\t [ --stdin ]\n"
-"\t [ --quiet ]\n"
-"\t [ --topo-order ]\n"
-"\t [ --parents ]\n"
-"\t [ --timestamp ]\n"
-"\t [ --left-right ]\n"
-"\t [ --left-only ]\n"
-"\t [ --right-only ]\n"
-"\t [ --cherry-mark ]\n"
-"\t [ --cherry-pick ]\n"
-"\t [ --encoding=<encoding> ]\n"
-"\t [ --(author|committer|grep)=<pattern> ]\n"
-"\t [ --regexp-ignore-case | -i ]\n"
-"\t [ --extended-regexp | -E ]\n"
-"\t [ --fixed-strings | -F ]\n"
-"\t [ --date=<format>]\n"
-"\t [ [ --objects | --objects-edge | --objects-edge-aggressive ]\n"
-"\t [ --unpacked ]\n"
-"\t [ --object-names | --no-object-names ]\n"
-"\t [ --filter=<filter-spec> [ --filter-print-omitted ] ] ]\n"
-"\t [ --missing=<missing-action> ]\n"
-"\t [ --pretty | --header ]\n"
-"\t [ --bisect ]\n"
-"\t [ --bisect-vars ]\n"
-"\t [ --bisect-all ]\n"
-"\t [ --merge ]\n"
-"\t [ --reverse ]\n"
-"\t [ --walk-reflogs ]\n"
-"\t [ --no-walk ] [ --do-walk ]\n"
-"\t [ --count ]\n"
-"\t [ --use-bitmap-index ]\n"
-"\t <commit>... [ \\-- <paths>... ]\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:73
+#: en/git-rev-list.txt:13
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
+msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n"
+msgstr "git difftool [<opzioni>] [<commit> [<commit>]] [--] [<percorso>...]"
+
+#. type: Plain text
+#: en/git-rev-list.txt:21
#, priority:100
msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:80
+#: en/git-rev-list.txt:28
#, priority:100
msgid "You can think of this as a set operation. Commits given on the command line form a set of commits that are reachable from any of them, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:82
+#: en/git-rev-list.txt:30
#, priority:100
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:85
+#: en/git-rev-list.txt:33
#, no-wrap, priority:100
msgid "\t$ git rev-list foo bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:89
+#: en/git-rev-list.txt:37
#, priority:100
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:93
+#: en/git-rev-list.txt:41
#, priority:100
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:97
+#: en/git-rev-list.txt:45
#, no-wrap, priority:100
msgid ""
"\t$ git rev-list origin..HEAD\n"
@@ -42566,28 +42817,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:102
-#, priority:100
+#: en/git-rev-list.txt:50
+#, ignore-ellipsis, priority:100
msgid "Another special notation is \"'<commit1>'...'<commit2>'\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:106
-#, no-wrap, priority:100
+#: en/git-rev-list.txt:54
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git rev-list A B --not $(git merge-base --all A B)\n"
"\t$ git rev-list A...B\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:113
+#: en/git-rev-list.txt:61
#, priority:100
msgid "'rev-list' is a very essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For this reason, it has a lot of different options that enables it to be used by commands as different as 'git bisect' and 'git repack'."
msgstr ""
#. type: Title =
#: en/git-rev-parse.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-rev-parse(1)"
msgstr "git-rev-parse(1)"
@@ -42599,7 +42850,7 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git rev-parse' [<options>] <args>...\n"
msgstr ""
@@ -42623,7 +42874,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:33
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--parseopt"
msgstr "--parseopt"
@@ -42635,7 +42886,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:36
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--sq-quote"
msgstr "--sq-quote"
@@ -42653,7 +42904,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:44
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--keep-dashdash"
msgstr "--keep-dashdash"
@@ -42665,7 +42916,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:48
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--stop-at-non-option"
msgstr "--stop-at-non-option"
@@ -42677,7 +42928,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:53
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--stuck-long"
msgstr "--stuck-long"
@@ -42695,7 +42946,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:60
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--revs-only"
msgstr "--revs-only"
@@ -42707,7 +42958,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:64
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-revs"
msgstr "--no-revs"
@@ -42719,7 +42970,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:68
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--flags"
msgstr "--flags"
@@ -42731,7 +42982,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:71
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-flags"
msgstr "--no-flags"
@@ -42807,7 +43058,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:120
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--sq"
msgstr "--sq"
@@ -42849,7 +43100,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:145
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--symbolic"
msgstr "--symbolic"
@@ -42861,7 +43112,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:150
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--symbolic-full-name"
msgstr "--symbolic-full-name"
@@ -42963,7 +43214,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:205
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--local-env-vars"
msgstr "--local-env-vars"
@@ -42975,7 +43226,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:211
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--git-dir"
msgstr "--git-dir"
@@ -42993,7 +43244,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:220
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--absolute-git-dir"
msgstr "--absolute-git-dir"
@@ -43005,7 +43256,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:224
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--git-common-dir"
msgstr "--git-common-dir"
@@ -43017,7 +43268,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:227
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--is-inside-git-dir"
msgstr "--is-inside-git-dir"
@@ -43029,7 +43280,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:231
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--is-inside-work-tree"
msgstr "--is-inside-work-tree"
@@ -43041,7 +43292,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:235
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--is-bare-repository"
msgstr "--is-bare-repository"
@@ -43053,7 +43304,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:238
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--is-shallow-repository"
msgstr "--is-shallow-repository"
@@ -43083,13 +43334,13 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:253
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Resolve \"$GIT_DIR/<path>\" and takes other path relocation variables such as $GIT_OBJECT_DIRECTORY, $GIT_INDEX_FILE... into account. For example, if $GIT_OBJECT_DIRECTORY is set to /foo/bar then \"git rev-parse --git-path objects/abc\" returns /foo/bar/abc."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:254
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--show-cdup"
msgstr "--show-cdup"
@@ -43101,7 +43352,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:259
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--show-prefix"
msgstr "--show-prefix"
@@ -43113,7 +43364,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:264
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--show-toplevel"
msgstr "--show-toplevel"
@@ -43125,7 +43376,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:267
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--show-superproject-working-tree"
msgstr "--show-superproject-working-tree"
@@ -43137,7 +43388,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:273
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--shared-index-path"
msgstr "--shared-index-path"
@@ -43191,7 +43442,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:290
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<args>..."
msgstr ""
@@ -43323,7 +43574,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:364
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"OPTS_SPEC=\"\\\n"
"some-command [<options>] <args>...\n"
@@ -43381,7 +43632,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:389
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "usage: some-command [<options>] <args>...\n"
msgstr ""
@@ -43393,7 +43644,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:397
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" -h, --help show the help\n"
" --foo some nifty option --foo\n"
@@ -43404,7 +43655,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:400
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"An option group Header\n"
" -C[...] option C with an optional argument\n"
@@ -43497,7 +43748,7 @@ msgstr ""
#. type: Title =
#: en/git-rm.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "git-rm(1)"
msgstr "git-rm(1)"
@@ -43509,7 +43760,7 @@ msgstr "Rimuove file dall'albero di lavoro e dall'indice"
#. type: Plain text
#: en/git-rm.txt:12
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...\n"
msgstr ""
@@ -43551,7 +43802,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rm.txt:63
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
@@ -43725,7 +43976,7 @@ msgstr ""
#. type: Title =
#: en/git-send-email.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-send-email(1)"
msgstr "git-send-email(1)"
@@ -43737,7 +43988,7 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:14
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git send-email' [<options>] <file|directory|rev-list options>...\n"
"'git send-email' --dump-aliases\n"
@@ -43793,7 +44044,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:48 en/git-tag.txt:61
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--annotate"
msgstr "--annotate"
@@ -43805,7 +44056,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:53
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "--bcc=<address>,..."
msgstr ""
@@ -43823,7 +44074,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:59
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "--cc=<address>,..."
msgstr ""
@@ -43835,7 +44086,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:65
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--compose"
msgstr "--compose"
@@ -43907,7 +44158,7 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:110
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" [PATCH 0/2] Here is what I did...\n"
" [PATCH 1/2] Clean up and tests\n"
@@ -43938,7 +44189,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:119
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "--to=<address>,..."
msgstr ""
@@ -43998,13 +44249,13 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:152
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--xmailer"
msgstr "--xmailer"
#. type: Labeled list
#: en/git-send-email.txt:153
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-xmailer"
msgstr "--no-xmailer"
@@ -44070,7 +44321,7 @@ msgstr ""
#. type: delimited block -
#: en/git-send-email.txt:188
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
msgstr ""
@@ -44100,7 +44351,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:209
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-smtp-auth"
msgstr "--no-smtp-auth"
@@ -44154,7 +44405,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:239
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--smtp-ssl"
msgstr "--smtp-ssl"
@@ -44166,7 +44417,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:242
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--smtp-ssl-cert-path"
msgstr "--smtp-ssl-cert-path"
@@ -44244,7 +44495,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:285
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-identity"
msgstr "--no-identity"
@@ -44280,7 +44531,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:301
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]chain-reply-to"
msgstr "--[no-]chain-reply-to"
@@ -44304,7 +44555,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:315
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]signed-off-by-cc"
msgstr "--[no-]signed-off-by-cc"
@@ -44316,7 +44567,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:320
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]cc-cover"
msgstr "--[no-]cc-cover"
@@ -44328,7 +44579,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:326
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]to-cover"
msgstr "--[no-]to-cover"
@@ -44412,7 +44663,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:357
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]suppress-from"
msgstr "--[no-]suppress-from"
@@ -44424,7 +44675,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:362
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]thread"
msgstr "--[no-]thread"
@@ -44508,7 +44759,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:403
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]format-patch"
msgstr "--[no-]format-patch"
@@ -44526,7 +44777,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:413
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]validate"
msgstr "--[no-]validate"
@@ -44578,7 +44829,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:436
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--dump-aliases"
msgstr "--dump-aliases"
@@ -44590,7 +44841,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:446
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "sendemail.aliasesFile"
msgstr "sendemail.aliasesFile"
@@ -44602,7 +44853,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:450
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "sendemail.aliasFileType"
msgstr "sendemail.aliasFileType"
@@ -44668,7 +44919,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:471
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "sendemail.multiEdit"
msgstr "sendemail.multiEdit"
@@ -44680,7 +44931,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:477
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "sendemail.confirm"
msgstr "sendemail.confirm"
@@ -44702,31 +44953,31 @@ msgstr ""
msgid "To use 'git send-email' to send your patches through the GMail SMTP server, edit ~/.gitconfig to specify your account settings:"
msgstr ""
-#. type: Plain text
-#: en/git-send-email.txt:494
+#. type: delimited block -
+#: en/git-send-email.txt:495
#, no-wrap, priority:100
msgid ""
-"\t[sendemail]\n"
-"\t\tsmtpEncryption = tls\n"
-"\t\tsmtpServer = smtp.gmail.com\n"
-"\t\tsmtpUser = yourname@gmail.com\n"
-"\t\tsmtpServerPort = 587\n"
+"[sendemail]\n"
+"\tsmtpEncryption = tls\n"
+"\tsmtpServer = smtp.gmail.com\n"
+"\tsmtpUser = yourname@gmail.com\n"
+"\tsmtpServerPort = 587\n"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:498
+#: en/git-send-email.txt:500
#, priority:100
msgid "If you have multifactor authentication setup on your gmail account, you will need to generate an app-specific password for use with 'git send-email'. Visit https://security.google.com/settings/security/apppasswords to create it."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:501
+#: en/git-send-email.txt:503
#, priority:100
msgid "Once your commits are ready to be sent to the mailing list, run the following commands:"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:505
+#: en/git-send-email.txt:507
#, no-wrap, priority:100
msgid ""
"\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -44735,26 +44986,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:510
+#: en/git-send-email.txt:512
#, priority:100
msgid "The first time you run it, you will be prompted for your credentials. Enter the app-specific or your regular password as appropriate. If you have credential helper configured (see linkgit:git-credential[1]), the password will be saved in the credential store so you won't have to type it the next time."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:518
#, priority:100
msgid "Note: the following core Perl modules that may be installed with your distribution of Perl are required: MIME::Base64, MIME::QuotedPrint, Net::Domain and Net::SMTP. These additional Perl modules are also required: Authen::SASL and Mail::Address."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:521
+#: en/git-send-email.txt:523
#, priority:100
msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
msgstr ""
#. type: Title =
#: en/git-send-pack.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-send-pack(1)"
msgstr "git-send-pack(1)"
@@ -44766,7 +45017,7 @@ msgstr "Esegue il push di oggetti su un altro repository tramite il protocollo G
#. type: Plain text
#: en/git-send-pack.txt:16
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>]\n"
"\t\t[--verbose] [--thin] [--atomic]\n"
@@ -44806,7 +45057,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-pack.txt:68
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--atomic"
msgstr "--atomic"
@@ -44884,7 +45135,7 @@ msgstr ""
#. type: Title =
#: en/git-shell.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-shell(1)"
msgstr "git-shell(1)"
@@ -45079,7 +45330,7 @@ msgstr ""
#. type: Title =
#: en/git-sh-i18n.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-sh-i18n(1)"
msgstr "git-sh-i18n(1)"
@@ -45127,7 +45378,7 @@ msgstr ""
#. type: Title =
#: en/git-shortlog.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "git-shortlog(1)"
msgstr "git-shortlog(1)"
@@ -45139,7 +45390,7 @@ msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:13
-#, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git shortlog' [<options>] [<revision range>] [[--] <path>...]\n"
"git log --pretty=short | 'git shortlog' [<options>]\n"
@@ -45177,7 +45428,7 @@ msgstr ""
#. type: Labeled list
#: en/git-shortlog.txt:39
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--email"
msgstr "--email"
@@ -45207,7 +45458,7 @@ msgstr ""
#. type: Labeled list
#: en/git-shortlog.txt:51
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--committer"
msgstr "--committer"
@@ -45255,7 +45506,7 @@ msgstr ""
#. type: Title =
#: en/git-show-branch.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-show-branch(1)"
msgstr "git-show-branch(1)"
@@ -45267,7 +45518,7 @@ msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:17
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git show-branch' [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -45337,7 +45588,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:51
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--current"
msgstr "--current"
@@ -45349,7 +45600,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:56 en/rev-list-options.txt:652
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--topo-order"
msgstr "--topo-order"
@@ -45361,7 +45612,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:62 en/rev-list-options.txt:644
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--date-order"
msgstr "--date-order"
@@ -45397,7 +45648,7 @@ msgstr "sinonimo di more=-1"
#. type: Labeled list
#: en/git-show-branch.txt:83
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--merge-base"
msgstr "--merge-base"
@@ -45415,7 +45666,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:94
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-name"
msgstr "--no-name"
@@ -45427,7 +45678,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:97
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--sha1-name"
msgstr "--sha1-name"
@@ -45439,7 +45690,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:103
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--topics"
msgstr "--topics"
@@ -45566,7 +45817,7 @@ msgstr ""
#. type: Title =
#: en/git-show-index.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-show-index(1)"
msgstr "git-show-index(1)"
@@ -45620,7 +45871,7 @@ msgstr ""
#. type: Title =
#: en/git-show-ref.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-show-ref(1)"
msgstr "git-show-ref(1)"
@@ -45632,7 +45883,7 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:15
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git show-ref' [-q|--quiet] [--verify] [--head] [-d|--dereference]\n"
"\t [-s|--hash[=<n>]] [--abbrev[=<n>]] [--tags]\n"
@@ -45666,7 +45917,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-ref.txt:36
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--head"
msgstr "--head"
@@ -45684,7 +45935,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-ref.txt:48
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--dereference"
msgstr "--dereference"
@@ -45780,7 +46031,7 @@ msgstr ""
#. type: delimited block -
#: en/git-show-ref.txt:111
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git show-ref --head --dereference\n"
"832e76a9899f560a90ffd62ae2ce83bbeff58f54 HEAD\n"
@@ -45801,7 +46052,7 @@ msgstr ""
#. type: delimited block -
#: en/git-show-ref.txt:121
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git show-ref --heads --hash\n"
"2e3ba0114a1f52b47df29743d6915d056be13278\n"
@@ -45910,7 +46161,7 @@ msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-updat
#. type: Title =
#: en/git-show.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "git-show(1)"
msgstr "git-show(1)"
@@ -45922,7 +46173,7 @@ msgstr ""
#. type: Plain text
#: en/git-show.txt:13
-#, fuzzy, no-wrap, priority:260
+#, fuzzy, ignore-ellipsis, no-wrap, priority:260
msgid "'git show' [<options>] [<object>...]\n"
msgstr "git show [<opzioni>] <oggetto>..."
@@ -45970,7 +46221,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show.txt:37
-#, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:260
msgid "<object>..."
msgstr ""
@@ -46042,7 +46293,7 @@ msgstr ""
#. type: Title =
#: en/git-sh-setup.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-sh-setup(1)"
msgstr "git-sh-setup(1)"
@@ -46078,7 +46329,7 @@ msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:36
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "die"
msgstr "die"
@@ -46090,7 +46341,7 @@ msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:40
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "usage"
msgstr "usage"
@@ -46102,7 +46353,7 @@ msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:43
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "set_reflog_action"
msgstr "set_reflog_action"
@@ -46114,7 +46365,7 @@ msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:50
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git_editor"
msgstr "git_editor"
@@ -46138,7 +46389,7 @@ msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:60
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "cd_to_toplevel"
msgstr "cd_to_toplevel"
@@ -46150,7 +46401,7 @@ msgstr "Impossibile modificare la directory corrente in $cdup, il primo livello
#. type: Labeled list
#: en/git-sh-setup.txt:63
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "require_work_tree"
msgstr "require_work_tree"
@@ -46162,7 +46413,7 @@ msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:67
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "require_work_tree_exists"
msgstr "require_work_tree_exists"
@@ -46192,7 +46443,7 @@ msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:83
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "get_author_ident_from_commit"
msgstr "get_author_ident_from_commit"
@@ -46204,7 +46455,7 @@ msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:87
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "create_virtual_base"
msgstr "create_virtual_base"
@@ -46216,7 +46467,7 @@ msgstr ""
#. type: Title =
#: en/git-stage.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-stage(1)"
msgstr "git-stage(1)"
@@ -46228,7 +46479,7 @@ msgstr "Aggiunge i contenuti dei file all'area di staging"
#. type: Plain text
#: en/git-stage.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git stage' args...\n"
msgstr ""
@@ -46240,7 +46491,7 @@ msgstr ""
#. type: Title =
#: en/git-stash.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "git-stash(1)"
msgstr "git-stash(1)"
@@ -46252,7 +46503,7 @@ msgstr "Mette da parte le modifiche in una directory di lavoro sporca"
#. type: Plain text
#: en/git-stash.txt:22
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git stash' list [<options>]\n"
"'git stash' show [<options>] [<stash>]\n"
@@ -46275,7 +46526,7 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:38
-#, priority:240
+#, ignore-ellipsis, priority:240
msgid "The modifications stashed away by this command can be listed with `git stash list`, inspected with `git stash show`, and restored (potentially on top of a different commit) with `git stash apply`. Calling `git stash` without any arguments is equivalent to `git stash push`. A stash is by default listed as \"WIP on 'branchname' ...\", but you can give a more descriptive message on the command line when you create one."
msgstr ""
@@ -46287,7 +46538,7 @@ msgstr ""
#. type: Labeled list
#: en/git-stash.txt:49
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
msgstr ""
@@ -46340,165 +46591,165 @@ msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--a
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:92
+#: en/git-stash.txt:93
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs, and any non-option arguments form the message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:93
+#: en/git-stash.txt:94
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:100
+#: en/git-stash.txt:101
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:104
-#, no-wrap, priority:240
+#: en/git-stash.txt:105
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
"stash@{1}: On master: 9cc0589... Add git-stash\n"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:108
+#: en/git-stash.txt:109
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:109
+#: en/git-stash.txt:110
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:119
+#: en/git-stash.txt:120
#, priority:240
msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:120
+#: en/git-stash.txt:121
#, fuzzy, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
#. type: Plain text
-#: en/git-stash.txt:126
+#: en/git-stash.txt:127
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:130
+#: en/git-stash.txt:131
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:135
+#: en/git-stash.txt:136
#, priority:240
msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:138
+#: en/git-stash.txt:139
#, priority:240
msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:139
+#: en/git-stash.txt:140
#, fuzzy, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
#. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:145
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:145
+#: en/git-stash.txt:146
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:153
+#: en/git-stash.txt:154
#, priority:240
msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:159
+#: en/git-stash.txt:160
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:160
+#: en/git-stash.txt:161
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:164
+#: en/git-stash.txt:165
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:165
+#: en/git-stash.txt:166
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:171
+#: en/git-stash.txt:172
#, priority:240
msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:172 en/git-update-ref.txt:100
+#: en/git-stash.txt:173 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:179
+#: en/git-stash.txt:180
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:180
+#: en/git-stash.txt:181
#, fuzzy, no-wrap, priority:240
msgid "store"
msgstr "punteggio"
#. type: Plain text
-#: en/git-stash.txt:186
+#: en/git-stash.txt:187
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:195
+#: en/git-stash.txt:196
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:199
+#: en/git-stash.txt:200
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46507,32 +46758,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:203
+#: en/git-stash.txt:204
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:208
+#: en/git-stash.txt:209
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:214
+#: en/git-stash.txt:215
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:219
+#: en/git-stash.txt:220
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:227
-#, no-wrap, priority:240
+#: en/git-stash.txt:228
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
" ...\n"
@@ -46543,14 +46794,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:235
+#: en/git-stash.txt:236
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:246
-#, no-wrap, priority:240
+#: en/git-stash.txt:247
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
"$ git switch -c my_wip\n"
@@ -46564,14 +46815,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:249
+#: en/git-stash.txt:250
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:257
-#, no-wrap, priority:240
+#: en/git-stash.txt:258
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
"$ git stash\n"
@@ -46582,20 +46833,20 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:259
+#: en/git-stash.txt:260
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:264
+#: en/git-stash.txt:265
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:275
-#, no-wrap, priority:240
+#: en/git-stash.txt:276
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
"$ git add --patch foo # add just first part to the index\n"
@@ -46609,19 +46860,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:277
+#: en/git-stash.txt:278
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:283
+#: en/git-stash.txt:284
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:288
+#: en/git-stash.txt:289
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -46630,14 +46881,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:298
+#: en/git-stash.txt:299
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
#. type: Title =
#: en/git-status.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "git-status(1)"
msgstr "git-status(1)"
@@ -46649,7 +46900,7 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:13
-#, fuzzy, no-wrap, priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "'git status' [<options>...] [--] [<pathspec>...]\n"
msgstr "git status [<opzioni>] [--] <specificatore percorso>..."
@@ -46667,7 +46918,7 @@ msgstr ""
#. type: Labeled list
#: en/git-status.txt:35
-#, no-wrap, ignore-same, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--show-stash"
msgstr "--show-stash"
@@ -46708,61 +46959,61 @@ msgid "In addition to the names of files that have been changed, also show the t
msgstr ""
#. type: Plain text
-#: en/git-status.txt:65
+#: en/git-status.txt:66
#, priority:280
msgid "The mode parameter is used to specify the handling of untracked files. It is optional: it defaults to 'all', and if specified, it must be stuck to the option (e.g. `-uno`, but not `-u no`)."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:69
+#: en/git-status.txt:70
#, no-wrap, priority:280
msgid "'no' - Show no untracked files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:70
+#: en/git-status.txt:71
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:81
+#: en/git-status.txt:82
#, priority:280
msgid "When `-u` option is not used, untracked files and directories are shown (i.e. the same as specifying `normal`), to help you avoid forgetting to add newly created files. Because it takes extra work to find untracked files in the filesystem, this mode may take some time in a large working tree. Consider enabling untracked cache and split index if supported (see `git update-index --untracked-cache` and `git update-index --split-index`), Otherwise you can use `no` to have `git status` return more quickly without showing untracked files."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:99
+#: en/git-status.txt:101
#, priority:280
msgid "Ignore changes to submodules when looking for changes. <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 before 1.7.0). Using \"all\" hides all changes to submodules (and suppresses the output of submodule summaries when the config option `status.submoduleSummary` is set)."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:100
+#: en/git-status.txt:102
#, no-wrap, priority:280
msgid "--ignored[=<mode>]"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:102
+#: en/git-status.txt:104
#, priority:280
msgid "Show ignored files as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:105
+#: en/git-status.txt:108
#, priority:280
msgid "The mode parameter is used to specify the handling of ignored files. It is optional: it defaults to 'traditional'."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:109
+#: en/git-status.txt:112
#, priority:280
msgid "'traditional' - Shows ignored files and directories, unless"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:112
+#: en/git-status.txt:115
#, no-wrap, priority:280
msgid ""
"--untracked-files=all is specified, in which case\n"
@@ -46771,109 +47022,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:113
+#: en/git-status.txt:116
#, no-wrap, priority:280
msgid "'no'\t - Show no ignored files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:114
+#: en/git-status.txt:117
#, no-wrap, priority:280
msgid "'matching' - Shows ignored files and directories matching an\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:115
+#: en/git-status.txt:118
#, no-wrap, priority:280
msgid "ignore pattern.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:121
+#: en/git-status.txt:124
#, priority:280
msgid "When 'matching' mode is specified, paths that explicitly match an ignored pattern are shown. If a directory matches an ignore pattern, then it is shown, but not paths contained in the ignored directory. If a directory does not match an ignore pattern, but all contents are ignored, then the directory is not shown, but all contents are shown."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:125
+#: en/git-status.txt:129
#, priority:280
msgid "Terminate entries with NUL, instead of LF. This implies the `--porcelain=v1` output format if no other format is given."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:132
+#: en/git-status.txt:136
#, priority:280
msgid "Display untracked files in columns. See configuration variable column.status for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:133
-#, no-wrap, ignore-same, no-wrap, priority:280
+#: en/git-status.txt:137
+#, ignore-same, no-wrap, priority:280
msgid "--ahead-behind"
msgstr "--ahead-behind"
#. type: Labeled list
-#: en/git-status.txt:134
-#, no-wrap, ignore-same, no-wrap, priority:280
+#: en/git-status.txt:138
+#, ignore-same, no-wrap, priority:280
msgid "--no-ahead-behind"
msgstr "--no-ahead-behind"
#. type: Plain text
-#: en/git-status.txt:137
+#: en/git-status.txt:141
#, priority:280
msgid "Display or do not display detailed ahead/behind counts for the branch relative to its upstream branch. Defaults to true."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:138
-#, no-wrap, ignore-same, no-wrap, priority:280
+#: en/git-status.txt:142
+#, ignore-same, no-wrap, priority:280
msgid "--renames"
msgstr "--renames"
#. type: Plain text
-#: en/git-status.txt:142
+#: en/git-status.txt:146
#, priority:280
msgid "Turn on/off rename detection regardless of user configuration. See also linkgit:git-diff[1] `--no-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:147
+#: en/git-status.txt:151
#, priority:280
msgid "Turn on rename detection, optionally setting the similarity threshold. See also linkgit:git-diff[1] `--find-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:150
+#: en/git-status.txt:154
#, priority:280
msgid "See the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:158
+#: en/git-status.txt:162
#, priority:280
msgid "The output from this command is designed to be used as a commit template comment. The default, long format, is designed to be human readable, verbose and descriptive. Its contents and format are subject to change at any time."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:163
+#: en/git-status.txt:167
#, priority:280
msgid "The paths mentioned in the output, unlike many other Git commands, are made relative to the current directory if you are working in a subdirectory (this is on purpose, to help cutting and pasting). See the status.relativePaths config option below."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:165
+#: en/git-status.txt:169
#, no-wrap, priority:280
msgid "Short Format"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:169
+#: en/git-status.txt:173
#, priority:280
msgid "In the short-format, the status of each path is shown as one of these forms"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:172
+#: en/git-status.txt:176
#, no-wrap, priority:280
msgid ""
"\tXY PATH\n"
@@ -46881,73 +47132,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:176
+#: en/git-status.txt:180
#, priority:280
msgid "where `ORIG_PATH` is where the renamed/copied contents came from. `ORIG_PATH` is only shown when the entry is renamed or copied. The `XY` is a two-letter status code."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:182
+#: en/git-status.txt:186
#, priority:280
msgid "The fields (including the `->`) are separated from each other by a single space. If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash-escaped."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:188
+#: en/git-status.txt:192
#, priority:280
msgid "For paths with merge conflicts, `X` and `Y` show the modification states of each side of the merge. For paths that do not have merge conflicts, `X` shows the status of the index, and `Y` shows the status of the work tree. For untracked paths, `XY` are `??`. Other status codes can be interpreted as follows:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:190
+#: en/git-status.txt:194
#, priority:280
msgid "' ' = unmodified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:191
+#: en/git-status.txt:195
#, priority:280
msgid "'M' = modified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:192
+#: en/git-status.txt:196
#, priority:280
msgid "'A' = added"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:193
+#: en/git-status.txt:197
#, priority:280
msgid "'D' = deleted"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:194
+#: en/git-status.txt:198
#, priority:280
msgid "'R' = renamed"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:195
+#: en/git-status.txt:199
#, priority:280
msgid "'C' = copied"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:196
+#: en/git-status.txt:200
#, priority:280
msgid "'U' = updated but unmerged"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:199
+#: en/git-status.txt:203
#, priority:280
msgid "Ignored files are not listed, unless `--ignored` option is in effect, in which case `XY` are `!!`."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:226
+#: en/git-status.txt:230
#, no-wrap, priority:280
msgid ""
"X Y Meaning\n"
@@ -46978,7 +47229,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:235
+#: en/git-status.txt:239
#, no-wrap, priority:280
msgid ""
"Submodules have more state and instead report\n"
@@ -46991,91 +47242,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:238
+#: en/git-status.txt:242
#, priority:280
msgid "'m' and '?' are applied recursively. For example if a nested submodule in a submodule contains an untracked file, this is reported as '?' as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:240
+#: en/git-status.txt:244
#, priority:280
msgid "If -b is used the short-format status is preceded by a line"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:242
+#: en/git-status.txt:246
#, no-wrap, priority:280
msgid " ## branchname tracking info\n"
msgstr ""
#. type: Title ~
-#: en/git-status.txt:244
+#: en/git-status.txt:248
#, no-wrap, priority:280
msgid "Porcelain Format Version 1"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:251
+#: en/git-status.txt:255
#, priority:280
msgid "Version 1 porcelain format is similar to the short format, but is guaranteed not to change in a backwards-incompatible way between Git versions or based on user configuration. This makes it ideal for parsing by scripts. The description of the short format above also describes the porcelain format, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:254
+#: en/git-status.txt:258
#, priority:280
msgid "The user's color.status configuration is not respected; color will always be off."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:257
+#: en/git-status.txt:261
#, priority:280
msgid "The user's status.relativePaths configuration is not respected; paths shown will always be relative to the repository root."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:267
+#: en/git-status.txt:271
#, priority:280
msgid "There is also an alternate -z format recommended for machine parsing. In that format, the status field is the same, but some other things change. First, the '\\->' is omitted from rename entries and the field order is reversed (e.g 'from \\-> to' becomes 'to from'). Second, a NUL (ASCII 0) follows each filename, replacing space as a field separator and the terminating newline (but a space still separates the status field from the first filename). Third, filenames containing special characters are not specially formatted; no quoting or backslash-escaping is performed."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:269
+#: en/git-status.txt:273
#, priority:280
msgid "Any submodule changes are reported as modified `M` instead of `m` or single `?`."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:271
+#: en/git-status.txt:275
#, no-wrap, priority:280
msgid "Porcelain Format Version 2"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:276
+#: en/git-status.txt:280
#, priority:280
msgid "Version 2 format adds more detailed information about the state of the worktree and changed items. Version 2 also defines an extensible set of easy to parse optional headers."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:280
+#: en/git-status.txt:284
#, priority:280
msgid "Header lines start with \"#\" and are added in response to specific command line arguments. Parsers should ignore headers they don't recognize."
msgstr ""
#. type: Title ^
-#: en/git-status.txt:282
+#: en/git-status.txt:286
#, no-wrap, priority:280
msgid "Branch Headers"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:286
+#: en/git-status.txt:290
#, priority:280
msgid "If `--branch` is given, a series of header lines are printed with information about the current branch."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:296
+#: en/git-status.txt:300
#, no-wrap, priority:280
msgid ""
"Line Notes\n"
@@ -47089,44 +47340,44 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:299
+#: en/git-status.txt:303
#, no-wrap, priority:280
msgid "Changed Tracked Entries"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:306
+#: en/git-status.txt:310
#, priority:280
msgid "Following the headers, a series of lines are printed for tracked entries. One of three different line formats may be used to describe an entry depending on the type of change. Tracked entries are printed in an undefined order; parsers should allow for a mixture of the 3 line types in any order."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:308
+#: en/git-status.txt:312
#, priority:280
msgid "Ordinary changed entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:310
+#: en/git-status.txt:314
#, no-wrap, priority:280
msgid " 1 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:312
+#: en/git-status.txt:316
#, priority:280
msgid "Renamed or copied entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:314
+#: en/git-status.txt:318
#, no-wrap, priority:280
msgid " 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:345
-#, no-wrap, priority:280
+#: en/git-status.txt:349
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"Field Meaning\n"
"--------------------------------------------------------\n"
@@ -47160,19 +47411,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:349
+#: en/git-status.txt:353
#, priority:280
msgid "Unmerged entries have the following format; the first character is a \"u\" to distinguish from ordinary changed entries."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:351
+#: en/git-status.txt:355
#, no-wrap, priority:280
msgid " u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:368
+#: en/git-status.txt:372
#, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47193,92 +47444,92 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:371
+#: en/git-status.txt:375
#, no-wrap, priority:280
msgid "Other Items"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:376
+#: en/git-status.txt:380
#, priority:280
msgid "Following the tracked entries (and if requested), a series of lines will be printed for untracked and then ignored items found in the worktree."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:378
+#: en/git-status.txt:382
#, priority:280
msgid "Untracked items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:380
+#: en/git-status.txt:384
#, no-wrap, priority:280
msgid " ? <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:382
+#: en/git-status.txt:386
#, priority:280
msgid "Ignored items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:384
+#: en/git-status.txt:388
#, no-wrap, priority:280
msgid " ! <path>\n"
msgstr ""
#. type: Title ^
-#: en/git-status.txt:386
+#: en/git-status.txt:390
#, no-wrap, priority:280
msgid "Pathname Format Notes and -z"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:391
+#: en/git-status.txt:395
#, priority:280
msgid "When the `-z` option is given, pathnames are printed as is and without any quoting and lines are terminated with a NUL (ASCII 0x00) byte."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:395
+#: en/git-status.txt:399
#, 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])."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:404
+#: en/git-status.txt:408
#, priority:280
msgid "The command honors `color.status` (or `status.color` -- they mean the same thing and the latter is kept for backward compatibility) and `color.status.<slot>` configuration variables to colorize its output."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:408
+#: en/git-status.txt:412
#, priority:280
msgid "If the config variable `status.relativePaths` is set to false, then all paths shown are relative to the repository root, not to the current directory."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:419
+#: en/git-status.txt:423
#, priority:280
msgid "If `status.submoduleSummary` is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). Please note that the summary output from the status command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings."
msgstr ""
#. type: Title -
-#: en/git-status.txt:421
+#: en/git-status.txt:425
#, no-wrap, priority:280
msgid "BACKGROUND REFRESH"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:432
+#: en/git-status.txt:436
#, priority:280
msgid "By default, `git status` will automatically refresh the index, updating the cached stat information from the working tree and writing out the result. Writing out the updated index is an optimization that isn't strictly necessary (`status` computes the values for itself, but writing them out is just to save subsequent programs from repeating our computation). When `status` is run in the background, the lock held during the write may conflict with other simultaneous processes, causing them to fail. Scripts running `status` in the background should consider using `git --no-optional-locks status` (see linkgit:git[1] for details)."
msgstr ""
#. type: Title =
#: en/git-stripspace.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-stripspace(1)"
msgstr "git-stripspace(1)"
@@ -47349,7 +47600,7 @@ msgstr ""
#. type: Labeled list
#: en/git-stripspace.txt:39
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--strip-comments"
msgstr "--strip-comments"
@@ -47361,7 +47612,7 @@ msgstr "salta e rimuovi tutte le righe che iniziano con un carattere commento"
#. type: Labeled list
#: en/git-stripspace.txt:43
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--comment-lines"
msgstr "--comment-lines"
@@ -47435,7 +47686,7 @@ msgstr ""
#. type: Title =
#: en/git-submodule.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "git-submodule(1)"
msgstr "git-submodule(1)"
@@ -47447,7 +47698,7 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:23
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git submodule' [--quiet] [--cached]\n"
"'git submodule' [--quiet] add [<options>] [--] <repository> [<path>]\n"
@@ -47518,7 +47769,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:74
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid "status [--cached] [--recursive] [--] [<path>...]"
msgstr ""
@@ -47542,7 +47793,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:91
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid "init [--] [<path>...]"
msgstr ""
@@ -47572,7 +47823,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:114
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid "deinit [-f|--force] (--all|[--] <path>...)"
msgstr ""
@@ -47602,7 +47853,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:132
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
msgstr ""
@@ -47715,281 +47966,287 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:176
#, no-wrap, priority:220
-msgid "set-branch ((-d|--default)|(-b|--branch <branch>)) [--] <path>"
+msgid "set-branch (-b|--branch) <branch> [--] <path>"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-submodule.txt:177
+#, no-wrap, priority:220
+msgid "set-branch (-d|--default) [--] <path>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:181
+#: en/git-submodule.txt:182
#, priority:220
msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:182
-#, no-wrap, priority:220
+#: en/git-submodule.txt:183
+#, ignore-ellipsis, no-wrap, priority:220
msgid "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:191
+#: en/git-submodule.txt:192
#, priority:220
msgid "Show commit summary between the given commit (defaults to HEAD) and working tree/index. For a submodule in question, a series of commits in the submodule between the given super project commit and the index or working tree (switched by `--cached`) are shown. If the option `--files` is given, show the series of commits in the submodule between the index of the super project and the working tree of the submodule (this option doesn't allow to use the `--cached` option or to provide an explicit commit)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:194
+#: en/git-submodule.txt:195
#, priority:220
msgid "Using the `--submodule=log` option with linkgit:git-diff[1] will provide that information too."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:195
+#: en/git-submodule.txt:196
#, no-wrap, priority:220
msgid "foreach [--recursive] <command>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:216
+#: en/git-submodule.txt:217
#, priority:220
msgid "Evaluates an arbitrary shell command in each checked out submodule. The command has access to the variables $name, $sm_path, $displaypath, $sha1 and $toplevel: $name is the name of the relevant submodule section in `.gitmodules`, $sm_path is the path of the submodule as recorded in the immediate superproject, $displaypath contains the relative path from the current working directory to the submodules root directory, $sha1 is the commit as recorded in the immediate superproject, and $toplevel is the absolute path to the top-level of the immediate superproject. Note that to avoid conflicts with '$PATH' on Windows, the '$path' variable is now a deprecated synonym of '$sm_path' variable. Any submodules defined in the superproject but not checked out are ignored by this command. Unless given `--quiet`, foreach prints the name of each submodule before evaluating the command. If `--recursive` is given, submodules are traversed recursively (i.e. the given shell command is evaluated in nested submodules as well). A non-zero return from the command in any submodule causes the processing to terminate. This can be overridden by adding '|| :' to the end of the command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:219
+#: en/git-submodule.txt:220
#, priority:220
msgid "As an example, the command below will show the path and currently checked out commit for each submodule:"
msgstr ""
#. type: delimited block -
-#: en/git-submodule.txt:222
+#: en/git-submodule.txt:223
#, no-wrap, priority:220
msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:224
-#, no-wrap, priority:220
+#: en/git-submodule.txt:225
+#, ignore-ellipsis, no-wrap, priority:220
msgid "sync [--recursive] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:231
+#: en/git-submodule.txt:232
#, priority:220
msgid "Synchronizes submodules' remote URL configuration setting to the value specified in `.gitmodules`. It will only affect those submodules which already have a URL entry in .git/config (that is the case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:234
+#: en/git-submodule.txt:235
#, priority:220
msgid "`git submodule sync` synchronizes all submodules while `git submodule sync -- A` synchronizes submodule \"A\" only."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:237
+#: en/git-submodule.txt:238
#, priority:220
msgid "If `--recursive` is specified, this command will recurse into the registered submodules, and sync any nested submodules within."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:238
+#: en/git-submodule.txt:239
#, no-wrap, priority:220
msgid "absorbgitdirs"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:245
+#: en/git-submodule.txt:246
#, priority:220
msgid "If a git directory of a submodule is inside the submodule, move the git directory of the submodule into its superprojects `$GIT_DIR/modules` path and then connect the git directory and its working directory by setting the `core.worktree` and adding a .git file pointing to the git directory embedded in the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:249
+#: en/git-submodule.txt:250
#, priority:220
msgid "A repository that was cloned independently and later added as a submodule or old setups have the submodules git directory inside the submodule instead of embedded into the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:251
+#: en/git-submodule.txt:252
#, priority:220
msgid "This command is recursive by default."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:257
+#: en/git-submodule.txt:258
#, priority:220
msgid "Only print error messages."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:264
+#: en/git-submodule.txt:265
#, priority:220
msgid "This option is only valid for add and update commands. Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:268
+#: en/git-submodule.txt:269
#, priority:220
msgid "This option is only valid for the deinit command. Unregister all submodules in the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:269
+#: en/git-submodule.txt:270
#, no-wrap, priority:220
msgid "-b <branch>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:277
+#: en/git-submodule.txt:278
#, priority:220
msgid "Branch of repository to add as submodule. The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository. If the option is not specified, it defaults to 'master'."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:290
+#: en/git-submodule.txt:291
#, priority:220
msgid "This option is only valid for add, deinit and update commands. When running add, allow adding an otherwise ignored submodule path. When running deinit the submodule working trees will be removed even if they contain local changes. When running update (only effective with the checkout procedure), throw away local changes in submodules when switching to a different commit; and always run a checkout operation in the submodule, even if the commit listed in the index of the containing repository matches the commit checked out in the submodule."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:295
+#: en/git-submodule.txt:296
#, priority:220
msgid "This option is only valid for status and summary commands. These commands typically use the commit found in the submodule HEAD, but with this option, the commit stored in the index is used instead."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:296
-#, no-wrap, ignore-same, no-wrap, priority:220
+#: en/git-submodule.txt:297
+#, ignore-same, no-wrap, priority:220
msgid "--files"
msgstr "--files"
#. type: Plain text
-#: en/git-submodule.txt:300
+#: en/git-submodule.txt:301
#, priority:220
msgid "This option is only valid for the summary command. This command compares the commit in the index with that in the submodule HEAD when this option is used."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:302
-#, no-wrap, ignore-same, no-wrap, priority:220
+#: en/git-submodule.txt:303
+#, ignore-same, no-wrap, priority:220
msgid "--summary-limit"
msgstr "--summary-limit"
#. type: Plain text
-#: en/git-submodule.txt:308
+#: en/git-submodule.txt:309
#, priority:220
msgid "This option is only valid for the summary command. Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:309
-#, no-wrap, ignore-same, no-wrap, priority:220
+#: en/git-submodule.txt:310
+#, ignore-same, no-wrap, priority:220
msgid "--remote"
msgstr "--remote"
#. type: Plain text
-#: en/git-submodule.txt:318
+#: en/git-submodule.txt:319
#, priority:220
msgid "This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:324
+#: en/git-submodule.txt:325
#, priority:220
msgid "This works for any of the supported update procedures (`--checkout`, `--rebase`, etc.). The only change is the source of the target SHA-1. For example, `submodule update --remote --merge` will merge upstream submodule changes into the submodules, while `submodule update --merge` will merge superproject gitlink changes into the submodules."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:329
+#: en/git-submodule.txt:330
#, priority:220
msgid "In order to ensure a current tracking branch state, `update --remote` fetches the submodule's remote repository before calculating the SHA-1. If you don't want to fetch, you should use `submodule update --remote --no-fetch`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:339
+#: en/git-submodule.txt:340
#, priority:220
msgid "Use this option to integrate changes from the upstream subproject with your submodule's current HEAD. Alternatively, you can run `git pull` from the submodule, which is equivalent except for the remote branch name: `update --remote` uses the default upstream repository and `submodule.<name>.branch`, while `git pull` uses the submodule's `branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want to distribute the default upstream branch with the superproject and `branch.<name>.merge` if you want a more native feel while working in the submodule itself."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:341
-#, no-wrap, ignore-same, no-wrap, priority:220
+#: en/git-submodule.txt:342
+#, ignore-same, no-wrap, priority:220
msgid "--no-fetch"
msgstr "--no-fetch"
#. type: Plain text
-#: en/git-submodule.txt:344
+#: en/git-submodule.txt:345
#, priority:220
msgid "This option is only valid for the update command. Don't fetch new objects from the remote site."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:345
-#, no-wrap, ignore-same, no-wrap, priority:220
+#: en/git-submodule.txt:346
+#, ignore-same, no-wrap, priority:220
msgid "--checkout"
msgstr "--checkout"
#. type: Plain text
-#: en/git-submodule.txt:353
+#: en/git-submodule.txt:354
#, priority:220
msgid "This option is only valid for the update command. Checkout the commit recorded in the superproject on a detached HEAD in the submodule. This is the default behavior, the main use of this option is to override `submodule.$name.update` when set to a value other than `checkout`. If the key `submodule.$name.update` is either not explicitly set or set to `checkout`, this option is implicit."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:363
+#: en/git-submodule.txt:364
#, priority:220
msgid "This option is only valid for the update command. Merge the commit recorded in the superproject into the current branch of the submodule. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve the resulting conflicts within the submodule with the usual conflict resolution tools. If the key `submodule.$name.update` is set to `merge`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:364
-#, no-wrap, ignore-same, no-wrap, priority:220
+#: en/git-submodule.txt:365
+#, ignore-same, no-wrap, priority:220
msgid "--rebase"
msgstr "--rebase"
#. type: Plain text
-#: en/git-submodule.txt:372
+#: en/git-submodule.txt:373
#, priority:220
msgid "This option is only valid for the update command. Rebase the current branch onto the commit recorded in the superproject. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve these failures with linkgit:git-rebase[1]. If the key `submodule.$name.update` is set to `rebase`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:373
-#, no-wrap, ignore-same, no-wrap, priority:220
+#: en/git-submodule.txt:374
+#, ignore-same, no-wrap, priority:220
msgid "--init"
msgstr "--init"
#. type: Plain text
-#: en/git-submodule.txt:377
+#: en/git-submodule.txt:378
#, priority:220
msgid "This option is only valid for the update command. Initialize all submodules for which \"git submodule init\" has not been called so far before updating."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:378
-#, no-wrap, ignore-same, no-wrap, priority:220
+#: en/git-submodule.txt:379
+#, ignore-same, no-wrap, priority:220
msgid "--name"
msgstr "--name"
#. type: Plain text
-#: en/git-submodule.txt:382
+#: en/git-submodule.txt:383
#, priority:220
msgid "This option is only valid for the add command. It sets the submodule's name to the given string instead of defaulting to its path. The name must be valid as a directory name and may not end with a '/'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:383
+#: en/git-submodule.txt:384
#, fuzzy, no-wrap, priority:220
msgid "--reference <repository>"
msgstr "repository di riferimento"
#. type: Plain text
-#: en/git-submodule.txt:387 en/git-submodule.txt:396
+#: en/git-submodule.txt:388 en/git-submodule.txt:397
#, priority:220
msgid "This option is only valid for add and update commands. These commands sometimes need to clone a remote repository. In this case, this option will be passed to the linkgit:git-clone[1] command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:391
+#: en/git-submodule.txt:392
#, no-wrap, priority:220
msgid ""
"*NOTE*: Do *not* use this option unless you have read the note\n"
@@ -47998,68 +48255,68 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:398
+#: en/git-submodule.txt:399
#, no-wrap, priority:220
msgid "*NOTE*: see the NOTE for the `--reference` option.\n"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:404
+#: en/git-submodule.txt:405
#, priority:220
msgid "This option is only valid for foreach, update, status and sync commands. Traverse submodules recursively. The operation is performed not only in the submodules of the current repo, but also in any nested submodules inside those submodules (and so on)."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:405
-#, no-wrap, ignore-same, no-wrap, priority:220
+#: en/git-submodule.txt:406
+#, ignore-same, no-wrap, priority:220
msgid "--depth"
msgstr "--depth"
#. type: Plain text
-#: en/git-submodule.txt:409
+#: en/git-submodule.txt:410
#, priority:220
msgid "This option is valid for add and update commands. Create a 'shallow' clone with a history truncated to the specified number of revisions. See linkgit:git-clone[1]"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:410
-#, no-wrap, ignore-same, no-wrap, priority:220
+#: en/git-submodule.txt:411
+#, ignore-same, no-wrap, priority:220
msgid "--[no-]recommend-shallow"
msgstr "--[no-]recommend-shallow"
#. type: Plain text
-#: en/git-submodule.txt:415
+#: en/git-submodule.txt:416
#, priority:220
msgid "This option is only valid for the update command. The initial clone of a submodule will use the recommended `submodule.<name>.shallow` as provided by the `.gitmodules` file by default. To ignore the suggestions use `--no-recommend-shallow`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:421
+#: en/git-submodule.txt:422
#, priority:220
msgid "This option is only valid for the update command. Clone new submodules in parallel with as many jobs. Defaults to the `submodule.fetchJobs` option."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:426
+#: en/git-submodule.txt:427
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:434
+#: en/git-submodule.txt:435
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:438
+#: en/git-submodule.txt:439
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
#. type: Title =
#: en/git-svn.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-svn(1)"
msgstr "git-svn(1)"
@@ -48143,7 +48400,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:47
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--stdlayout"
msgstr "--stdlayout"
@@ -48155,7 +48412,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:58
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-metadata"
msgstr "--no-metadata"
@@ -48167,7 +48424,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:62
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--use-svm-props"
msgstr "--use-svm-props"
@@ -48179,7 +48436,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:64
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--use-svnsync-props"
msgstr "--use-svnsync-props"
@@ -48275,7 +48532,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:110
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-minimize-url"
msgstr "--no-minimize-url"
@@ -48293,7 +48550,7 @@ msgstr "'fetch'"
#. type: Plain text
#: en/git-svn.txt:127
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Fetch unfetched revisions from the Subversion remote we are tracking. The name of the [svn-remote \"...\"] section in the $GIT_DIR/config file may be specified as an optional command-line argument."
msgstr ""
@@ -48305,7 +48562,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:131
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--localtime"
msgstr "--localtime"
@@ -48323,7 +48580,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:142 en/git-svn.txt:536
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--parent"
msgstr "--parent"
@@ -48431,7 +48688,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:215
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--preserve-empty-dirs"
msgstr "--preserve-empty-dirs"
@@ -48601,7 +48858,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:309
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--message"
msgstr "--message"
@@ -48613,7 +48870,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:313
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--tag"
msgstr "--tag"
@@ -48655,7 +48912,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:333
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--username"
msgstr "--username"
@@ -48667,7 +48924,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:337
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--commit-url"
msgstr "--commit-url"
@@ -48684,8 +48941,8 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:889
-#, no-wrap, ignore-same, no-wrap, priority:260
+#: en/git-svn.txt:346 en/rev-list-options.txt:905
+#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -48739,7 +48996,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:366
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
msgstr ""
@@ -48775,7 +49032,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:380
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--show-commit"
msgstr "--show-commit"
@@ -48787,7 +49044,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:382 en/pretty-options.txt:31
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--oneline"
msgstr "--oneline"
@@ -48823,7 +49080,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:400
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--git-format"
msgstr "--git-format"
@@ -48853,7 +49110,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:413
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--before"
msgstr "--before"
@@ -48865,7 +49122,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:419
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--after"
msgstr "--after"
@@ -49206,7 +49463,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:602
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--rmdir"
msgstr "--rmdir"
@@ -49364,7 +49621,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:701
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--use-log-author"
msgstr "--use-log-author"
@@ -49382,7 +49639,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:709
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--add-author-from"
msgstr "--add-author-from"
@@ -49442,7 +49699,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:735
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--follow-parent"
msgstr "--follow-parent"
@@ -49497,7 +49754,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:777
#, priority:100
-msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider linkgit:git-filter-branch[1] instead. filter-branch also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
+msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports, and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider https://github.com/newren/git-filter-repo[git-filter-repo] instead. filter-repo also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
msgstr ""
#. type: Labeled list
@@ -49640,7 +49897,7 @@ msgstr ""
#. type: delimited block -
#: en/git-svn.txt:876
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"# Clone a repo (like git clone):\n"
"\tgit svn clone http://svn.example.com/project/trunk\n"
@@ -49693,7 +49950,7 @@ msgstr ""
#. type: delimited block -
#: en/git-svn.txt:924
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"# Do the initial import on a server\n"
"\tssh server \"cd /pub && git svn clone http://svn.example.com/project [options...]\"\n"
@@ -50003,7 +50260,7 @@ msgstr ""
#. type: Title =
#: en/git-switch.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-switch(1)"
msgstr "git-switch(1)"
@@ -50143,7 +50400,7 @@ msgstr ""
#. type: Labeled list
#: en/git-switch.txt:111
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--discard-changes"
msgstr "--discard-changes"
@@ -50310,7 +50567,7 @@ msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Title =
#: en/git-symbolic-ref.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-symbolic-ref(1)"
msgstr "git-symbolic-ref(1)"
@@ -50391,7 +50648,7 @@ msgstr ""
#. type: Title =
#: en/git-tag.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "git-tag(1)"
msgstr "git-tag(1)"
@@ -50403,7 +50660,7 @@ msgstr "Crea, elenca, elimina o verifica un oggetto tag firmato con GPG"
#. type: Plain text
#: en/git-tag.txt:20
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>] [-e]\n"
"\t<tagname> [<commit> | <object>]\n"
@@ -50471,7 +50728,7 @@ msgstr ""
#. type: Labeled list
#: en/git-tag.txt:65
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--sign"
msgstr "--sign"
@@ -50483,7 +50740,7 @@ msgstr ""
#. type: Labeled list
#: en/git-tag.txt:71
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--no-sign"
msgstr "--no-sign"
@@ -50549,7 +50806,7 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:103
-#, priority:240
+#, ignore-ellipsis, priority:240
msgid "List tags. With optional `<pattern>...`, e.g. `git tag --list 'v-*'`, list only the tags that match the pattern(s)."
msgstr ""
@@ -50839,13 +51096,13 @@ msgstr ""
#. type: delimited block -
#: en/git-tag.txt:319
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid "\tgit://git..../proj.git master\n"
msgstr ""
#. type: delimited block -
#: en/git-tag.txt:321
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid "to get the following updates...\n"
msgstr ""
@@ -50857,7 +51114,7 @@ msgstr ""
#. type: delimited block -
#: en/git-tag.txt:327
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid "$ git pull git://git..../proj.git master\n"
msgstr ""
@@ -50982,7 +51239,7 @@ msgstr ""
#. type: Plain text
#: en/git.txt:55
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Other options are available to control how the manual page is displayed. See linkgit:git-help[1] for more information, because `git --help ...` is converted internally into `git help ...`."
msgstr ""
@@ -51026,7 +51283,7 @@ msgstr ""
#. type: Plain text
#: en/git.txt:82
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Note that omitting the `=` in `git -c foo.bar ...` is allowed and sets `foo.bar` to the boolean true value (just like `[foo]bar` would in a config file). Including the equals but with an empty value (like `git -c foo.bar= ...`) sets `foo.bar` to the empty string which `git config --type=bool` will convert to `false`."
msgstr ""
@@ -51044,7 +51301,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:89
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--html-path"
msgstr "--html-path"
@@ -51056,7 +51313,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:93
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--man-path"
msgstr "--man-path"
@@ -51068,7 +51325,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:97
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--info-path"
msgstr "--info-path"
@@ -51080,7 +51337,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:102
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--paginate"
msgstr "--paginate"
@@ -51092,7 +51349,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:109
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-pager"
msgstr "--no-pager"
@@ -51158,7 +51415,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:140
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
@@ -51170,7 +51427,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:144
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
@@ -51182,7 +51439,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:149
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
@@ -51194,7 +51451,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:155
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
@@ -51206,7 +51463,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:161
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
@@ -51218,7 +51475,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:165
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-optional-locks"
msgstr "--no-optional-locks"
@@ -51230,7 +51487,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:169
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "--list-cmds=group[,group...]"
msgstr ""
@@ -51423,16 +51680,6 @@ msgid ""
"#\n"
msgstr ""
-#. type: delimited block -
-#: en/git.txt:310
-#, 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/git.txt:315
#, no-wrap, priority:100
@@ -51613,7 +51860,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:403
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
@@ -51625,7 +51872,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:408
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
@@ -51637,7 +51884,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:414
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
@@ -51649,7 +51896,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:420
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
@@ -51667,7 +51914,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:433
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
@@ -51679,7 +51926,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:439
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
@@ -51691,7 +51938,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:444
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
@@ -51703,7 +51950,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:448
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
@@ -51715,7 +51962,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:463
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
@@ -51727,13 +51974,13 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:473
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
#. type: Plain text
#: en/git.txt:481
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr ""
@@ -51745,37 +51992,37 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:484
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
#. type: Labeled list
#: en/git.txt:485
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
#. type: Labeled list
#: en/git.txt:486
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
#. type: Labeled list
#: en/git.txt:487
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
#. type: Labeled list
#: en/git.txt:488
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
#. type: Labeled list
#: en/git.txt:489
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
@@ -51799,7 +52046,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:495
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
@@ -51811,7 +52058,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:501
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
@@ -51895,7 +52142,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:528
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
@@ -51907,7 +52154,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:531
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
@@ -51919,7 +52166,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:536
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
@@ -51931,7 +52178,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:541
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
@@ -51943,7 +52190,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:547
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
@@ -51955,13 +52202,13 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:553
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
#: en/git.txt:554
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
@@ -51985,7 +52232,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:572
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
@@ -51997,7 +52244,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:578
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
@@ -52009,7 +52256,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:585
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
@@ -52021,7 +52268,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:589
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
@@ -52033,7 +52280,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:597
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
@@ -52054,7 +52301,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:608
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
@@ -52090,7 +52337,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:629
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_FSMONITOR`"
msgstr "`GIT_TRACE_FSMONITOR`"
@@ -52102,7 +52349,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:633
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
@@ -52114,7 +52361,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:640
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
@@ -52126,7 +52373,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:647
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
@@ -52144,7 +52391,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:658
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
@@ -52156,7 +52403,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:663
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
@@ -52168,7 +52415,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:668
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
@@ -52180,7 +52427,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:673
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
@@ -52192,7 +52439,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:681
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr "`GIT_TRACE_CURL_NO_DATA`"
@@ -52204,7 +52451,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:685
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2`"
msgstr "`GIT_TRACE2`"
@@ -52234,7 +52481,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:720
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_EVENT`"
msgstr "`GIT_TRACE2_EVENT`"
@@ -52246,7 +52493,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:726
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_PERF`"
msgstr "`GIT_TRACE2_PERF`"
@@ -52258,7 +52505,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:733
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDACT_COOKIES`"
msgstr "`GIT_REDACT_COOKIES`"
@@ -52270,7 +52517,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:739
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
@@ -52282,7 +52529,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:748
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
@@ -52294,7 +52541,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:752
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
@@ -52306,7 +52553,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:756
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
@@ -52318,7 +52565,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:760
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
@@ -52330,7 +52577,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:770
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
@@ -52342,7 +52589,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:781
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
@@ -52354,7 +52601,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:790
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
@@ -52366,7 +52613,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:797
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL`"
msgstr "`GIT_PROTOCOL`"
@@ -52378,7 +52625,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:803
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr "`GIT_OPTIONAL_LOCKS`"
@@ -52390,19 +52637,19 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:811
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDIN`"
msgstr "`GIT_REDIRECT_STDIN`"
#. type: Labeled list
#: en/git.txt:812
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDOUT`"
msgstr "`GIT_REDIRECT_STDOUT`"
#. type: Labeled list
#: en/git.txt:813
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDERR`"
msgstr "`GIT_REDIRECT_STDERR`"
@@ -52576,7 +52823,7 @@ msgstr ""
#. type: Title =
#: en/git-unpack-file.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-unpack-file(1)"
msgstr "git-unpack-file(1)"
@@ -52609,7 +52856,7 @@ msgstr ""
#. type: Title =
#: en/git-unpack-objects.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-unpack-objects(1)"
msgstr "git-unpack-objects(1)"
@@ -52675,7 +52922,7 @@ msgstr ""
#. type: Title =
#: en/git-update-index.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-update-index(1)"
msgstr "git-update-index(1)"
@@ -52687,7 +52934,7 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:29
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git update-index'\n"
"\t [--add] [--remove | --force-remove] [--replace]\n"
@@ -52734,7 +52981,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:49
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--remove"
msgstr "--remove"
@@ -52764,7 +53011,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:63
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--ignore-submodules"
msgstr "--ignore-submodules"
@@ -52818,7 +53065,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:82
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--index-info"
msgstr "--index-info"
@@ -52836,7 +53083,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:88
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]assume-unchanged"
msgstr "--[no-]assume-unchanged"
@@ -52854,7 +53101,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:106
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--really-refresh"
msgstr "--really-refresh"
@@ -52866,7 +53113,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:110
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]skip-worktree"
msgstr "--[no-]skip-worktree"
@@ -52878,7 +53125,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:116
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]fsmonitor-valid"
msgstr "--[no-]fsmonitor-valid"
@@ -52890,7 +53137,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:123
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--again"
msgstr "--again"
@@ -52902,7 +53149,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:127
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--unresolve"
msgstr "--unresolve"
@@ -52914,7 +53161,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:131
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--info-only"
msgstr "--info-only"
@@ -52926,7 +53173,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:136
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--force-remove"
msgstr "--force-remove"
@@ -52938,7 +53185,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:140
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--replace"
msgstr "--replace"
@@ -52980,13 +53227,13 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:172
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--split-index"
msgstr "--split-index"
#. type: Labeled list
#: en/git-update-index.txt:173
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-split-index"
msgstr "--no-split-index"
@@ -53004,13 +53251,13 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:185
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--untracked-cache"
msgstr "--untracked-cache"
#. type: Labeled list
#: en/git-update-index.txt:186
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-untracked-cache"
msgstr "--no-untracked-cache"
@@ -53028,7 +53275,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:196
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--test-untracked-cache"
msgstr "--test-untracked-cache"
@@ -53040,7 +53287,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:206
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--force-untracked-cache"
msgstr "--force-untracked-cache"
@@ -53052,13 +53299,13 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:212
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--fsmonitor"
msgstr "--fsmonitor"
#. type: Labeled list
#: en/git-update-index.txt:213
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-fsmonitor"
msgstr "--no-fsmonitor"
@@ -53247,7 +53494,7 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:348
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "The command looks at `core.ignorestat` configuration variable. When this is true, paths updated with `git update-index paths...` and paths updated with other Git commands that update both index and working tree (e.g. 'git apply --index', 'git checkout-index -u', and 'git read-tree -u') are automatically marked as \"assume unchanged\". Note that \"assume unchanged\" bit is *not* set if `git update-index --refresh` finds the working tree file matches the index (use `git update-index --really-refresh` if you want to mark them as \"assume unchanged\")."
msgstr ""
@@ -53543,7 +53790,7 @@ msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
#. type: Title =
#: en/git-update-ref.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-update-ref(1)"
msgstr "git-update-ref(1)"
@@ -53787,7 +54034,7 @@ msgstr ""
#. type: Title =
#: en/git-update-server-info.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-update-server-info(1)"
msgstr "git-update-server-info(1)"
@@ -53829,7 +54076,7 @@ msgstr ""
#. type: Title =
#: en/git-upload-archive.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-upload-archive(1)"
msgstr "git-upload-archive(1)"
@@ -53907,7 +54154,7 @@ msgstr ""
#. type: Title =
#: en/git-upload-pack.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-upload-pack(1)"
msgstr "git-upload-pack(1)"
@@ -53939,7 +54186,7 @@ msgstr ""
#. type: Labeled list
#: en/git-upload-pack.txt:28
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]strict"
msgstr "--[no-]strict"
@@ -53957,7 +54204,7 @@ msgstr "interrompi il trasferimento dopo <n> secondi di inattivit횪"
#. type: Labeled list
#: en/git-upload-pack.txt:34
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--stateless-rpc"
msgstr "--stateless-rpc"
@@ -53969,7 +54216,7 @@ msgstr ""
#. type: Labeled list
#: en/git-upload-pack.txt:39
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--advertise-refs"
msgstr "--advertise-refs"
@@ -53993,7 +54240,7 @@ msgstr "linkgit:gitnamespaces[7]"
#. type: Title =
#: en/git-var.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-var(1)"
msgstr "git-var(1)"
@@ -54037,7 +54284,7 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:34
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "GIT_AUTHOR_IDENT"
msgstr "GIT_AUTHOR_IDENT"
@@ -54049,7 +54296,7 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:37
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "GIT_COMMITTER_IDENT"
msgstr "GIT_COMMITTER_IDENT"
@@ -54061,7 +54308,7 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:40
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "GIT_EDITOR"
msgstr "GIT_EDITOR"
@@ -54079,7 +54326,7 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:52
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "GIT_PAGER"
msgstr "GIT_PAGER"
@@ -54103,7 +54350,7 @@ msgstr "linkgit:git-commit-tree[1] linkgit:git-tag[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-verify-commit.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-verify-commit(1)"
msgstr "git-verify-commit(1)"
@@ -54115,7 +54362,7 @@ msgstr ""
#. type: Plain text
#: en/git-verify-commit.txt:12
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git verify-commit' <commit>...\n"
msgstr ""
@@ -54145,7 +54392,7 @@ msgstr ""
#. type: Title =
#: en/git-verify-pack.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-verify-pack(1)"
msgstr "git-verify-pack(1)"
@@ -54157,7 +54404,7 @@ msgstr ""
#. type: Plain text
#: en/git-verify-pack.txt:13
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid "'git verify-pack' [-v|--verbose] [-s|--stat-only] [--] <pack>.idx ...\n"
msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
@@ -54169,7 +54416,7 @@ msgstr ""
#. type: Labeled list
#: en/git-verify-pack.txt:23
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<pack>.idx ..."
msgstr ""
@@ -54187,7 +54434,7 @@ msgstr ""
#. type: Labeled list
#: en/git-verify-pack.txt:32
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--stat-only"
msgstr "--stat-only"
@@ -54235,7 +54482,7 @@ msgstr ""
#. type: Title =
#: en/git-verify-tag.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-verify-tag(1)"
msgstr "git-verify-tag(1)"
@@ -54247,7 +54494,7 @@ msgstr ""
#. type: Plain text
#: en/git-verify-tag.txt:12
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git verify-tag' [--format=<format>] <tag>...\n"
msgstr ""
@@ -54265,7 +54512,7 @@ msgstr ""
#. type: Labeled list
#: en/git-verify-tag.txt:27
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<tag>..."
msgstr ""
@@ -54289,7 +54536,7 @@ msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:12
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git web{litdd}browse' [<options>] <url|file>...\n"
msgstr ""
@@ -54551,7 +54798,7 @@ msgstr ""
#. type: Title =
#: en/git-whatchanged.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-whatchanged(1)"
msgstr "git-whatchanged(1)"
@@ -54563,7 +54810,7 @@ msgstr ""
#. type: Plain text
#: en/git-whatchanged.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git whatchanged' <option>...\n"
msgstr ""
@@ -54611,7 +54858,7 @@ msgstr ""
#. type: Title =
#: en/git-worktree.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "git-worktree(1)"
msgstr "git-worktree(1)"
@@ -54786,7 +55033,7 @@ msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:147
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--[no-]checkout"
msgstr "--[no-]checkout"
@@ -54798,7 +55045,7 @@ msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:153
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--[no-]guess-remote"
msgstr "--[no-]guess-remote"
@@ -54816,7 +55063,7 @@ msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:163
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--[no-]track"
msgstr "--[no-]track"
@@ -54828,7 +55075,7 @@ msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:169
-#, no-wrap, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--lock"
msgstr "--lock"
@@ -55093,7 +55340,7 @@ msgstr ""
#. type: delimited block -
#: en/git-worktree.txt:372
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git worktree add -b emergency-fix ../temp master\n"
"$ pushd ../temp\n"
@@ -55111,7 +55358,7 @@ msgstr ""
#. type: Title =
#: en/git-write-tree.txt:2
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-write-tree(1)"
msgstr "git-write-tree(1)"
@@ -55147,7 +55394,7 @@ msgstr ""
#. type: Labeled list
#: en/git-write-tree.txt:30
-#, no-wrap, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--missing-ok"
msgstr "--missing-ok"
@@ -55473,98 +55720,104 @@ msgstr ""
msgid "This option determines how the merge message will be cleaned up before commiting. See linkgit:git-commit[1] for more details. In addition, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on to the commit machinery in the case of a merge conflict."
msgstr ""
+#. type: Labeled list
+#: en/merge-options.txt:44
+#, ignore-same, no-wrap, priority:240
+msgid "--ff-only"
+msgstr "--ff-only"
+
#. type: Plain text
-#: en/merge-options.txt:46
+#: en/merge-options.txt:50
#, priority:240
-msgid "When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. This is the default behavior."
+msgid "Specifies how a merge is handled when the merged-in history is already a descendant of the current history. `--ff` is the default unless merging an annotated (and possibly signed) tag that is not stored in its natural place in the `refs/tags/` hierarchy, in which case `--no-ff` is assumed."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:52
+#: en/merge-options.txt:55
#, priority:240
-msgid "Create a merge commit even when the merge resolves as a fast-forward. This is the default behaviour when merging an annotated (and possibly signed) tag that is not stored in its natural place in 'refs/tags/' hierarchy."
+msgid "With `--ff`, when possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit."
msgstr ""
-#. type: Labeled list
-#: en/merge-options.txt:53
-#, no-wrap, ignore-same, no-wrap, priority:240
-msgid "--ff-only"
-msgstr "--ff-only"
+#. type: Plain text
+#: en/merge-options.txt:58
+#, priority:240
+msgid "With `--no-ff`, create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward."
+msgstr ""
#. type: Plain text
-#: en/merge-options.txt:57
+#: en/merge-options.txt:61
#, priority:240
-msgid "Refuse to merge and exit with a non-zero status unless the current `HEAD` is already up to date or the merge can be resolved as a fast-forward."
+msgid "With `--ff-only`, resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:63
+#: en/merge-options.txt:67
#, priority:240
msgid "GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:69
+#: en/merge-options.txt:73
#, priority:240
msgid "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also linkgit:git-fmt-merge-msg[1]."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:72
+#: en/merge-options.txt:76
#, priority:240
msgid "With --no-log do not list one-line descriptions from the actual commits being merged."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:74
-#, no-wrap, ignore-same, no-wrap, priority:240
+#: en/merge-options.txt:78
+#, ignore-same, no-wrap, priority:240
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
-#: en/merge-options.txt:83
+#: en/merge-options.txt:87
#, priority:240
msgid "With --no-signoff do not add a Signed-off-by line."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:89
+#: en/merge-options.txt:93
#, priority:240
msgid "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:92
+#: en/merge-options.txt:96
#, priority:240
msgid "With -n or --no-stat do not show a diffstat at the end of the merge."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:93
-#, no-wrap, ignore-same, no-wrap, priority:240
+#: en/merge-options.txt:97
+#, ignore-same, no-wrap, priority:240
msgid "--squash"
msgstr "--squash"
#. type: Labeled list
-#: en/merge-options.txt:94
-#, no-wrap, ignore-same, no-wrap, priority:240
+#: en/merge-options.txt:98
+#, ignore-same, no-wrap, priority:240
msgid "--no-squash"
msgstr "--no-squash"
#. type: Plain text
-#: en/merge-options.txt:102
+#: en/merge-options.txt:106
#, priority:240
msgid "Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:105
+#: en/merge-options.txt:109
#, priority:240
msgid "With --no-squash perform the merge and commit the result. This option can be used to override --squash."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:107
+#: en/merge-options.txt:111
#, priority:240
msgid "With --squash, --commit is not allowed, and will fail."
msgstr ""
@@ -55572,71 +55825,77 @@ msgstr ""
#. type: Plain text
#: en/merge-options.txt:115
#, priority:240
+msgid "This option bypasses the pre-merge and commit-msg hooks. See also linkgit:githooks[5]."
+msgstr ""
+
+#. type: Plain text
+#: en/merge-options.txt:123
+#, priority:240
msgid "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise)."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:116
+#: en/merge-options.txt:124
#, no-wrap, priority:240
msgid "-X <option>"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:120
+#: en/merge-options.txt:128
#, priority:240
msgid "Pass merge strategy specific option through to the merge strategy."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:121
-#, no-wrap, ignore-same, no-wrap, priority:240
+#: en/merge-options.txt:129
+#, ignore-same, no-wrap, priority:240
msgid "--verify-signatures"
msgstr "--verify-signatures"
#. type: Labeled list
-#: en/merge-options.txt:122
-#, no-wrap, ignore-same, no-wrap, priority:240
+#: en/merge-options.txt:130
+#, ignore-same, no-wrap, priority:240
msgid "--no-verify-signatures"
msgstr "--no-verify-signatures"
#. type: Plain text
-#: en/merge-options.txt:128
+#: en/merge-options.txt:136
#, priority:240
msgid "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:130
-#, no-wrap, ignore-same, no-wrap, priority:240
+#: en/merge-options.txt:138
+#, ignore-same, no-wrap, priority:240
msgid "--no-summary"
msgstr "--no-summary"
#. type: Plain text
-#: en/merge-options.txt:133
+#: en/merge-options.txt:141
#, priority:240
msgid "Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:138
+#: en/merge-options.txt:146
#, priority:240
msgid "Operate quietly. Implies --no-progress."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:149
+#: en/merge-options.txt:157
#, priority:240
msgid "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:152
-#, no-wrap, ignore-same, no-wrap, priority:240
+#: en/merge-options.txt:160
+#, ignore-same, no-wrap, priority:240
msgid "--allow-unrelated-histories"
msgstr "--allow-unrelated-histories"
#. type: Plain text
-#: en/merge-options.txt:158
+#: en/merge-options.txt:166
#, priority:240
msgid "By default, `git merge` command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added."
msgstr ""
@@ -56208,7 +56467,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:106
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%n'"
msgstr "'%n'"
@@ -56244,7 +56503,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:111
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%Cred'"
msgstr "'%Cred'"
@@ -56256,7 +56515,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:112
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%Cgreen'"
msgstr "'%Cgreen'"
@@ -56268,7 +56527,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:113
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%Cblue'"
msgstr "'%Cblue'"
@@ -56280,7 +56539,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:114
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%Creset'"
msgstr "'%Creset'"
@@ -56292,7 +56551,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:115
-#, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:260
msgid "'%C(...)'"
msgstr ""
@@ -56304,13 +56563,13 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:129
-#, priority:260
+#, ignore-ellipsis, priority:260
msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:129
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%m'"
msgstr "'%m'"
@@ -56436,7 +56695,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:154
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%H'"
msgstr "'%H'"
@@ -56448,7 +56707,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:155
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%h'"
msgstr "'%h'"
@@ -56460,7 +56719,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:156
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%T'"
msgstr "'%T'"
@@ -56472,7 +56731,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:157
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%t'"
msgstr "'%t'"
@@ -56484,7 +56743,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:158
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%P'"
msgstr "'%P'"
@@ -56496,7 +56755,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:159
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%p'"
msgstr "'%p'"
@@ -56508,7 +56767,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:160
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%an'"
msgstr "'%an'"
@@ -56520,7 +56779,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:161
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%aN'"
msgstr "'%aN'"
@@ -56538,7 +56797,7 @@ msgstr "linkgit:git-blame[1]"
#. type: Labeled list
#: en/pretty-formats.txt:163
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%ae'"
msgstr "'%ae'"
@@ -56550,7 +56809,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:164
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%aE'"
msgstr "'%aE'"
@@ -56562,7 +56821,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:166
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%ad'"
msgstr "'%ad'"
@@ -56574,7 +56833,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:167
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%aD'"
msgstr "'%aD'"
@@ -56586,7 +56845,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:168
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%ar'"
msgstr "'%ar'"
@@ -56598,7 +56857,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:169
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%at'"
msgstr "'%at'"
@@ -56610,7 +56869,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:170
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%ai'"
msgstr "'%ai'"
@@ -56622,7 +56881,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:171
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%aI'"
msgstr "'%aI'"
@@ -56634,7 +56893,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:172
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%cn'"
msgstr "'%cn'"
@@ -56646,7 +56905,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:173
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%cN'"
msgstr "'%cN'"
@@ -56664,7 +56923,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:175
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%ce'"
msgstr "'%ce'"
@@ -56676,7 +56935,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:176
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%cE'"
msgstr "'%cE'"
@@ -56688,7 +56947,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:178
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%cd'"
msgstr "'%cd'"
@@ -56700,7 +56959,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:179
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%cD'"
msgstr "'%cD'"
@@ -56712,7 +56971,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:180
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%cr'"
msgstr "'%cr'"
@@ -56724,7 +56983,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:181
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%ct'"
msgstr "'%ct'"
@@ -56736,7 +56995,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:182
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%ci'"
msgstr "'%ci'"
@@ -56748,7 +57007,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:183
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%cI'"
msgstr "'%cI'"
@@ -56760,7 +57019,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:184
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%d'"
msgstr "'%d'"
@@ -56772,7 +57031,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:185
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%D'"
msgstr "'%D'"
@@ -56796,7 +57055,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:188
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%e'"
msgstr "'%e'"
@@ -56814,7 +57073,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:190
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%f'"
msgstr "'%f'"
@@ -56826,7 +57085,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:191
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%b'"
msgstr "'%b'"
@@ -56838,7 +57097,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:192
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%B'"
msgstr "'%B'"
@@ -56850,7 +57109,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:194
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%N'"
msgstr "'%N'"
@@ -56862,7 +57121,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:196
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%GG'"
msgstr "'%GG'"
@@ -56892,7 +57151,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:205
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%GS'"
msgstr "'%GS'"
@@ -56904,7 +57163,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:206
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%GK'"
msgstr "'%GK'"
@@ -56916,7 +57175,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:207
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%GF'"
msgstr "'%GF'"
@@ -56928,7 +57187,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:208
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%GP'"
msgstr "'%GP'"
@@ -56946,7 +57205,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:210
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%gD'"
msgstr "'%gD'"
@@ -56959,12 +57218,12 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:215
#, priority:260
-msgid "minutes ago`}; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:215
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%gd'"
msgstr "'%gd'"
@@ -56982,7 +57241,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:218
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%gn'"
msgstr "'%gn'"
@@ -56994,7 +57253,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:219
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%gN'"
msgstr "'%gN'"
@@ -57006,7 +57265,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:221
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%ge'"
msgstr "'%ge'"
@@ -57018,7 +57277,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:222
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%gE'"
msgstr "'%gE'"
@@ -57030,7 +57289,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:224
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%gs'"
msgstr "'%gs'"
@@ -57184,7 +57443,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:17
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--abbrev-commit"
msgstr "--abbrev-commit"
@@ -57202,7 +57461,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:26
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--no-abbrev-commit"
msgstr "--no-abbrev-commit"
@@ -57232,13 +57491,13 @@ msgstr "--expand-tabs"
#. type: Labeled list
#: en/pretty-options.txt:46
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--expand-tabs"
msgstr "--expand-tabs"
#. type: Labeled list
#: en/pretty-options.txt:47
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--no-expand-tabs"
msgstr "--no-expand-tabs"
@@ -57298,7 +57557,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:89
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--[no-]standard-notes"
msgstr "--[no-]standard-notes"
@@ -57310,7 +57569,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:94
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--show-signature"
msgstr "--show-signature"
@@ -57382,7 +57641,7 @@ msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:45
-#, priority:220
+#, ignore-ellipsis, priority:220
msgid "Whether that update is allowed without `--force` depends on the ref namespace it's being fetched to, the type of object being fetched, and whether the update is considered to be a fast-forward. Generally, the same rules apply for fetching as when pushing, see the `<refspec>...` section of linkgit:git-push[1] for what those are. Exceptions to those rules particular to 'git fetch' are noted below."
msgstr ""
@@ -57853,13 +58112,13 @@ msgstr ""
#. type: Labeled list
#: en/revisions.txt:280
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "The '...' (three-dot) Symmetric Difference Notation"
msgstr ""
#. type: Plain text
#: en/revisions.txt:286
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "A similar notation 'r1\\...r2' is called symmetric difference of 'r1' and 'r2' and is defined as 'r1 r2 --not $(git merge-base --all r1 r2)'. It is the set of commits that are reachable from either one of 'r1' (left side) or 'r2' (right side) but not from both."
msgstr ""
@@ -57949,7 +58208,7 @@ msgstr ""
#. type: Labeled list
#: en/revisions.txt:331
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'<rev1>\\...<rev2>'"
msgstr ""
@@ -58003,7 +58262,7 @@ msgstr ""
#. type: delimited block .
#: en/revisions.txt:377
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" Args Expanded arguments Selected commits\n"
" D G H D\n"
@@ -58199,7 +58458,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:69
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--invert-grep"
msgstr "--invert-grep"
@@ -58211,7 +58470,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:74
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--regexp-ignore-case"
msgstr "--regexp-ignore-case"
@@ -58247,7 +58506,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:101
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--remove-empty"
msgstr "--remove-empty"
@@ -58259,7 +58518,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:104
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--merges"
msgstr "--merges"
@@ -58271,7 +58530,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:107
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--no-merges"
msgstr "--no-merges"
@@ -58295,13 +58554,13 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:113
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--no-min-parents"
msgstr "--no-min-parents"
#. type: Labeled list
#: en/rev-list-options.txt:114
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--no-max-parents"
msgstr "--no-max-parents"
@@ -58385,7 +58644,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:181
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--reflog"
msgstr "--reflog"
@@ -58397,7 +58656,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:185
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--alternate-refs"
msgstr "--alternate-refs"
@@ -58421,7 +58680,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:206 en/rev-list-options.txt:586
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--bisect"
msgstr "--bisect"
@@ -58445,7 +58704,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:228
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--cherry-mark"
msgstr "--cherry-mark"
@@ -58457,7 +58716,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:232
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--cherry-pick"
msgstr "--cherry-pick"
@@ -58475,13 +58734,13 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:245
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--left-only"
msgstr "--left-only"
#. type: Labeled list
#: en/rev-list-options.txt:246
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--right-only"
msgstr "--right-only"
@@ -58493,31 +58752,31 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:256
-#, priority:260
+#, ignore-ellipsis, priority:260
msgid "For example, `--cherry-pick --right-only A...B` omits those commits from `B` which are in `A` or are patch-equivalent to a commit in `A`. In other words, this lists the `+` commits from `git cherry A B`. More precisely, `--cherry-pick --right-only --no-merges` gives the exact list."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:257
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--cherry"
msgstr "--cherry"
#. type: Plain text
#: en/rev-list-options.txt:263
-#, priority:260
+#, ignore-ellipsis, priority:260
msgid "A synonym for `--right-only --cherry-mark --no-merges`; useful to limit the output to the commits on our side and mark those that have been applied to the other side of a forked history with `git log --cherry upstream...mybranch`, similar to `git cherry upstream mybranch`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:265
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--walk-reflogs"
msgstr "--walk-reflogs"
#. type: Plain text
#: en/rev-list-options.txt:271
-#, priority:260
+#, ignore-ellipsis, priority:260
msgid "Instead of walking the commit ancestry chain, walk reflog entries from the most recent one to older ones. When this option is used you cannot specify commits to exclude (that is, '{caret}commit', 'commit1..commit2', and 'commit1\\...commit2' notations cannot be used)."
msgstr ""
@@ -58565,7 +58824,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:301
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--boundary"
msgstr "--boundary"
@@ -58577,7 +58836,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:306
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--use-bitmap-index"
msgstr "--use-bitmap-index"
@@ -58631,7 +58890,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:330
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--simplify-by-decoration"
msgstr "--simplify-by-decoration"
@@ -58667,7 +58926,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:343
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--full-history"
msgstr "--full-history"
@@ -58679,7 +58938,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:346 en/rev-list-options.txt:479
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--dense"
msgstr "--dense"
@@ -58697,7 +58956,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:353 en/rev-list-options.txt:490
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--simplify-merges"
msgstr "--simplify-merges"
@@ -58709,7 +58968,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:358 en/rev-list-options.txt:537
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--ancestry-path"
msgstr "--ancestry-path"
@@ -59093,7 +59352,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:610
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--bisect-vars"
msgstr "--bisect-vars"
@@ -59105,7 +59364,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:622
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--bisect-all"
msgstr "--bisect-all"
@@ -59147,7 +59406,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:648
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--author-date-order"
msgstr "--author-date-order"
@@ -59210,7 +59469,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:687
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--objects"
msgstr "--objects"
@@ -59222,7 +59481,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:693
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--in-commit-order"
msgstr "--in-commit-order"
@@ -59234,7 +59493,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:698
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--objects-edge"
msgstr "--objects-edge"
@@ -59246,7 +59505,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:705
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
@@ -59258,7 +59517,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:710
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--indexed-objects"
msgstr "--indexed-objects"
@@ -59276,7 +59535,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:719
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--object-names"
msgstr "--object-names"
@@ -59288,7 +59547,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:723
-#, no-wrap, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--no-object-names"
msgstr "--no-object-names"
@@ -59337,263 +59596,281 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:762
#, priority:260
+msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:771
+#, ignore-ellipsis, priority:260
+msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:775
+#, priority:260
+msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:778
+#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:763
-#, no-wrap, ignore-same, no-wrap, priority:260
+#: en/rev-list-options.txt:779
+#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:766
+#: en/rev-list-options.txt:782
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:773
+#: en/rev-list-options.txt:789
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:781
+#: en/rev-list-options.txt:797
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:800
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:791
+#: en/rev-list-options.txt:807
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:793
+#: en/rev-list-options.txt:809
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:801
+#: en/rev-list-options.txt:817
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:802
-#, no-wrap, ignore-same, no-wrap, priority:260
+#: en/rev-list-options.txt:818
+#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:804
+#: en/rev-list-options.txt:820
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:822
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:812
+#: en/rev-list-options.txt:828
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:816
-#, no-wrap, ignore-same, no-wrap, priority:260
+#: en/rev-list-options.txt:832
+#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:818
+#: en/rev-list-options.txt:834
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:819
+#: en/rev-list-options.txt:835
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:826
+#: en/rev-list-options.txt:842
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:847
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:833
+#: en/rev-list-options.txt:849
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:852
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:838
+#: en/rev-list-options.txt:854
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:839
+#: en/rev-list-options.txt:855
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:840
+#: en/rev-list-options.txt:856
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:859
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:846
+#: en/rev-list-options.txt:862
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:864
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:873
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:864
+#: en/rev-list-options.txt:880
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:868
+#: en/rev-list-options.txt:884
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:875
-#, priority:260
+#: en/rev-list-options.txt:891
+#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:894
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:880
+#: en/rev-list-options.txt:896
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:882
+#: en/rev-list-options.txt:898
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:884
-#, no-wrap, ignore-same, no-wrap, priority:260
+#: en/rev-list-options.txt:900
+#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:887
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:892
-#, priority:260
+#: en/rev-list-options.txt:908
+#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:893
-#, no-wrap, ignore-same, no-wrap, priority:260
+#: en/rev-list-options.txt:909
+#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:896
-#, priority:260
+#: en/rev-list-options.txt:912
+#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:898
-#, no-wrap, ignore-same, no-wrap, priority:260
+#: en/rev-list-options.txt:914
+#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:902
-#, no-wrap, ignore-same, no-wrap, priority:260
+#: en/rev-list-options.txt:918
+#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:907
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:925
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:932
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -59604,20 +59881,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:919
+#: en/rev-list-options.txt:935
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:922
-#, no-wrap, priority:260
+#: en/rev-list-options.txt:938
+#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:929
-#, no-wrap, priority:260
+#: en/rev-list-options.txt:945
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
"\t>bbbbbbb... 2nd on b\n"
@@ -59628,85 +59905,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:931
-#, no-wrap, ignore-same, no-wrap, priority:260
+#: en/rev-list-options.txt:947
+#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:937
+#: en/rev-list-options.txt:953
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:939
+#: en/rev-list-options.txt:955
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:942
+#: en/rev-list-options.txt:958
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:943
+#: en/rev-list-options.txt:959
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:949
+#: en/rev-list-options.txt:965
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:959
+#: en/rev-list-options.txt:975
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:963
+#: en/rev-list-options.txt:979
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:984
#, priority:260
msgid "Listed below are options that control the formatting of diff output. Some of them are specific to linkgit:git-rev-list[1], however other diff options may be given. See linkgit:git-diff-files[1] for more options."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:991
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:981
+#: en/rev-list-options.txt:997
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:1012
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1015
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1018
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.nb_NO.po b/po/documentation.nb_NO.po
index 4e7617a1872a3d04712ac8e21900e6382ac3bdc5..640aac3ed33ddeed7d85219da9c8518787583587 100644
--- a/po/documentation.nb_NO.po
+++ b/po/documentation.nb_NO.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-08-26 23:13+0200\n"
+"POT-Creation-Date: 2019-12-08 16:35+0100\n"
"PO-Revision-Date: 2019-10-14 23:28+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,7 +26,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:319 en/git-fsck.txt:38 en/git-rebase.txt:471
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:321 en/git-fsck.txt:38 en/git-rebase.txt:493
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -86,7 +86,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1000
+#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1016
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -122,7 +122,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:433 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -466,7 +466,7 @@ msgid "Get and set repository or global options."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1505
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1528
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-export[1]"
msgstr "linkgit:git-fast-export[1]"
@@ -478,7 +478,7 @@ msgid "Git data exporter."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:243
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-import[1]"
msgstr "linkgit:git-fast-import[1]"
@@ -2260,95 +2260,95 @@ msgstr ""
msgid "Example"
msgstr ""
-#. type: Plain text
-#: en/config.txt:185
+#. type: delimited block -
+#: en/config.txt:186
#, no-wrap, priority:100
msgid ""
-"\t# Core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"# Core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:190
+#. type: delimited block -
+#: en/config.txt:191
#, no-wrap, priority:100
msgid ""
-"\t# Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"# Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:194
+#. type: delimited block -
+#: en/config.txt:195
#, no-wrap, priority:100
msgid ""
-"\t[branch \"devel\"]\n"
-"\t\tremote = origin\n"
-"\t\tmerge = refs/heads/devel\n"
+"[branch \"devel\"]\n"
+"\tremote = origin\n"
+"\tmerge = refs/heads/devel\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:199
+#. type: delimited block -
+#: en/config.txt:200
#, no-wrap, priority:100
msgid ""
-"\t# Proxy settings\n"
-"\t[core]\n"
-"\t\tgitProxy=\"ssh\" for \"kernel.org\"\n"
-"\t\tgitProxy=default-proxy ; for the rest\n"
+"# Proxy settings\n"
+"[core]\n"
+"\tgitProxy=\"ssh\" for \"kernel.org\"\n"
+"\tgitProxy=default-proxy ; for the rest\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:204
+#. type: delimited block -
+#: en/config.txt:205
#, no-wrap, priority:100
msgid ""
-"\t[include]\n"
-"\t\tpath = /path/to/foo.inc ; include by absolute path\n"
-"\t\tpath = foo.inc ; find \"foo.inc\" relative to the current file\n"
-"\t\tpath = ~/foo.inc ; find \"foo.inc\" in your `$HOME` directory\n"
+"[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: Plain text
-#: en/config.txt:208
+#. type: delimited block -
+#: en/config.txt:209
#, no-wrap, priority:100
msgid ""
-"\t; include if $GIT_DIR is /path/to/foo/.git\n"
-"\t[includeIf \"gitdir:/path/to/foo/.git\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; 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: Plain text
-#: en/config.txt:212
+#. type: delimited block -
+#: en/config.txt:213
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside /path/to/group\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside /path/to/group\n"
+"[includeIf \"gitdir:/path/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:216
+#. type: delimited block -
+#: en/config.txt:217
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside $HOME/to/group\n"
-"\t[includeIf \"gitdir:~/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside $HOME/to/group\n"
+"[includeIf \"gitdir:~/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:222
+#. type: delimited block -
+#: en/config.txt:223
#, no-wrap, priority:100
msgid ""
-"\t; relative paths are always relative to the including\n"
-"\t; file (if the condition is true); their location is not\n"
-"\t; affected by the condition\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = foo.inc\n"
+"; 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:227
+#: en/config.txt:229
#, no-wrap, priority:100
msgid ""
"\t; include only if we are in a worktree where foo-branch is\n"
@@ -2358,43 +2358,43 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/config.txt:229
+#: en/config.txt:231
#, no-wrap, priority:100
msgid "Values"
msgstr ""
#. type: Plain text
-#: en/config.txt:234
+#: 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:235
+#: en/config.txt:237
#, no-wrap, priority:100
msgid "boolean"
msgstr ""
#. type: Plain text
-#: en/config.txt:240
+#: 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:241
+#: en/config.txt:243
#, no-wrap, priority:100
msgid "true"
msgstr ""
#. type: Plain text
-#: en/config.txt:242
+#: en/config.txt:244
#, priority:100
msgid "Boolean true literals are `yes`, `on`, `true`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:244
+#: en/config.txt:246
#, no-wrap, priority:100
msgid ""
"and `1`. Also, a variable defined without `= <value>`\n"
@@ -2402,109 +2402,109 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/config.txt:245
+#: en/config.txt:247
#, no-wrap, priority:100
msgid "false"
msgstr ""
#. type: Plain text
-#: en/config.txt:246
+#: en/config.txt:248
#, priority:100
msgid "Boolean false literals are `no`, `off`, `false`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:247
+#: en/config.txt:249
#, no-wrap, priority:100
msgid "`0` and the empty string.\n"
msgstr ""
#. type: Plain text
-#: en/config.txt:251
+#: 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:252
+#: en/config.txt:254
#, no-wrap, priority:100
msgid "integer"
msgstr ""
#. type: Plain text
-#: en/config.txt:256
+#: 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:257 en/diff-options.txt:356 en/git-for-each-ref.txt:177
+#: 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:261
+#: 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:265
+#: en/config.txt:267
#, 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."
msgstr ""
#. type: Plain text
-#: en/config.txt:270
+#: en/config.txt:272
#, 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:277
+#: en/config.txt:279
#, 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:280
+#: en/config.txt:282
#, 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:289
+#: en/config.txt:291
#, 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:290
+#: en/config.txt:292
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:296
+#: en/config.txt:298
#, 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:299 en/git-imap-send.txt:58
+#: en/config.txt:301 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:304
+#: en/config.txt:306
#, 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:309
+#: en/config.txt:311
#, 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 ""
@@ -3242,53 +3242,53 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
#, no-wrap, priority:260
-msgid "Generating patches with -p"
+msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:10
+#: en/diff-generate-patch.txt:14
#, priority:260
-msgid "When \"git-diff-index\", \"git-diff-tree\", or \"git-diff-files\" are run with a `-p` option, \"git diff\" without the `--raw` option, or \"git log\" with the \"-p\" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
+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:13
+#: 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:15
+#: 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:17
+#: 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:21
+#: 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:25
+#: 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:27
+#: 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:39
+#: en/diff-generate-patch.txt:43
#, no-wrap, priority:260
msgid ""
"old mode <mode>\n"
@@ -3305,43 +3305,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:42
+#: 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:44
+#: 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:51
+#: 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:55
+#: en/diff-generate-patch.txt:59
#, priority:260
-msgid "The index line includes the SHA-1 checksum 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."
+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:59
+#: 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:64
+#: 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:71
+#: en/diff-generate-patch.txt:75
#, no-wrap, priority:260
msgid ""
"diff --git a/a b/b\n"
@@ -3353,25 +3353,25 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/diff-generate-patch.txt:74
+#: en/diff-generate-patch.txt:78
#, no-wrap, priority:260
-msgid "combined diff format"
+msgid "Combined diff format"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:82
+#: 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:84
+#: en/diff-generate-patch.txt:88
#, priority:260
-msgid "A 'combined diff' format looks like this:"
+msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:93
+#: en/diff-generate-patch.txt:97
#, no-wrap, priority:260
msgid ""
"diff --combined describe.c\n"
@@ -3384,7 +3384,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:103
+#: en/diff-generate-patch.txt:107
#, no-wrap, priority:260
msgid ""
"- static void describe(char *arg)\n"
@@ -3399,7 +3399,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:113
+#: en/diff-generate-patch.txt:117
#, no-wrap, priority:260
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
@@ -3414,37 +3414,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:117
+#: en/diff-generate-patch.txt:121
#, priority:260
-msgid "It is preceded with a \"git diff\" header, that looks like this (when `-c` option is used):"
+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:119
+#: en/diff-generate-patch.txt:123
#, no-wrap, priority:260
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:121
+#: en/diff-generate-patch.txt:125
#, priority:260
-msgid "or like this (when `--cc` option is used):"
+msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:123
+#: en/diff-generate-patch.txt:127
#, no-wrap, priority:260
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:126
+#: 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:131
+#: en/diff-generate-patch.txt:135
#, no-wrap, priority:260
msgid ""
"index <hash>,<hash>..<hash>\n"
@@ -3454,91 +3454,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:137
+#: 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:139
+#: 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:141 en/diff-generate-patch.txt:152 en/diff-generate-patch.txt:153 en/diff-generate-patch.txt:154
+#: 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:142 en/diff-generate-patch.txt:155
+#: 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:146
+#: 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:150
+#: 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:159
+#: 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:165
+#: 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 for apply. The change is similar to the change in the extended 'index' header:"
+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:167
+#: 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:170
+#: 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:179
+#: 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:185
+#: 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:191
+#: 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:197
+#: 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:327 en/merge-options.txt:86
+#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3550,7 +3550,7 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:186 en/git-add.txt:111 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/diff-options.txt:23 en/fetch-options.txt:198 en/git-add.txt:111 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
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
@@ -3574,7 +3574,7 @@ msgid "\tThis is the default.\n"
msgstr ""
#. 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:117 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
+#: 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:118 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"
@@ -3993,7 +3993,7 @@ msgid "Synonym for --dirstat=files,param1,param2..."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:129
+#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--summary"
msgstr "--summary"
@@ -4017,7 +4017,7 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:122 en/git-update-index.txt:168
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:168
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4426,7 +4426,7 @@ msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:402 en/git-status.txt:139
+#: en/diff-options.txt:402 en/git-status.txt:143
#, ignore-same, no-wrap, priority:280
msgid "--no-renames"
msgstr "--no-renames"
@@ -4530,7 +4530,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:463
#, priority:280
-msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
+msgid "It affects the way a change that amounts to a total rewrite of a file does not appear as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
msgstr ""
#. type: Plain text
@@ -4546,7 +4546,7 @@ msgid "-M[<n>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:473 en/git-status.txt:143
+#: en/diff-options.txt:473 en/git-status.txt:147
#, no-wrap, priority:280
msgid "--find-renames[=<n>]"
msgstr ""
@@ -4969,7 +4969,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:203 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:52 en/git-clone.txt:120 en/git-commit.txt:314 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:301 en/git-gc.txt:68 en/git-grep.txt:296 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:315 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:255 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:136 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:215 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:316 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:302 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:256 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5023,7 +5023,7 @@ msgid "Allow (or disallow) external text conversion filters to be run when compa
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:85
+#: en/diff-options.txt:722 en/git-status.txt:87
#, no-wrap, priority:280
msgid "--ignore-submodules[=<when>]"
msgstr ""
@@ -5101,7 +5101,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:265 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:266 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5233,7 +5233,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:48 en/git-commit.txt:317 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:50 en/git-commit.txt:319 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5245,13 +5245,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:34 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:195 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:347 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:278 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:279 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:35 en/git-fast-import.txt:37 en/git-filter-branch.txt:196 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:279 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:280 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5283,7 +5283,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:112 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:113 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5361,7 +5361,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:47 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:97 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:326 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:301 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:85
+#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:98 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:302 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5427,187 +5427,211 @@ msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:167
+#: en/fetch-options.txt:164
+#, priority:220
+msgid "Number of parallel children to be used for all forms of fetching."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:169
+#, priority:220
+msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:172
#, priority:220
-msgid "Number of parallel children to be used for fetching submodules. Each will fetch from different submodules, such that fetching many submodules will be faster. By default submodules will be fetched one at a time."
+msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:168 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:173 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:171
+#: en/fetch-options.txt:176
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:172
+#: en/fetch-options.txt:177 en/git-branch.txt:225 en/git-push.txt:349
+#, ignore-same, no-wrap, priority:240
+msgid "--set-upstream"
+msgstr "--set-upstream"
+
+#. type: Plain text
+#: en/fetch-options.txt:183
+#, priority:220
+msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:184
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:188
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177
+#: en/fetch-options.txt:189
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:184
+#: en/fetch-options.txt:196
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:199
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:194
+#: en/fetch-options.txt:206
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:195 en/git-clone.txt:182
+#: en/fetch-options.txt:207 en/git-clone.txt:182
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:212
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:202 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:51 en/git-clone.txt:119 en/git-commit.txt:313 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:300 en/git-grep.txt:295 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:314 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:254 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:135
+#: en/fetch-options.txt:214 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:315 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:301 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:255 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:207
+#: en/fetch-options.txt:219
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:208 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:298 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:318 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:139
+#: en/fetch-options.txt:220 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:300 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:209 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:299 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:319 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:140
+#: en/fetch-options.txt:221 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:301 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:211 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:142
+#: en/fetch-options.txt:223 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:213 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:326 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:258 en/git-switch.txt:144 en/merge-options.txt:143
+#: en/fetch-options.txt:225 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:328 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:259 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:218 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:230 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:219 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:231 en/git-ls-remote.txt:73 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:220 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:232 en/git-clone.txt:135 en/git-ls-remote.txt:74
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-clone.txt:142
+#: en/fetch-options.txt:239 en/git-clone.txt:142
#, priority:300
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:240
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:233
+#: en/fetch-options.txt:245
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:234
+#: en/fetch-options.txt:246
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:240
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:241 en/git-push.txt:398
+#: en/fetch-options.txt:253 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:242 en/git-push.txt:399
+#: en/fetch-options.txt:254 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:244 en/git-push.txt:401
+#: en/fetch-options.txt:256 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:245 en/git-push.txt:402
+#: en/fetch-options.txt:257 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:246 en/git-push.txt:403
+#: en/fetch-options.txt:258 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:247 en/git-push.txt:405
+#: en/fetch-options.txt:259 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5647,7 +5671,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:20 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:67 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
+#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr ""
@@ -5689,13 +5713,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr ""
#. type: Title -
-#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:83 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:85 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:115 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:253 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:86 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:254 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:52 en/git-grep.txt:308 en/git-status.txt:148
+#: en/git-add.txt:52 en/git-grep.txt:325 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
@@ -5707,7 +5731,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:67 en/git-grep.txt:314
+#: en/git-add.txt:67 en/git-grep.txt:331
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -5725,13 +5749,13 @@ msgid "Allow adding otherwise ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:42 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:394 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:43 en/git-rebase.txt:395 en/git-rebase.txt:536 en/git-svn.txt:297
+#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5755,7 +5779,7 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:275 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
@@ -5845,7 +5869,7 @@ msgid "This option is primarily to help users who are used to older versions of
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:146 en/git-format-patch.txt:101 en/git-submodule.txt:340
+#: en/git-add.txt:146 en/git-format-patch.txt:102 en/git-submodule.txt:341
#, no-wrap, priority:300
msgid "-N"
msgstr ""
@@ -5935,7 +5959,7 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:343 en/git-grep.txt:304 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
+#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:345 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr ""
@@ -5947,7 +5971,7 @@ msgid "This option can be used to separate command-line options from the list of
msgstr ""
#. type: Title -
-#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:357 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:153 en/git-fetch.txt:242 en/git-filter-branch.txt:234 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:634 en/git-grep.txt:316 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:206 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:359 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:638 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr ""
@@ -5989,7 +6013,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:221 en/git-rebase.txt:591
+#: en/git-add.txt:221 en/git-rebase.txt:613
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr ""
@@ -6001,7 +6025,7 @@ msgid "When the command enters the interactive mode, it shows the output of the
msgstr ""
#. type: Plain text
-#: en/git-add.txt:230 en/git-clean.txt:83
+#: en/git-add.txt:230 en/git-clean.txt:85
#, priority:300
msgid "The command loop shows the list of subcommands available, and gives a prompt \"What now> \". In general, when the prompt ends with a single '>', you can pick only one of the choices given and type return, like this:"
msgstr ""
@@ -6301,7 +6325,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:135 en/git-commit-tree.txt:118 en/git-commit.txt:487 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:241 en/git-fast-import.txt:1503 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:679 en/git-gc.txt:154 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:112 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:247 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:519 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:292 en/git-status.txt:434 en/git-submodule.txt:436 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
+#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:489 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1526 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:683 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:437 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
@@ -6313,13 +6337,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:139 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:495 en/git-config.txt:492 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:245 en/git-fast-import.txt:1507 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:480 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:683 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:334 en/git-gui.txt:126 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:116 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:230 en/git-merge-file.txt:94 en/git-merge-index.txt:78 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1052 en/git-receive-pack.txt:251 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:123 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:523 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:300 en/git-status.txt:438 en/git-stripspace.txt:93 en/git-submodule.txt:440 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
+#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:497 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1530 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:693 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:687 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:441 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
#, no-wrap, priority:300
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:140 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:496 en/git-config.txt:493 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:246 en/git-fast-import.txt:1508 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:481 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:684 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:335 en/git-gui.txt:127 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:117 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:231 en/git-merge-file.txt:95 en/git-merge-index.txt:79 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1053 en/git-receive-pack.txt:252 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:124 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:524 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:301 en/git-status.txt:439 en/git-stripspace.txt:94 en/git-submodule.txt:441 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
+#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:498 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1531 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:694 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:688 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:442 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6369,7 +6393,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:118 en/git-rebase.txt:387 en/git-revert.txt:98 en/merge-options.txt:73
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:119 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6411,7 +6435,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:969
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:985
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6441,7 +6465,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:267 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:989
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1005
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6533,37 +6557,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:303 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:304 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:307 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:373 en/git-rebase.txt:524
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:374
+#: en/git-am.txt:109 en/git-rebase.txt:396
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:337
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6623,7 +6647,7 @@ msgid "Run interactively."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:380 en/git-rebase.txt:521
+#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6635,7 +6659,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:381 en/git-rebase.txt:522
+#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6647,7 +6671,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:256 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6659,31 +6683,31 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:333 en/git-rebase.txt:308 en/git-revert.txt:91 en/merge-options.txt:58
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:335 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:334 en/git-rebase.txt:309 en/git-revert.txt:92 en/merge-options.txt:59
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:336 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:338 en/git-rebase.txt:313 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:340 en/git-rebase.txt:331 en/git-revert.txt:96
#, priority:280
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:228 en/sequencer.txt:1
+#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:246 en/sequencer.txt:1
#, ignore-same, no-wrap, priority:240
msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:406 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:997
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1013
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6713,7 +6737,7 @@ msgid "When a patch failure occurs, <msg> will be printed to the screen before e
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:231 en/sequencer.txt:15
+#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:249 en/sequencer.txt:15
#, ignore-same, no-wrap, priority:240
msgid "--abort"
msgstr "--abort"
@@ -6725,7 +6749,7 @@ msgid "Restore the original branch and abort the patching operation."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:238 en/sequencer.txt:10
+#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:256 en/sequencer.txt:10
#, ignore-same, no-wrap, priority:240
msgid "--quit"
msgstr "--quit"
@@ -6737,7 +6761,7 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:262
+#: en/git-am.txt:179 en/git-rebase.txt:280
#, ignore-same, no-wrap, priority:100
msgid "--show-current-patch"
msgstr "--show-current-patch"
@@ -6749,7 +6773,7 @@ msgid "Show the patch being applied when \"git am\" is stopped because of confli
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:451 en/git-format-patch.txt:351 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:188 en/git-tag.txt:231
+#: en/git-am.txt:184 en/git-commit.txt:453 en/git-format-patch.txt:355 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
@@ -6833,7 +6857,7 @@ msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the curren
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:471 en/git-gc.txt:147
+#: en/git-am.txt:234 en/git-commit.txt:473 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
@@ -6931,7 +6955,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:322 en/merge-options.txt:84
+#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -6973,7 +6997,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:291
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:292
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7045,7 +7069,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:342
+#: en/git-apply.txt:134 en/git-rebase.txt:360
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7261,7 +7285,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:330 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:398 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:332 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -9183,7 +9207,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:525
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9219,13 +9243,13 @@ msgid "Sorting and filtering branches are case insensitive."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:153 en/git-status.txt:126 en/git-tag.txt:134
+#: en/git-branch.txt:153 en/git-status.txt:130 en/git-tag.txt:134
#, no-wrap, priority:280
msgid "--column[=<options>]"
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:154 en/git-status.txt:127 en/git-tag.txt:135
+#: en/git-branch.txt:154 en/git-status.txt:131 en/git-tag.txt:135
#, ignore-same, no-wrap, priority:280
msgid "--no-column"
msgstr "--no-column"
@@ -9350,12 +9374,6 @@ msgstr "--no-track"
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
-#. type: Labeled list
-#: en/git-branch.txt:225 en/git-push.txt:349
-#, ignore-same, no-wrap, priority:240
-msgid "--set-upstream"
-msgstr "--set-upstream"
-
#. type: Plain text
#: en/git-branch.txt:228
#, priority:240
@@ -9625,7 +9643,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-filter-branch.txt:449 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10245,7 +10263,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:152 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10894,7 +10912,7 @@ msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will al
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:226
+#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
@@ -11091,7 +11109,7 @@ msgid "Only meaningful with `--stdin`; paths are separated with NUL character in
msgstr ""
#. type: Plain text
-#: en/git-checkout-index.txt:73 en/git-commit.txt:345 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
+#: en/git-checkout-index.txt:73 en/git-commit.txt:347 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
#, priority:280
msgid "Do not interpret any more arguments as options."
msgstr ""
@@ -11412,7 +11430,7 @@ msgid "Quiet, suppress feedback messages."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:144
+#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:152
#, ignore-same, no-wrap, priority:240
msgid "--no-progress"
msgstr "--no-progress"
@@ -11598,7 +11616,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:241 en/git-rebase.txt:268 en/git-rebase.txt:529 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:354 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
+#: en/git-checkout.txt:241 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:355 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11718,7 +11736,7 @@ msgid "In the default overlay mode, `git checkout` never removes files from the
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:312 en/git-rebase.txt:225 en/git-switch.txt:36
+#: en/git-checkout.txt:312 en/git-rebase.txt:243 en/git-switch.txt:36
#, no-wrap, priority:240
msgid "<branch>"
msgstr ""
@@ -12424,7 +12442,7 @@ msgid "This option determines how the commit message will be cleaned up before b
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:65 en/git-clean.txt:61
+#: en/git-cherry-pick.txt:65 en/git-clean.txt:63
#, ignore-same, no-wrap, priority:100
msgid "-x"
msgstr "-x"
@@ -12508,7 +12526,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:249 en/git-rebase.txt:532
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:267 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12532,7 +12550,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:282 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:109
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12550,7 +12568,7 @@ msgid "-X<option>"
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:125
#, no-wrap, priority:240
msgid "--strategy-option=<option>"
msgstr ""
@@ -12746,7 +12764,7 @@ msgid "Show the commit subjects next to the SHA1s."
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:32 en/git-rebase.txt:220
+#: en/git-cherry.txt:32 en/git-rebase.txt:238
#, no-wrap, priority:100
msgid "<upstream>"
msgstr ""
@@ -12764,7 +12782,7 @@ msgid "<head>"
msgstr ""
#. type: Plain text
-#: en/git-cherry.txt:38 en/git-rebase.txt:227
+#: en/git-cherry.txt:38 en/git-rebase.txt:245
#, priority:100
msgid "Working branch; defaults to HEAD."
msgstr ""
@@ -12977,85 +12995,85 @@ msgid "If any optional `<path>...` arguments are given, only those paths are aff
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:33
+#: en/git-clean.txt:35
#, priority:100
-msgid "Remove untracked directories in addition to untracked files. If an untracked directory is managed by a different Git repository, it is not removed by default. Use -f option twice if you really want to remove such a directory."
+msgid "Normally, when no <path> is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. If any paths are specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under `--force`) will be removed."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:41
+#: en/git-clean.txt:43
#, priority:100
-msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f, -n or -i. Git will refuse to delete directories with .git sub directory or file unless a second -f is given."
+msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f or -i. Git will refuse to modify untracked nested git repositories (directories with a .git subdirectory) unless a second -f is given."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:46
+#: en/git-clean.txt:48
#, priority:100
msgid "Show what would be done and clean files interactively. See ``Interactive mode'' for details."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:50
+#: en/git-clean.txt:52
#, priority:100
msgid "Don't actually remove anything, just show what would be done."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:55
+#: en/git-clean.txt:57
#, priority:100
msgid "Be quiet, only report errors, but not the files that are successfully removed."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:56
+#: en/git-clean.txt:58
#, no-wrap, priority:100
msgid "-e <pattern>"
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:57 en/git-ls-files.txt:85 en/git-name-rev.txt:33
+#: en/git-clean.txt:59 en/git-ls-files.txt:85 en/git-name-rev.txt:33
#, no-wrap, priority:100
msgid "--exclude=<pattern>"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:60
+#: en/git-clean.txt:62
#, priority:100
msgid "Use the given exclude pattern in addition to the standard ignore rules (see linkgit:gitignore[5])."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:68
+#: en/git-clean.txt:70
#, priority:100
msgid "Don't use the standard ignore rules (see linkgit:gitignore[5]), but still use the ignore rules given with `-e` options from the command line. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git restore' or 'git reset') to create a pristine working directory to test a clean build."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:69
+#: en/git-clean.txt:71
#, no-wrap, priority:100
msgid "-X"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:72
+#: en/git-clean.txt:74
#, priority:100
msgid "Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files."
msgstr ""
#. type: Title -
-#: en/git-clean.txt:74
+#: en/git-clean.txt:76
#, no-wrap, priority:100
msgid "Interactive mode"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:78
+#: en/git-clean.txt:80
#, priority:100
msgid "When the command enters the interactive mode, it shows the files and directories to be cleaned, and goes into its interactive command loop."
msgstr ""
#. type: delimited block -
-#: en/git-clean.txt:89
+#: en/git-clean.txt:91
#, no-wrap, priority:100
msgid ""
" *** Commands ***\n"
@@ -13065,91 +13083,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:92
+#: en/git-clean.txt:94
#, priority:100
msgid "You also could say `c` or `clean` above as long as the choice is unique."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:94
+#: en/git-clean.txt:96
#, priority:100
msgid "The main command loop has 6 subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:95
+#: en/git-clean.txt:97
#, no-wrap, priority:100
msgid "clean"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:98
+#: en/git-clean.txt:100
#, priority:100
msgid "Start cleaning files and directories, and then quit."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:99
+#: en/git-clean.txt:101
#, no-wrap, priority:100
msgid "filter by pattern"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:107
+#: en/git-clean.txt:109
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Input ignore patterns>>\" prompt. You can input space-separated patterns to exclude files and directories from deletion. E.g. \"*.c *.h\" will excludes files end with \".c\" and \".h\" from deletion. When you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:108
+#: en/git-clean.txt:110
#, no-wrap, priority:100
msgid "select by numbers"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:119
+#: en/git-clean.txt:121
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Select items to delete>>\" prompt. When the prompt ends with double '>>' like this, you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything. Also when you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:120
+#: en/git-clean.txt:122
#, no-wrap, priority:100
msgid "ask each"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:125
+#: en/git-clean.txt:127
#, priority:100
msgid "This will start to clean, and you must confirm one by one in order to delete items. Please note that this action is not as efficient as the above two actions."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:126
+#: en/git-clean.txt:128
#, no-wrap, priority:100
msgid "quit"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:129
+#: en/git-clean.txt:131
#, priority:100
msgid "This lets you quit without do cleaning."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:130
+#: en/git-clean.txt:132
#, no-wrap, priority:100
msgid "help"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:133
+#: en/git-clean.txt:135
#, priority:100
msgid "Show brief usage of interactive git-clean."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:137 en/git-status.txt:436
+#: en/git-clean.txt:139 en/git-status.txt:440
#, ignore-same, priority:280
msgid "linkgit:gitignore[5]"
msgstr "linkgit:gitignore[5]"
@@ -13288,7 +13306,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:108 en/git-submodule.txt:392
+#: en/git-clone.txt:108 en/git-submodule.txt:393
#, ignore-same, no-wrap, priority:300
msgid "--dissociate"
msgstr "--dissociate"
@@ -13534,13 +13552,13 @@ msgid "Instead of placing the cloned repository where it is supposed to be, plac
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:277 en/git-submodule.txt:416
+#: en/git-clone.txt:277 en/git-submodule.txt:417
#, no-wrap, priority:300
msgid "-j <n>"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:278 en/git-submodule.txt:417
+#: en/git-clone.txt:278 en/git-submodule.txt:418
#, no-wrap, priority:300
msgid "--jobs <n>"
msgstr ""
@@ -13898,7 +13916,7 @@ msgid "Read the commit log message from the given file. Use `-` to read from the
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:68 en/git-commit.txt:339
+#: en/git-commit-tree.txt:68 en/git-commit.txt:341
#, ignore-same, no-wrap, priority:280
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
@@ -13982,7 +14000,7 @@ msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:477 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:428 en/git-svn.txt:1156
+#: en/git-commit-tree.txt:114 en/git-commit.txt:479 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:429 en/git-svn.txt:1156
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
@@ -14288,13 +14306,13 @@ msgid "When editing the commit message, start the editor with the contents in th
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:173 en/merge-options.txt:81
+#: en/git-commit.txt:173 en/merge-options.txt:85
#, priority:280
msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:175 en/git-rebase.txt:330
+#: en/git-commit.txt:175 en/git-rebase.txt:348 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14501,115 +14519,115 @@ msgid "Show untracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:288
+#: en/git-commit.txt:289
#, priority:280
msgid "The mode parameter is optional (defaults to 'all'), and is used to specify the handling of untracked files; when -u is not used, the default is 'normal', i.e. show untracked files and directories."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:290 en/git-status.txt:67 en/git-status.txt:107
+#: en/git-commit.txt:291 en/git-status.txt:68 en/git-status.txt:110
#, priority:280
msgid "The possible options are:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:292
+#: en/git-commit.txt:293
#, no-wrap, priority:280
msgid "'no' - Show no untracked files\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:293
+#: en/git-commit.txt:294
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:294 en/git-status.txt:71
+#: en/git-commit.txt:295 en/git-status.txt:72
#, no-wrap, priority:280
msgid "'all' - Also shows individual files in untracked directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:297 en/git-status.txt:84
+#: en/git-commit.txt:298 en/git-status.txt:85
#, priority:280
msgid "The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:308
+#: en/git-commit.txt:310
#, priority:280
msgid "Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template to help the user describe the commit by reminding what changes the commit has. Note that this diff output doesn't have its lines prefixed with '#'. This diff will not be a part of the commit message. See the `commit.verbose` configuration variable in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:312
+#: en/git-commit.txt:314
#, priority:280
msgid "If specified twice, show in addition the unified diff between what would be committed and the worktree files, i.e. the unstaged changes to tracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:316
+#: en/git-commit.txt:318
#, priority:280
msgid "Suppress commit summary message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:321
+#: en/git-commit.txt:323
#, priority:280
msgid "Do not create a commit, but show a list of paths that are to be committed, paths with local changes that will be left uncommitted and paths that are untracked."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:322
+#: en/git-commit.txt:324
#, ignore-same, no-wrap, priority:280
msgid "--status"
msgstr "--status"
#. type: Plain text
-#: en/git-commit.txt:327
+#: en/git-commit.txt:329
#, priority:280
msgid "Include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the commit message. Defaults to on, but can be used to override configuration variable commit.status."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:328
+#: en/git-commit.txt:330
#, ignore-same, no-wrap, priority:280
msgid "--no-status"
msgstr "--no-status"
#. type: Plain text
-#: en/git-commit.txt:332
+#: en/git-commit.txt:334
#, priority:280
msgid "Do not include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the default commit message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:342
+#: en/git-commit.txt:344
#, priority:280
msgid "Countermand `commit.gpgSign` configuration variable that is set to force each and every commit to be signed."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:346 en/git-rm.txt:29
+#: en/git-commit.txt:348 en/git-rm.txt:29
#, ignore-ellipsis, no-wrap, priority:280
msgid "<file>..."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:352
+#: en/git-commit.txt:354
#, priority:280
msgid "When files are given on the command line, the command commits the contents of the named files, without recording the changes already staged. The contents of these files are also staged for the next commit on top of what have been staged before."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:369
+#: en/git-commit.txt:371
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:375
+#: en/git-commit.txt:377
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14619,13 +14637,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:383
+#: en/git-commit.txt:385
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:388
+#: en/git-commit.txt:390
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14634,19 +14652,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:393
+#: en/git-commit.txt:395
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:398
+#: en/git-commit.txt:400
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:404
+#: en/git-commit.txt:406
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14656,31 +14674,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:411
+#: en/git-commit.txt:413
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:414 en/git-commit.txt:440
+#: en/git-commit.txt:416 en/git-commit.txt:442
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:418
+#: en/git-commit.txt:420
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:426
+#: en/git-commit.txt:428
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:432
+#: en/git-commit.txt:434
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14690,55 +14708,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:437
+#: en/git-commit.txt:439
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:448
+#: en/git-commit.txt:450
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:460
+#: en/git-commit.txt:462
#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:464
+#: en/git-commit.txt:466
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:469
+#: en/git-commit.txt:471
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:475
+#: en/git-commit.txt:477
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:479
+#: en/git-commit.txt:481
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:485
+#: en/git-commit.txt:487
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:493
+#: en/git-commit.txt:495
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -15406,211 +15424,211 @@ msgstr ""
msgid "Given a .git/config like this:"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:347
+#. type: delimited block -
+#: en/git-config.txt:348
#, no-wrap, priority:100
msgid ""
-"\t#\n"
-"\t# This is the config file, and\n"
-"\t# a '#' or ';' character indicates\n"
-"\t# a comment\n"
-"\t#\n"
+"#\n"
+"# This is the config file, and\n"
+"# a '#' or ';' character indicates\n"
+"# a comment\n"
+"#\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:352
+#. type: delimited block -
+#: en/git-config.txt:353 en/git.txt:310
#, no-wrap, priority:100
msgid ""
-"\t; core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"; core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:357
+#. type: delimited block -
+#: en/git-config.txt:358
#, no-wrap, priority:100
msgid ""
-"\t; Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"; Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:362
+#. type: delimited block -
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
-"\t; Proxy settings\n"
-"\t[core]\n"
-"\t\tgitproxy=proxy-command for kernel.org\n"
-"\t\tgitproxy=default-proxy ; for all the rest\n"
+"; Proxy settings\n"
+"[core]\n"
+"\tgitproxy=proxy-command for kernel.org\n"
+"\tgitproxy=default-proxy ; for all the rest\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:369
+#. type: delimited block -
+#: en/git-config.txt:370
#, no-wrap, priority:100
msgid ""
-"\t; HTTP\n"
-"\t[http]\n"
-"\t\tsslVerify\n"
-"\t[http \"https://weak.example.com\"]\n"
-"\t\tsslVerify = false\n"
-"\t\tcookieFile = /tmp/cookie.txt\n"
+"; HTTP\n"
+"[http]\n"
+"\tsslVerify\n"
+"[http \"https://weak.example.com\"]\n"
+"\tsslVerify = false\n"
+"\tcookieFile = /tmp/cookie.txt\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:371
+#: en/git-config.txt:373
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:374
+#: en/git-config.txt:376
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:379
+#: en/git-config.txt:381
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:382
+#: en/git-config.txt:384
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:385
+#: en/git-config.txt:387
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:389
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:390
+#: en/git-config.txt:392
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:394
+#: en/git-config.txt:396
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:398
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:399
+#: en/git-config.txt:401
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:402 en/git-gui.txt:120 en/git-merge-index.txt:64
+#: en/git-config.txt:404 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:407
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:410
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:413
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:414
+#: en/git-config.txt:416
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:417
+#: en/git-config.txt:419
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:421
+#: en/git-config.txt:423
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:424
+#: en/git-config.txt:426
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:428
+#: en/git-config.txt:430
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:431
+#: en/git-config.txt:433
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:434
+#: en/git-config.txt:436
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:437
+#: en/git-config.txt:439
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:440
+#: en/git-config.txt:442
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:443
+#: en/git-config.txt:445
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:447
+#: en/git-config.txt:449
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:453
+#: en/git-config.txt:455
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15620,13 +15638,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:457
+#: en/git-config.txt:459
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:466
+#: en/git-config.txt:468
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15639,19 +15657,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:471 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1029 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
+#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:476
+#: en/git-config.txt:478
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:482
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15659,13 +15677,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:483
+#: en/git-config.txt:485
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:488
+#: en/git-config.txt:490
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -17028,7 +17046,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
msgstr ""
#. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:234
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
#, no-wrap, priority:100
msgid "LIMITATIONS"
msgstr ""
@@ -18533,7 +18551,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:976
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:992
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19085,7 +19103,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:422
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:423
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -19181,13 +19199,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:982
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:998
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:988
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1004
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -19542,9 +19560,9 @@ msgid "This program dumps the given revisions in a form suitable to be piped int
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:22
+#: en/git-fast-export.txt:23
#, priority:100
-msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a kind of an interactive 'git filter-branch'."
+msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
@@ -19631,146 +19649,158 @@ msgstr ""
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
+#. type: Labeled list
+#: en/git-fast-export.txt:79
+#, ignore-same, no-wrap, priority:100
+msgid "--mark-tags"
+msgstr "--mark-tags"
+
+#. type: Plain text
+#: en/git-fast-export.txt:87
+#, priority:100
+msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
+msgstr ""
+
#. type: Plain text
-#: en/git-fast-export.txt:83
+#: en/git-fast-export.txt:92
#, priority:100
-msgid "Any commits that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
+msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:84
+#: en/git-fast-export.txt:93
#, ignore-same, no-wrap, priority:100
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
-#: en/git-fast-export.txt:89
+#: en/git-fast-export.txt:98
#, priority:100
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:90
+#: en/git-fast-export.txt:99
#, ignore-same, no-wrap, priority:100
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
-#: en/git-fast-export.txt:93
+#: en/git-fast-export.txt:102
#, priority:100
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:94
+#: en/git-fast-export.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
-#: en/git-fast-export.txt:101
+#: en/git-fast-export.txt:110
#, priority:100
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
+#: en/git-fast-export.txt:111 en/git-ls-tree.txt:72
#, ignore-same, no-wrap, priority:100
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
-#: en/git-fast-export.txt:107
+#: en/git-fast-export.txt:116
#, priority:100
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:108
+#: en/git-fast-export.txt:117
#, ignore-same, no-wrap, priority:100
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
-#: en/git-fast-export.txt:112
+#: en/git-fast-export.txt:121
#, priority:100
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:113
+#: en/git-fast-export.txt:122
#, ignore-same, no-wrap, priority:100
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
-#: en/git-fast-export.txt:124
+#: en/git-fast-export.txt:133
#, priority:100
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:125
+#: en/git-fast-export.txt:134
#, ignore-same, no-wrap, priority:100
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
-#: en/git-fast-export.txt:131
+#: en/git-fast-export.txt:140
#, priority:100
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:132
+#: en/git-fast-export.txt:141
#, no-wrap, priority:100
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:138
+#: en/git-fast-export.txt:147
#, priority:100
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be reencoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:139
+#: en/git-fast-export.txt:148
#, ignore-same, no-wrap, priority:100
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
-#: en/git-fast-export.txt:142
+#: en/git-fast-export.txt:151
#, priority:100
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:143
+#: en/git-fast-export.txt:152
#, ignore-ellipsis, no-wrap, priority:100
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:160
#, priority:100
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:157
+#: en/git-fast-export.txt:166
#, no-wrap, priority:100
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:162
+#: en/git-fast-export.txt:171
#, priority:100
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:167
+#: en/git-fast-export.txt:176
#, no-wrap, priority:100
msgid ""
"$ git fast-export master~5..master |\n"
@@ -19779,55 +19809,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:180
#, priority:100
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:175
+#: en/git-fast-export.txt:184
#, priority:100
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
-#: en/git-fast-export.txt:178
+#: en/git-fast-export.txt:187
#, no-wrap, priority:100
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:186
+#: en/git-fast-export.txt:195
#, priority:100
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:198
+#: en/git-fast-export.txt:207
#, priority:100
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:201
+#: en/git-fast-export.txt:210
#, priority:100
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:204
+#: en/git-fast-export.txt:213
#, no-wrap, priority:100
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:209
+#: en/git-fast-export.txt:218
#, priority:100
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:215
+#: en/git-fast-export.txt:224
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git init anon-repo\n"
@@ -19837,25 +19867,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:222
+#: en/git-fast-export.txt:231
#, priority:100
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:225
+#: en/git-fast-export.txt:234
#, no-wrap, priority:100
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:240
#, priority:100
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:239
+#: en/git-fast-export.txt:248
#, priority:100
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
@@ -20089,7 +20119,7 @@ msgid "See linkgit:git-config[1]"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:144 en/git-p4.txt:507
+#: en/git-fast-import.txt:144 en/git-filter-branch.txt:463 en/git-p4.txt:507
#, no-wrap, priority:100
msgid "PERFORMANCE"
msgstr ""
@@ -20323,7 +20353,7 @@ msgid "fast-import accepts several commands to update the current repository and
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:319 en/git-fast-import.txt:381
+#: en/git-fast-import.txt:319 en/git-fast-import.txt:388
#, ignore-same, no-wrap, priority:100
msgid "`commit`"
msgstr "`commit`"
@@ -20335,7 +20365,7 @@ msgid "Creates a new branch or updates an existing branch by creating a new comm
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:324 en/git-fast-import.txt:771
+#: en/git-fast-import.txt:324 en/git-fast-import.txt:778
#, ignore-same, no-wrap, priority:100
msgid "`tag`"
msgstr "`tag`"
@@ -20347,7 +20377,7 @@ msgid "Creates an annotated tag object from an existing commit or branch. Light
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:330 en/git-fast-import.txt:815
+#: en/git-fast-import.txt:330 en/git-fast-import.txt:823
#, ignore-same, no-wrap, priority:100
msgid "`reset`"
msgstr "`reset`"
@@ -20359,7 +20389,7 @@ msgid "Reset an existing branch (or a new branch) to a specific revision. This
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:335 en/git-fast-import.txt:844
+#: en/git-fast-import.txt:335 en/git-fast-import.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`blob`"
msgstr "`blob`"
@@ -20371,109 +20401,121 @@ msgid "Convert raw file data into a blob, for future use in a `commit` command.
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:340 en/git-fast-import.txt:917
+#: en/git-fast-import.txt:340 en/git-fast-import.txt:925
+#, ignore-same, no-wrap, priority:100
+msgid "`alias`"
+msgstr "`alias`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:346
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
+msgstr ""
+
+#. type: Title ~
+#: en/git-fast-import.txt:347 en/git-fast-import.txt:940
#, ignore-same, no-wrap, priority:100
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
-#: en/git-fast-import.txt:345
+#: en/git-fast-import.txt:352
#, priority:100
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:346 en/git-fast-import.txt:945
+#: en/git-fast-import.txt:353 en/git-fast-import.txt:968
#, ignore-same, no-wrap, priority:100
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
-#: en/git-fast-import.txt:350
+#: en/git-fast-import.txt:357
#, priority:100
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:351 en/git-fast-import.txt:1152
+#: en/git-fast-import.txt:358 en/git-fast-import.txt:1175
#, ignore-same, no-wrap, priority:100
msgid "`done`"
msgstr "`done`"
#. type: Plain text
-#: en/git-fast-import.txt:355
+#: en/git-fast-import.txt:362
#, priority:100
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:356 en/git-fast-import.txt:970
+#: en/git-fast-import.txt:363 en/git-fast-import.txt:993
#, ignore-same, no-wrap, priority:100
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
-#: en/git-fast-import.txt:360
+#: en/git-fast-import.txt:367
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:361 en/git-fast-import.txt:985
+#: en/git-fast-import.txt:368 en/git-fast-import.txt:1008
#, ignore-same, no-wrap, priority:100
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
-#: en/git-fast-import.txt:365
+#: en/git-fast-import.txt:372
#, priority:100
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:366 en/git-fast-import.txt:1016
+#: en/git-fast-import.txt:373 en/git-fast-import.txt:1039
#, ignore-same, no-wrap, priority:100
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
-#: en/git-fast-import.txt:370
+#: en/git-fast-import.txt:377
#, priority:100
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:371 en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:378 en/git-fast-import.txt:1092
#, ignore-same, no-wrap, priority:100
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
#, priority:100
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:1124
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:1147
#, ignore-same, no-wrap, priority:100
msgid "`option`"
msgstr "`option`"
#. type: Plain text
-#: en/git-fast-import.txt:379
+#: en/git-fast-import.txt:386
#, priority:100
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:384
+#: en/git-fast-import.txt:391
#, priority:100
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
#, no-wrap, priority:100
msgid ""
"\t'commit' SP <ref> LF\n"
@@ -20484,247 +20526,247 @@ msgid ""
"\t('encoding' SP <encoding>)?\n"
"\tdata\n"
"\t('from' SP <commit-ish> LF)?\n"
-"\t('merge' SP <commit-ish> LF)?\n"
+"\t('merge' SP <commit-ish> LF)*\n"
"\t(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*\n"
"\tLF?\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:405
+#: en/git-fast-import.txt:412
#, priority:100
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:411
+#: en/git-fast-import.txt:418
#, priority:100
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:417
+#: en/git-fast-import.txt:424
#, priority:100
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:425
+#: en/git-fast-import.txt:432
#, priority:100
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:432
+#: en/git-fast-import.txt:439
#, priority:100
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:434
+#: en/git-fast-import.txt:441
#, ignore-same, no-wrap, priority:100
msgid "`author`"
msgstr "`author`"
#. type: Plain text
-#: en/git-fast-import.txt:440
+#: en/git-fast-import.txt:447
#, priority:100
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:442
+#: en/git-fast-import.txt:449
#, ignore-same, no-wrap, priority:100
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
-#: en/git-fast-import.txt:445
+#: en/git-fast-import.txt:452
#, priority:100
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
#, priority:100
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:458
+#: en/git-fast-import.txt:465
#, priority:100
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:460
+#: en/git-fast-import.txt:467
#, ignore-same, no-wrap, priority:100
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
-#: en/git-fast-import.txt:464
+#: en/git-fast-import.txt:471
#, priority:100
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:466
+#: en/git-fast-import.txt:473
#, ignore-same, no-wrap, priority:100
msgid "`from`"
msgstr "`from`"
#. type: Plain text
-#: en/git-fast-import.txt:472
+#: en/git-fast-import.txt:479
#, priority:100
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
#, priority:100
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:485
+#: en/git-fast-import.txt:492
#, priority:100
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
#, priority:100
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:491
+#: en/git-fast-import.txt:498
#, priority:100
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:493
+#: en/git-fast-import.txt:500
#, priority:100
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:499
+#: en/git-fast-import.txt:506
#, priority:100
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:501
+#: en/git-fast-import.txt:508
#, priority:100
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:503
+#: en/git-fast-import.txt:510
#, priority:100
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
#, priority:100
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:509
+#: en/git-fast-import.txt:516
#, priority:100
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:512
+#: en/git-fast-import.txt:519
#, priority:100
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
#, no-wrap, priority:100
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:521
+#: en/git-fast-import.txt:528
#, priority:100
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:523
+#: en/git-fast-import.txt:530
#, ignore-same, no-wrap, priority:100
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
-#: en/git-fast-import.txt:531
+#: en/git-fast-import.txt:538
#, priority:100
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:534
+#: en/git-fast-import.txt:541
#, priority:100
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:536
+#: en/git-fast-import.txt:543
#, ignore-same, no-wrap, priority:100
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:540
+#: en/git-fast-import.txt:547
#, priority:100
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:541 en/git-fast-import.txt:708
+#: en/git-fast-import.txt:548 en/git-fast-import.txt:715
#, no-wrap, priority:100
msgid "External data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:544
+#: en/git-fast-import.txt:551
#, priority:100
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:547
+#: en/git-fast-import.txt:554
#, no-wrap, priority:100
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
#, priority:100
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:555 en/git-fast-import.txt:721
+#: en/git-fast-import.txt:562 en/git-fast-import.txt:728
#, no-wrap, priority:100
msgid "Inline data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:559
+#: en/git-fast-import.txt:566
#, priority:100
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
#, no-wrap, priority:100
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -20732,259 +20774,259 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:566 en/git-fast-import.txt:732
+#: en/git-fast-import.txt:573 en/git-fast-import.txt:739
#, priority:100
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:569
+#: en/git-fast-import.txt:576
#, priority:100
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
#, priority:100
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:574
+#: en/git-fast-import.txt:581
#, priority:100
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:575
+#: en/git-fast-import.txt:582
#, priority:100
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
#, priority:100
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:580
+#: en/git-fast-import.txt:587
#, priority:100
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:583
+#: en/git-fast-import.txt:590
#, priority:100
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:587
+#: en/git-fast-import.txt:594
#, priority:100
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:594
+#: en/git-fast-import.txt:601
#, priority:100
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
#, priority:100
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:598
+#: en/git-fast-import.txt:605
#, priority:100
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:599
+#: en/git-fast-import.txt:606
#, priority:100
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:600
+#: en/git-fast-import.txt:607
#, priority:100
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:602
+#: en/git-fast-import.txt:609
#, priority:100
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:604
+#: en/git-fast-import.txt:611
#, priority:100
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:606
+#: en/git-fast-import.txt:613
#, priority:100
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:608
+#: en/git-fast-import.txt:615
#, ignore-same, no-wrap, priority:100
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
-#: en/git-fast-import.txt:614
+#: en/git-fast-import.txt:621
#, priority:100
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
#, no-wrap, priority:100
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
#, priority:100
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:624
+#: en/git-fast-import.txt:631
#, ignore-same, no-wrap, priority:100
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
#, priority:100
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:632
+#: en/git-fast-import.txt:639
#, no-wrap, priority:100
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:638 en/git-fast-import.txt:658
+#: en/git-fast-import.txt:645 en/git-fast-import.txt:665
#, priority:100
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:643
+#: en/git-fast-import.txt:650
#, priority:100
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:645
+#: en/git-fast-import.txt:652
#, ignore-same, no-wrap, priority:100
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
-#: en/git-fast-import.txt:649
+#: en/git-fast-import.txt:656
#, priority:100
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:652
+#: en/git-fast-import.txt:659
#, no-wrap, priority:100
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:663
+#: en/git-fast-import.txt:670
#, priority:100
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:672
+#: en/git-fast-import.txt:679
#, priority:100
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
-#: en/git-fast-import.txt:679
+#: en/git-fast-import.txt:686
#, priority:100
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:682
+#: en/git-fast-import.txt:689
#, no-wrap, priority:100
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:688
+#: en/git-fast-import.txt:695
#, priority:100
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:696
+#: en/git-fast-import.txt:703
#, priority:100
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:698
+#: en/git-fast-import.txt:705
#, ignore-same, no-wrap, priority:100
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:707
+#: en/git-fast-import.txt:714
#, priority:100
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:712
+#: en/git-fast-import.txt:719
#, priority:100
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:715
+#: en/git-fast-import.txt:722
#, no-wrap, priority:100
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:720
+#: en/git-fast-import.txt:727
#, priority:100
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:725
+#: en/git-fast-import.txt:732
#, priority:100
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:729
+#: en/git-fast-import.txt:736
#, no-wrap, priority:100
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -20992,76 +21034,77 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:735
+#: en/git-fast-import.txt:742
#, priority:100
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:737
+#: en/git-fast-import.txt:744
#, ignore-same, no-wrap, priority:100
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
-#: en/git-fast-import.txt:743
+#: en/git-fast-import.txt:750
#, priority:100
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:746
+#: en/git-fast-import.txt:753
#, no-wrap, priority:100
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:752
+#: en/git-fast-import.txt:759
#, priority:100
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:756
+#: en/git-fast-import.txt:763
#, priority:100
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:758
+#: en/git-fast-import.txt:765
#, ignore-same, no-wrap, priority:100
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
-#: en/git-fast-import.txt:763
+#: en/git-fast-import.txt:770
#, priority:100
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:766
+#: en/git-fast-import.txt:773
#, no-wrap, priority:100
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:769
+#: en/git-fast-import.txt:776
#, priority:100
msgid "where `<object-identifer>` is any string not containing LF."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:774
+#: en/git-fast-import.txt:781
#, priority:100
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:781
+#: en/git-fast-import.txt:789
#, no-wrap, priority:100
msgid ""
"\t'tag' SP <name> LF\n"
+"\tmark?\n"
"\t'from' SP <commit-ish> LF\n"
"\toriginal-oid?\n"
"\t'tagger' (SP <name>)? SP LT <email> GT SP <when> LF\n"
@@ -21069,55 +21112,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:784
+#: en/git-fast-import.txt:792
#, priority:100
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:789
+#: en/git-fast-import.txt:797
#, priority:100
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:793
+#: en/git-fast-import.txt:801
#, priority:100
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:796
+#: en/git-fast-import.txt:804
#, priority:100
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:799
+#: en/git-fast-import.txt:807
#, priority:100
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:813
#, priority:100
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:813
+#: en/git-fast-import.txt:821
#, priority:100
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:820
+#: en/git-fast-import.txt:828
#, priority:100
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:825
+#: en/git-fast-import.txt:833
#, no-wrap, priority:100
msgid ""
"\t'reset' SP <ref> LF\n"
@@ -21126,25 +21169,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:829
+#: en/git-fast-import.txt:837
#, priority:100
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:831 en/git-fast-import.txt:943
+#: en/git-fast-import.txt:839 en/git-fast-import.txt:966
#, priority:100
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:834
+#: en/git-fast-import.txt:842
#, priority:100
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:838
+#: en/git-fast-import.txt:846
#, no-wrap, priority:100
msgid ""
"\treset refs/tags/938\n"
@@ -21152,19 +21195,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:850
#, priority:100
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:849
+#: en/git-fast-import.txt:857
#, priority:100
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:855
+#: en/git-fast-import.txt:863
#, no-wrap, priority:100
msgid ""
"\t'blob' LF\n"
@@ -21174,43 +21217,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:861
+#: en/git-fast-import.txt:869
#, priority:100
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:871
#, ignore-same, no-wrap, priority:100
msgid "`data`"
msgstr "`data`"
#. type: Plain text
-#: en/git-fast-import.txt:870
+#: en/git-fast-import.txt:878
#, priority:100
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:875
+#: en/git-fast-import.txt:883
#, priority:100
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:876
+#: en/git-fast-import.txt:884
#, no-wrap, priority:100
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:878
+#: en/git-fast-import.txt:886
#, priority:100
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:882
+#: en/git-fast-import.txt:890
#, no-wrap, priority:100
msgid ""
"\t'data' SP <count> LF\n"
@@ -21218,31 +21261,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:888
+#: en/git-fast-import.txt:896
#, priority:100
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:893
+#: en/git-fast-import.txt:901
#, priority:100
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:894
+#: en/git-fast-import.txt:902
#, no-wrap, priority:100
msgid "Delimited format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:899
+#: en/git-fast-import.txt:907
#, priority:100
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:905
+#: en/git-fast-import.txt:913
#, no-wrap, priority:100
msgid ""
"\t'data' SP '<<' <delim> LF\n"
@@ -21252,25 +21295,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:921
#, priority:100
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:915
+#: en/git-fast-import.txt:923
#, priority:100
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:920
+#: en/git-fast-import.txt:928
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object."
+msgstr ""
+
+#. type: delimited block .
+#: en/git-fast-import.txt:934
+#, no-wrap, priority:100
+msgid ""
+"\t'alias' LF\n"
+"\tmark\n"
+"\t'to' SP <commit-ish> LF\n"
+"\tLF?\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:937
+#, priority:100
+msgid "For a detailed description of `<commit-ish>` see above under `from`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:943
#, priority:100
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:924
+#: en/git-fast-import.txt:947
#, no-wrap, priority:100
msgid ""
"\t'checkpoint' LF\n"
@@ -21278,31 +21343,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:930
+#: en/git-fast-import.txt:953
#, priority:100
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:935
+#: en/git-fast-import.txt:958
#, priority:100
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:941
+#: en/git-fast-import.txt:964
#, priority:100
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:950
+#: en/git-fast-import.txt:973
#, priority:100
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:954
+#: en/git-fast-import.txt:977
#, no-wrap, priority:100
msgid ""
"\t'progress' SP <any> LF\n"
@@ -21310,67 +21375,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:960
+#: en/git-fast-import.txt:983
#, priority:100
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:986
#, no-wrap, priority:100
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:968
+#: en/git-fast-import.txt:991
#, priority:100
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:976
+#: en/git-fast-import.txt:999
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:979
+#: en/git-fast-import.txt:1002
#, no-wrap, priority:100
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:983 en/git-fast-import.txt:1014 en/git-fast-import.txt:1067
+#: en/git-fast-import.txt:1006 en/git-fast-import.txt:1037 en/git-fast-import.txt:1090
#, priority:100
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:991
+#: en/git-fast-import.txt:1014
#, priority:100
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:994
+#: en/git-fast-import.txt:1017
#, no-wrap, priority:100
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1022
#, priority:100
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:1024
#, priority:100
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1005
+#: en/git-fast-import.txt:1028
#, no-wrap, priority:100
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21378,283 +21443,283 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1011
+#: en/git-fast-import.txt:1034
#, priority:100
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1022
+#: en/git-fast-import.txt:1045
#, priority:100
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1025
+#: en/git-fast-import.txt:1048
#, priority:100
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1049
#, no-wrap, priority:100
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1030
+#: en/git-fast-import.txt:1053
#, priority:100
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1033
+#: en/git-fast-import.txt:1056
#, no-wrap, priority:100
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1035
+#: en/git-fast-import.txt:1058
#, no-wrap, priority:100
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1041
+#: en/git-fast-import.txt:1064
#, priority:100
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1044
+#: en/git-fast-import.txt:1067
#, no-wrap, priority:100
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1047
+#: en/git-fast-import.txt:1070
#, priority:100
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1072
#, priority:100
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1075
#, no-wrap, priority:100
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1080
#, priority:100
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1060
+#: en/git-fast-import.txt:1083
#, priority:100
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1086
#, no-wrap, priority:100
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1072
+#: en/git-fast-import.txt:1095
#, priority:100
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1075
+#: en/git-fast-import.txt:1098
#, no-wrap, priority:100
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1078
+#: en/git-fast-import.txt:1101
#, priority:100
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1079 en/git-fast-import.txt:1146
+#: en/git-fast-import.txt:1102 en/git-fast-import.txt:1169
#, no-wrap, priority:100
msgid "date-format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1080 en/git-fast-import.txt:1148
+#: en/git-fast-import.txt:1103 en/git-fast-import.txt:1171
#, no-wrap, priority:100
msgid "export-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1081
+#: en/git-fast-import.txt:1104
#, no-wrap, priority:100
msgid "relative-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1082
+#: en/git-fast-import.txt:1105
#, no-wrap, priority:100
msgid "no-relative-marks"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1083 en/git-fast-import.txt:1150
+#: en/git-fast-import.txt:1106 en/git-fast-import.txt:1173
#, no-wrap, priority:100
msgid "force"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1087
+#: en/git-fast-import.txt:1110
#, priority:100
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1088 en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1111 en/git-fast-import.txt:1170
#, no-wrap, priority:100
msgid "import-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1089
+#: en/git-fast-import.txt:1112
#, no-wrap, priority:100
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1097
+#: en/git-fast-import.txt:1120
#, priority:100
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1098
+#: en/git-fast-import.txt:1121
#, no-wrap, priority:100
msgid "get-mark"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1122
#, no-wrap, priority:100
msgid "cat-blob"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1100
+#: en/git-fast-import.txt:1123
#, no-wrap, priority:100
msgid "ls"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1108
+#: en/git-fast-import.txt:1131
#, priority:100
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1109
+#: en/git-fast-import.txt:1132
#, no-wrap, priority:100
msgid "notes"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1114
+#: en/git-fast-import.txt:1137
#, priority:100
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1138
#, no-wrap, priority:100
msgid "done"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1122
+#: en/git-fast-import.txt:1145
#, priority:100
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1129
+#: en/git-fast-import.txt:1152
#, priority:100
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1132
+#: en/git-fast-import.txt:1155
#, no-wrap, priority:100
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1137
+#: en/git-fast-import.txt:1160
#, priority:100
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1141
+#: en/git-fast-import.txt:1164
#, priority:100
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1144
+#: en/git-fast-import.txt:1167
#, priority:100
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1149
+#: en/git-fast-import.txt:1172
#, priority:100
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1178
#, priority:100
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1159
+#: en/git-fast-import.txt:1182
#, priority:100
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1161
+#: en/git-fast-import.txt:1184
#, no-wrap, priority:100
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1168
+#: en/git-fast-import.txt:1191
#, priority:100
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1175
+#: en/git-fast-import.txt:1198
#, priority:100
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1203
#, no-wrap, priority:100
msgid ""
"\tmkfifo fast-import-output\n"
@@ -21663,49 +21728,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1184
+#: en/git-fast-import.txt:1207
#, priority:100
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1188
+#: en/git-fast-import.txt:1211
#, priority:100
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1213
#, no-wrap, priority:100
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1196
+#: en/git-fast-import.txt:1219
#, priority:100
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1203
+#: en/git-fast-import.txt:1226
#, priority:100
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1211
+#: en/git-fast-import.txt:1234
#, priority:100
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1236
#, priority:100
msgid "An example crash:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1229
+#: en/git-fast-import.txt:1252
#, no-wrap, priority:100
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
@@ -21725,7 +21790,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1256
#, no-wrap, priority:100
msgid ""
"\t$ git fast-import <in\n"
@@ -21734,7 +21799,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1239
+#: en/git-fast-import.txt:1262
#, no-wrap, priority:100
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
@@ -21745,13 +21810,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1241
+#: en/git-fast-import.txt:1264
#, no-wrap, priority:100
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1251
+#: en/git-fast-import.txt:1274
#, no-wrap, priority:100
msgid ""
"\tMost Recent Commands Before Crash\n"
@@ -21766,13 +21831,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1252
+#: en/git-fast-import.txt:1275
#, no-wrap, priority:100
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1255
+#: en/git-fast-import.txt:1278
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
@@ -21780,25 +21845,25 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1256
+#: en/git-fast-import.txt:1279
#, no-wrap, priority:100
msgid "active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1259
+#: en/git-fast-import.txt:1282
#, priority:100
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1260
+#: en/git-fast-import.txt:1283
#, priority:100
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1264
+#: en/git-fast-import.txt:1287
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
@@ -21807,7 +21872,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1270
+#: en/git-fast-import.txt:1293
#, no-wrap, priority:100
msgid ""
"status : active loaded dirty\n"
@@ -21819,307 +21884,307 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1274
+#: en/git-fast-import.txt:1297
#, priority:100
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1277
+#: en/git-fast-import.txt:1300
#, no-wrap, priority:100
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1280
+#: en/git-fast-import.txt:1303
#, priority:100
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1282
+#: en/git-fast-import.txt:1305
#, no-wrap, priority:100
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1290
+#: en/git-fast-import.txt:1313
#, priority:100
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1294
+#: en/git-fast-import.txt:1317
#, priority:100
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1296
+#: en/git-fast-import.txt:1319
#, no-wrap, priority:100
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1301
+#: en/git-fast-import.txt:1324
#, priority:100
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1305
+#: en/git-fast-import.txt:1328
#, priority:100
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1307
+#: en/git-fast-import.txt:1330
#, no-wrap, priority:100
msgid "Handling Renames"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1312
+#: en/git-fast-import.txt:1335
#, priority:100
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1337
#, no-wrap, priority:100
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1341
#, priority:100
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1325
+#: en/git-fast-import.txt:1348
#, priority:100
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1331
+#: en/git-fast-import.txt:1354
#, priority:100
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1337
+#: en/git-fast-import.txt:1360
#, priority:100
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1363
#, priority:100
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1342
+#: en/git-fast-import.txt:1365
#, no-wrap, priority:100
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1346
+#: en/git-fast-import.txt:1369
#, priority:100
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1353
+#: en/git-fast-import.txt:1376
#, priority:100
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1358
+#: en/git-fast-import.txt:1381
#, priority:100
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1360
+#: en/git-fast-import.txt:1383
#, no-wrap, priority:100
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1367
+#: en/git-fast-import.txt:1390
#, priority:100
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1369
+#: en/git-fast-import.txt:1392
#, no-wrap, priority:100
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1399
#, priority:100
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1379
+#: en/git-fast-import.txt:1402
#, no-wrap, priority:100
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1385
+#: en/git-fast-import.txt:1408
#, priority:100
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1393
+#: en/git-fast-import.txt:1416
#, priority:100
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1423
#, priority:100
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1407
+#: en/git-fast-import.txt:1430
#, priority:100
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1415
+#: en/git-fast-import.txt:1438
#, priority:100
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1417
+#: en/git-fast-import.txt:1440
#, no-wrap, priority:100
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1423
+#: en/git-fast-import.txt:1446
#, priority:100
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1448
#, no-wrap, priority:100
msgid "per object"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1432
+#: en/git-fast-import.txt:1455
#, priority:100
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1438
+#: en/git-fast-import.txt:1461
#, priority:100
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1440
+#: en/git-fast-import.txt:1463
#, no-wrap, priority:100
msgid "per mark"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1446
+#: en/git-fast-import.txt:1469
#, priority:100
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1448
+#: en/git-fast-import.txt:1471
#, no-wrap, priority:100
msgid "per branch"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1474
#, priority:100
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1457
+#: en/git-fast-import.txt:1480
#, priority:100
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1464
+#: en/git-fast-import.txt:1487
#, priority:100
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1468
+#: en/git-fast-import.txt:1491
#, priority:100
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1496
#, priority:100
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1498
#, no-wrap, priority:100
msgid "per active tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1480
+#: en/git-fast-import.txt:1503
#, priority:100
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1482
+#: en/git-fast-import.txt:1505
#, no-wrap, priority:100
msgid "per active file entry"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1488
+#: en/git-fast-import.txt:1511
#, priority:100
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1493
+#: en/git-fast-import.txt:1516
#, priority:100
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1495
+#: en/git-fast-import.txt:1518
#, no-wrap, priority:100
msgid "SIGNALS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1501
+#: en/git-fast-import.txt:1524
#, priority:100
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -22680,7 +22745,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1041
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -22796,20 +22861,32 @@ msgid ""
"\t[--state-branch <branch>] [--] [<rev-list options>...]\n"
msgstr ""
+#. type: Title -
+#: en/git-filter-branch.txt:20
+#, no-wrap, priority:100
+msgid "WARNING"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:31
+#, priority:100
+msgid "'git filter-branch' has a plethora of pitfalls that can produce non-obvious manglings of the intended history rewrite (and can leave you with little time to investigate such problems since it has such abysmal performance). These safety and performance issues cannot be backward compatibly fixed and as such, its use is not recommended. Please use an alternative history filtering tool such as https://github.com/newren/git-filter-repo/[git filter-repo]. If you still need to use 'git filter-branch', please carefully read <<SAFETY>> (and <<PERFORMANCE>>) to learn about the land mines of filter-branch, and then vigilantly avoid as many of the hazards listed there as reasonably possible."
+msgstr ""
+
#. type: Plain text
-#: en/git-filter-branch.txt:27
+#: en/git-filter-branch.txt:40
#, priority:100
msgid "Lets you rewrite Git revision history by rewriting the branches mentioned in the <rev-list options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge information) will be preserved."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:34
+#: en/git-filter-branch.txt:47
#, priority:100
msgid "The command will only rewrite the _positive_ refs mentioned in the command line (e.g. if you pass 'a..b', only 'b' will be rewritten). If you specify no filters, the commits will be recommitted without any changes, which would normally have no effect. Nevertheless, this may be useful in the future for compensating for some Git bugs or such, therefore such a usage is permitted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:39
+#: en/git-filter-branch.txt:52
#, no-wrap, priority:100
msgid ""
"*NOTE*: This command honors `.git/info/grafts` file and refs in\n"
@@ -22819,7 +22896,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:48
+#: en/git-filter-branch.txt:61
#, no-wrap, priority:100
msgid ""
"*WARNING*! The rewritten history will have different object names for all\n"
@@ -22833,337 +22910,337 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:52
+#: en/git-filter-branch.txt:65
#, priority:100
msgid "Always verify that the rewritten version is correct: The original refs, if different from the rewritten ones, will be stored in the namespace 'refs/original/'."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:56
+#: en/git-filter-branch.txt:69
#, priority:100
msgid "Note that since this operation is very I/O expensive, it might be a good idea to redirect the temporary directory off-disk with the `-d` option, e.g. on tmpfs. Reportedly the speedup is very noticeable."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:59
+#: en/git-filter-branch.txt:72
#, no-wrap, priority:100
msgid "Filters"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:71
+#: en/git-filter-branch.txt:84
#, priority:100
msgid "The filters are applied in the order as listed below. The <command> argument is always evaluated in the shell context using the 'eval' command (with the notable exception of the commit filter, for technical reasons). Prior to that, the `$GIT_COMMIT` environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, and GIT_COMMITTER_DATE are taken from the current commit and exported to the environment, in order to affect the author and committer identities of the replacement commit created by linkgit:git-commit-tree[1] after the filters have run."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:74
+#: en/git-filter-branch.txt:87
#, priority:100
msgid "If any evaluation of <command> returns a non-zero exit status, the whole operation will be aborted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:80
+#: en/git-filter-branch.txt:93
#, priority:100
msgid "A 'map' function is available that takes an \"original sha1 id\" argument and outputs a \"rewritten sha1 id\" if the commit has been already rewritten, and \"original sha1 id\" otherwise; the 'map' function can return several ids on separate lines if your commit filter emitted multiple commits."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:85
+#: en/git-filter-branch.txt:98
#, no-wrap, priority:100
msgid "--setup <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:91
+#: en/git-filter-branch.txt:104
#, priority:100
msgid "This is not a real filter executed for each commit but a one time setup just before the loop. Therefore no commit-specific variables are defined yet. Functions or variables defined here can be used or modified in the following filter steps except the commit filter, for technical reasons."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:92
+#: en/git-filter-branch.txt:105
#, no-wrap, priority:100
msgid "--subdirectory-filter <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:96
+#: en/git-filter-branch.txt:109
#, priority:100
msgid "Only look at the history which touches the given subdirectory. The result will contain that directory (and only that) as its project root. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:97
+#: en/git-filter-branch.txt:110
#, no-wrap, priority:100
msgid "--env-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:102
+#: en/git-filter-branch.txt:115
#, priority:100
msgid "This filter may be used if you only need to modify the environment in which the commit will be performed. Specifically, you might want to rewrite the author/committer name/email/time environment variables (see linkgit:git-commit-tree[1] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:103
+#: en/git-filter-branch.txt:116
#, no-wrap, priority:100
msgid "--tree-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:110
+#: en/git-filter-branch.txt:123
#, priority:100
msgid "This is the filter for rewriting the tree and its contents. The argument is evaluated in shell with the working directory set to the root of the checked out tree. The new tree is then used as-is (new files are auto-added, disappeared files are auto-removed - neither .gitignore files nor any other ignore rules *HAVE ANY EFFECT*!)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:111
+#: en/git-filter-branch.txt:124
#, no-wrap, priority:100
msgid "--index-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:117
+#: en/git-filter-branch.txt:130
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the index. It is similar to the tree filter but does not check out the tree, which makes it much faster. Frequently used with `git rm --cached --ignore-unmatch ...`, see EXAMPLES below. For hairy cases, see linkgit:git-update-index[1]."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:118
+#: en/git-filter-branch.txt:131
#, no-wrap, priority:100
msgid "--parent-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:125
+#: en/git-filter-branch.txt:138
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the commit's parent list. It will receive the parent string on stdin and shall output the new parent string on stdout. The parent string is in the format described in linkgit:git-commit-tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and \"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:126
+#: en/git-filter-branch.txt:139
#, no-wrap, priority:100
msgid "--msg-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:131
+#: en/git-filter-branch.txt:144
#, priority:100
msgid "This is the filter for rewriting the commit messages. The argument is evaluated in the shell with the original commit message on standard input; its standard output is used as the new commit message."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:132
+#: en/git-filter-branch.txt:145
#, no-wrap, priority:100
msgid "--commit-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:138
+#: en/git-filter-branch.txt:151
#, ignore-ellipsis, priority:100
msgid "This is the filter for performing the commit. If this filter is specified, it will be called instead of the 'git commit-tree' command, with arguments of the form \"<TREE_ID> [(-p <PARENT_COMMIT_ID>)...]\" and the log message on stdin. The commit id is expected on stdout."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:142
+#: en/git-filter-branch.txt:155
#, priority:100
msgid "As a special extension, the commit filter may emit multiple commit ids; in that case, the rewritten children of the original commit will have all of them as parents."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:147
+#: en/git-filter-branch.txt:160
#, priority:100
msgid "You can use the 'map' convenience function in this filter, and other convenience functions, too. For example, calling 'skip_commit \"$@\"' will leave out the current commit (but not its changes! If you want that, use 'git rebase' instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:151
+#: en/git-filter-branch.txt:164
#, priority:100
msgid "You can also use the `git_commit_non_empty_tree \"$@\"` instead of `git commit-tree \"$@\"` if you don't wish to keep commits with a single parent and that makes no change to the tree."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:152
+#: en/git-filter-branch.txt:165
#, no-wrap, priority:100
msgid "--tag-name-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:158
+#: en/git-filter-branch.txt:171
#, priority:100
msgid "This is the filter for rewriting tag names. When passed, it will be called for every tag ref that points to a rewritten object (or to a tag object which points to a rewritten object). The original tag name is passed via standard input, and the new tag name is expected on standard output."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:163
+#: en/git-filter-branch.txt:176
#, priority:100
msgid "The original tags are not deleted, but can be overwritten; use \"--tag-name-filter cat\" to simply update the tags. In this case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:174
+#: en/git-filter-branch.txt:187
#, priority:100
msgid "Nearly proper rewriting of tag objects is supported. If the tag has a message attached, a new tag object will be created with the same message, author, and timestamp. If the tag has a signature attached, the signature will be stripped. It is by definition impossible to preserve signatures. The reason this is \"nearly\" proper, is because ideally if the tag did not change (points to the same object, has the same name, etc.) it should retain any signature. That is not the case, signatures will always be removed, buyer beware. There is also no support for changing the author or timestamp (or the tag message for that matter). Tags which point to other tags will be rewritten to point to the underlying commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:175
+#: en/git-filter-branch.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--prune-empty"
msgstr "--prune-empty"
#. type: Plain text
-#: en/git-filter-branch.txt:182
+#: en/git-filter-branch.txt:195
#, priority:100
msgid "Some filters will generate empty commits that leave the tree untouched. This option instructs git-filter-branch to remove such commits if they have exactly one or zero non-pruned parents; merge commits will therefore remain intact. This option cannot be used together with `--commit-filter`, though the same effect can be achieved by using the provided `git_commit_non_empty_tree` function in a commit filter."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:183
+#: en/git-filter-branch.txt:196
#, no-wrap, priority:100
msgid "--original <namespace>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:186
+#: en/git-filter-branch.txt:199
#, priority:100
msgid "Use this option to set the namespace where the original commits will be stored. The default value is 'refs/original'."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:187
+#: en/git-filter-branch.txt:200
#, no-wrap, priority:100
msgid "-d <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:194
+#: en/git-filter-branch.txt:207
#, priority:100
msgid "Use this option to set the path to the temporary directory used for rewriting. When applying a tree filter, the command needs to temporarily check out the tree to some directory, which may consume considerable space in case of large projects. By default it does this in the `.git-rewrite/` directory but you can override that choice by this parameter."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:200
+#: en/git-filter-branch.txt:213
#, priority:100
msgid "'git filter-branch' refuses to start with an existing temporary directory or when there are already refs starting with 'refs/original/', unless forced."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:201
+#: en/git-filter-branch.txt:214
#, no-wrap, priority:100
msgid "--state-branch <branch>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:206
+#: en/git-filter-branch.txt:219
#, priority:100
msgid "This option will cause the mapping from old to new objects to be loaded from named branch upon startup and saved as a new commit to that branch upon exit, enabling incremental of large trees. If '<branch>' does not exist it will be created."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:207
+#: en/git-filter-branch.txt:220
#, ignore-ellipsis, no-wrap, priority:100
msgid "<rev-list options>..."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:212
+#: en/git-filter-branch.txt:225
#, priority:100
msgid "Arguments for 'git rev-list'. All positive refs included by these options are rewritten. You may also specify options such as `--all`, but you must use `--` to separate them from the 'git filter-branch' options. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:216
+#: en/git-filter-branch.txt:229
#, no-wrap, priority:100
msgid "Remap to ancestor"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:223
+#: en/git-filter-branch.txt:236
#, priority:100
msgid "By using linkgit:git-rev-list[1] arguments, e.g., path limiters, you can limit the set of revisions which get rewritten. However, positive refs on the command line are distinguished: we don't let them be excluded by such limiters. For this purpose, they are instead rewritten to point at the nearest ancestor that was not excluded."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:231
+#: en/git-filter-branch.txt:244
#, priority:100
msgid "On success, the exit status is `0`. If the filter can't find any commits to rewrite, the exit status is `2`. On any other error, the exit status may be any other non-zero value."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:238
+#: en/git-filter-branch.txt:251
#, priority:100
msgid "Suppose you want to remove a file (containing confidential information or copyright violation) from all commits:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:241
+#: en/git-filter-branch.txt:254
#, no-wrap, priority:100
msgid "git filter-branch --tree-filter 'rm filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:246
+#: en/git-filter-branch.txt:259
#, priority:100
msgid "However, if the file is absent from the tree of some commit, a simple `rm filename` will fail for that tree and commit. Thus you may instead want to use `rm -f filename` as the script."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:252
+#: en/git-filter-branch.txt:265
#, priority:100
msgid "Using `--index-filter` with 'git rm' yields a significantly faster version. Like with using `rm filename`, `git rm --cached filename` will fail if the file is absent from the tree of a commit. If you want to \"completely forget\" a file, it does not matter when it entered history, so we also add `--ignore-unmatch`:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:255
+#: en/git-filter-branch.txt:268
#, no-wrap, priority:100
msgid "git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:258
+#: en/git-filter-branch.txt:271
#, priority:100
msgid "Now, you will get the rewritten history saved in HEAD."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:261
+#: en/git-filter-branch.txt:274
#, priority:100
msgid "To rewrite the repository to look as if `foodir/` had been its project root, and discard all other history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:264
+#: en/git-filter-branch.txt:277
#, no-wrap, priority:100
msgid "git filter-branch --subdirectory-filter foodir -- --all\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:269
+#: en/git-filter-branch.txt:282
#, priority:100
msgid "Thus you can, e.g., turn a library subdirectory into a repository of its own. Note the `--` that separates 'filter-branch' options from revision options, and the `--all` to rewrite all branches and tags."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:273
+#: en/git-filter-branch.txt:286
#, priority:100
msgid "To set a commit (which typically is at the tip of another history) to be the parent of the current initial commit, in order to paste the other history behind the current history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:276
+#: en/git-filter-branch.txt:289
#, no-wrap, priority:100
msgid "git filter-branch --parent-filter 'sed \"s/^\\$/-p <graft-id>/\"' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:282
+#: en/git-filter-branch.txt:295
#, priority:100
msgid "(if the parent string is empty - which happens when we are dealing with the initial commit - add graftcommit as a parent). Note that this assumes history with a single root (that is, no merge without common ancestors happened). If this is not the case, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:286
+#: en/git-filter-branch.txt:299
#, no-wrap, priority:100
msgid ""
"git filter-branch --parent-filter \\\n"
@@ -23171,13 +23248,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:289
+#: en/git-filter-branch.txt:302
#, priority:100
msgid "or even simpler:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:293
+#: en/git-filter-branch.txt:306
#, no-wrap, priority:100
msgid ""
"git replace --graft $commit-id $graft-id\n"
@@ -23185,13 +23262,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:296
+#: en/git-filter-branch.txt:309
#, priority:100
msgid "To remove commits authored by \"Darl McBribe\" from the history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:305
+#: en/git-filter-branch.txt:318
#, no-wrap, priority:100
msgid ""
"git filter-branch --commit-filter '\n"
@@ -23204,13 +23281,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:308
+#: en/git-filter-branch.txt:321
#, priority:100
msgid "The function 'skip_commit' is defined as follows:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:320
+#: en/git-filter-branch.txt:333
#, no-wrap, priority:100
msgid ""
"skip_commit()\n"
@@ -23226,13 +23303,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:327
+#: en/git-filter-branch.txt:340
#, priority:100
msgid "The shift magic first throws away the tree id and then the -p parameters. Note that this handles merges properly! In case Darl committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 as their parents instead of the merge commit."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:332
+#: en/git-filter-branch.txt:345
#, no-wrap, priority:100
msgid ""
"*NOTE* the changes introduced by the commits, and which are not reverted\n"
@@ -23242,13 +23319,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:336
+#: en/git-filter-branch.txt:349
#, priority:100
msgid "You can rewrite the commit log messages using `--msg-filter`. For example, 'git svn-id' strings in a repository created by 'git svn' can be removed this way:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:341
+#: en/git-filter-branch.txt:354
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23257,13 +23334,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:345
+#: en/git-filter-branch.txt:358
#, priority:100
msgid "If you need to add 'Acked-by' lines to, say, the last 10 commits (none of which is a merge), use this command:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:351
+#: en/git-filter-branch.txt:364
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23273,13 +23350,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:357
+#: en/git-filter-branch.txt:370
#, priority:100
msgid "The `--env-filter` option can be used to modify committer and/or author identity. For example, if you found out that your commits have the wrong identity due to a misconfigured user.email, you can make a correction, before publishing the project, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:369
+#: en/git-filter-branch.txt:382
#, no-wrap, priority:100
msgid ""
"git filter-branch --env-filter '\n"
@@ -23295,19 +23372,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:375
+#: en/git-filter-branch.txt:388
#, priority:100
msgid "To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will point to the top-most revision that a 'git rev-list' of this range will print."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:377
+#: en/git-filter-branch.txt:390
#, priority:100
msgid "Consider this history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:382
+#: en/git-filter-branch.txt:395
#, no-wrap, priority:100
msgid ""
" D--E--F--G--H\n"
@@ -23316,25 +23393,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:385
+#: en/git-filter-branch.txt:398
#, priority:100
msgid "To rewrite only commits D,E,F,G,H, but leave A, B and C alone, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:388
+#: en/git-filter-branch.txt:401
#, ignore-ellipsis, no-wrap, priority:100
msgid "git filter-branch ... C..H\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:391
+#: en/git-filter-branch.txt:404
#, priority:100
msgid "To rewrite commits E,F,G,H, use one of these:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:395
+#: en/git-filter-branch.txt:408
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"git filter-branch ... C..H --not D\n"
@@ -23342,13 +23419,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:398
+#: en/git-filter-branch.txt:411
#, priority:100
msgid "To move the whole tree into a subdirectory, or remove it from there:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:405
+#: en/git-filter-branch.txt:418
#, no-wrap, priority:100
msgid ""
"git filter-branch --index-filter \\\n"
@@ -23359,87 +23436,279 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-filter-branch.txt:410
+#: en/git-filter-branch.txt:423
#, no-wrap, priority:100
msgid "CHECKLIST FOR SHRINKING A REPOSITORY"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:418
+#: en/git-filter-branch.txt:431
#, priority:100
msgid "git-filter-branch can be used to get rid of a subset of files, usually with some combination of `--index-filter` and `--subdirectory-filter`. People expect the resulting repository to be smaller than the original, but you need a few more steps to actually make it smaller, because Git tries hard not to lose your objects until you tell it to. First make sure that:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:422
+#: en/git-filter-branch.txt:435
#, priority:100
msgid "You really removed all variants of a filename, if a blob was moved over its lifetime. `git log --name-only --follow --all -- filename` can help you find renames."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:425
+#: en/git-filter-branch.txt:438
#, priority:100
msgid "You really filtered all refs: use `--tag-name-filter cat -- --all` when calling git-filter-branch."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:428
+#: en/git-filter-branch.txt:441
#, priority:100
msgid "Then there are two ways to get a smaller repository. A safer way is to clone, that keeps your original intact."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:432
+#: en/git-filter-branch.txt:445
#, priority:100
msgid "Clone it with `git clone file:///path/to/repo`. The clone will not have the removed objects. See linkgit:git-clone[1]. (Note that cloning with a plain path just hardlinks everything!)"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:437
+#: en/git-filter-branch.txt:450
#, priority:100
msgid "If you really don't want to clone it, for whatever reasons, check the following points instead (in this order). This is a very destructive approach, so *make a backup* or go back to cloning it. You have been warned."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:441
+#: en/git-filter-branch.txt:454
#, priority:100
msgid "Remove the original refs backed up by git-filter-branch: say `git for-each-ref --format=\"%(refname)\" refs/original/ | xargs -n 1 git update-ref -d`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:443
+#: en/git-filter-branch.txt:456
#, priority:100
msgid "Expire all reflogs with `git reflog expire --expire=now --all`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:447
+#: en/git-filter-branch.txt:460
#, priority:100
msgid "Garbage collect all unreferenced objects with `git gc --prune=now` (or if your git-gc is not new enough to support arguments to `--prune`, use `git repack -ad; git prune` instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:459
+#: en/git-filter-branch.txt:467
#, priority:100
-msgid "git-filter-branch allows you to make complex shell-scripted rewrites of your Git history, but you probably don't need this flexibility if you're simply _removing unwanted data_ like large files or passwords. For those operations you may want to consider http://rtyley.github.io/bfg-repo-cleaner/[The BFG Repo-Cleaner], a JVM-based alternative to git-filter-branch, typically at least 10-50x faster for those use-cases, and with quite different characteristics:"
+msgid "The performance of git-filter-branch is glacially slow; its design makes it impossible for a backward-compatible implementation to ever be fast:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:467
+#: en/git-filter-branch.txt:473
#, priority:100
-msgid "Any particular version of a file is cleaned exactly _once_. The BFG, unlike git-filter-branch, does not give you the opportunity to handle a file differently based on where or when it was committed within your history. This constraint gives the core performance benefit of The BFG, and is well-suited to the task of cleansing bad data - you don't care _where_ the bad data is, you just want it _gone_."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:473
+#: en/git-filter-branch.txt:476
+#, priority:100
+msgid "If you try and cheat and try to make git-filter-branch only work on files modified in a commit, then two things happen"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:482
+#, priority:100
+msgid "you run into problems with deletions whenever the user is simply trying to rename files (because attempting to delete files that don't exist looks like a no-op; it takes some chicanery to remap deletes across file renames when the renames happen via arbitrary user-provided shell)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:488
+#, priority:100
+msgid "even if you succeed at the map-deletes-for-renames chicanery, you still technically violate backward compatibility because users are allowed to filter files in ways that depend upon topology of commits instead of filtering solely based on file contents or names (though this has not been observed in the wild)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:494
+#, priority:100
+msgid "Even if you don't need to edit files but only want to e.g. rename or remove some and thus can avoid checking out each file (i.e. you can use --index-filter), you still are passing shell snippets for your filters. This means that for every commit, you have to have a prepared git repo where those filters can be run. That's a significant setup."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:505
+#, priority:100
+msgid "Further, several additional files are created or updated per commit by git-filter-branch. Some of these are for supporting the convenience functions provided by git-filter-branch (such as map()), while others are for keeping track of internal state (but could have also been accessed by user filters; one of git-filter-branch's regression tests does so). This essentially amounts to using the filesystem as an IPC mechanism between git-filter-branch and the user-provided filters. Disks tend to be a slow IPC mechanism, and writing these files also effectively represents a forced synchronization point between separate processes that we hit with every commit."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:511
+#, priority:100
+msgid "The user-provided shell commands will likely involve a pipeline of commands, resulting in the creation of many processes per commit. Creating and running another process takes a widely varying amount of time between operating systems, but on any platform it is very slow relative to invoking a function."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:517
#, priority:100
-msgid "By default The BFG takes full advantage of multi-core machines, cleansing commit file-trees in parallel. git-filter-branch cleans commits sequentially (i.e. in a single-threaded manner), though it _is_ possible to write filters that include their own parallelism, in the scripts executed against each commit."
+msgid "git-filter-branch itself is written in shell, which is kind of slow. This is the one performance issue that could be backward-compatibly fixed, but compared to the above problems that are intrinsic to the design of git-filter-branch, the language of the tool itself is a relatively minor issue."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:478
+#: en/git-filter-branch.txt:528
#, priority:100
-msgid "The http://rtyley.github.io/bfg-repo-cleaner/#examples[command options] are much more restrictive than git-filter branch, and dedicated just to the tasks of removing unwanted data- e.g: `--strip-blobs-bigger-than 1M`."
+msgid "Side note: Unfortunately, people tend to fixate on the written-in-shell aspect and periodically ask if git-filter-branch could be rewritten in another language to fix the performance issues. Not only does that ignore the bigger intrinsic problems with the design, it'd help less than you'd expect: if git-filter-branch itself were not shell, then the convenience functions (map(), skip_commit(), etc) and the `--setup` argument could no longer be executed once at the beginning of the program but would instead need to be prepended to every user filter (and thus re-executed with every commit)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:539
+#, priority:100
+msgid "The https://github.com/newren/git-filter-repo/[git filter-repo] tool is an alternative to git-filter-branch which does not suffer from these performance problems or the safety problems (mentioned below). For those with existing tooling which relies upon git-filter-branch, 'git repo-filter' also provides https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], a drop-in git-filter-branch replacement (with a few caveats). While filter-lamely suffers from all the same safety issues as git-filter-branch, it at least ameloriates the performance issues a little."
+msgstr ""
+
+#. type: Title -
+#: en/git-filter-branch.txt:542
+#, no-wrap, priority:100
+msgid "SAFETY"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:547
+#, priority:100
+msgid "git-filter-branch is riddled with gotchas resulting in various ways to easily corrupt repos or end up with a mess worse than what you started with:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:560
+#, priority:100
+msgid "Someone can have a set of \"working and tested filters\" which they document or provide to a coworker, who then runs them on a different OS where the same commands are not working/tested (some examples in the git-filter-branch manpage are also affected by this). BSD vs. GNU userland differences can really bite. If lucky, error messages are spewed. But just as likely, the commands either don't do the filtering requested, or silently corrupt by making some unwanted change. The unwanted change may only affect a few commits, so it's not necessarily obvious either. (The fact that problems won't necessarily be obvious means they are likely to go unnoticed until the rewritten history is in use for quite a while, at which point it's really hard to justify another flag-day for another rewrite.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:570
+#, priority:100
+msgid "Filenames with spaces are often mishandled by shell snippets since they cause problems for shell pipelines. Not everyone is familiar with find -print0, xargs -0, git-ls-files -z, etc. Even people who are familiar with these may assume such flags are not relevant because someone else renamed any such files in their repo back before the person doing the filtering joined the project. And often, even those familiar with handling arguments with spaces may not do so just because they aren't in the mindset of thinking about everything that could possibly go wrong."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:580
+#, priority:100
+msgid "Non-ascii filenames can be silently removed despite being in a desired directory. Keeping only wanted paths is often done using pipelines like `git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`. ls-files will only quote filenames if needed, so folks may not notice that one of the files didn't match the regex (at least not until it's much too late). Yes, someone who knows about core.quotePath can avoid this (unless they have other special characters like \\t, \\n, or \"), and people who use ls-files -z with something other than grep can avoid this, but that doesn't mean they will."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:586
+#, priority:100
+msgid "Similarly, when moving files around, one can find that filenames with non-ascii or special characters end up in a different directory, one that includes a double quote character. (This is technically the same issue as above with quoting, but perhaps an interesting different way that it can and has manifested as a problem.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:594
+#, priority:100
+msgid "It's far too easy to accidentally mix up old and new history. It's still possible with any tool, but git-filter-branch almost invites it. If lucky, the only downside is users getting frustrated that they don't know how to shrink their repo and remove the old stuff. If unlucky, they merge old and new history and end up with multiple \"copies\" of each commit, some of which have unwanted or sensitive files and others which don't. This comes about in multiple different ways:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:597
+#, priority:100
+msgid "the default to only doing a partial history rewrite ('--all' is not the default and few examples show it)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:599
+#, priority:100
+msgid "the fact that there's no automatic post-run cleanup"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:602
+#, priority:100
+msgid "the fact that --tag-name-filter (when used to rename tags) doesn't remove the old tags but just adds new ones with the new name"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:611
+#, priority:100
+msgid "the fact that little educational information is provided to inform users of the ramifications of a rewrite and how to avoid mixing old and new history. For example, this man page discusses how users need to understand that they need to rebase their changes for all their branches on top of new history (or delete and reclone), but that's only one of multiple concerns to consider. See the \"DISCUSSION\" section of the git filter-repo manual page for more details."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:614
+#, priority:100
+msgid "Annotated tags can be accidentally converted to lightweight tags, due to either of two issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:619
+#, priority:100
+msgid "Someone can do a history rewrite, realize they messed up, restore from the backups in refs/original/, and then redo their git-filter-branch command. (The backup in refs/original/ is not a real backup; it dereferences tags first.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:624
+#, priority:100
+msgid "Running git-filter-branch with either --tags or --all in your <rev-list options>. In order to retain annotated tags as annotated, you must use --tag-name-filter (and must not have restored from refs/original/ in a previously botched rewrite)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:629
+#, priority:100
+msgid "Any commit messages that specify an encoding will become corrupted by the rewrite; git-filter-branch ignores the encoding, takes the original bytes, and feeds it to commit-tree without telling it the proper encoding. (This happens whether or not --msg-filter is used.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:633
+#, priority:100
+msgid "Commit messages (even if they are all UTF-8) by default become corrupted due to not being updated -- any references to other commit hashes in commit messages will now refer to no-longer-extant commits."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:644
+#, priority:100
+msgid "There are no facilities for helping users find what unwanted crud they should delete, which means they are much more likely to have incomplete or partial cleanups that sometimes result in confusion and people wasting time trying to understand. (For example, folks tend to just look for big files to delete instead of big directories or extensions, and once they do so, then sometime later folks using the new repository who are going through history will notice a build artifact directory that has some files but not others, or a cache of dependencies (node_modules or similar) which couldn't have ever been functional since it's missing some files.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:647
+#, priority:100
+msgid "If --prune-empty isn't specified, then the filtering process can create hoards of confusing empty commits"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:651
+#, priority:100
+msgid "If --prune-empty is specified, then intentionally placed empty commits from before the filtering operation are also pruned instead of just pruning commits that became empty due to filtering rules."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:654
+#, ignore-ellipsis, priority:100
+msgid "If --prune empty is specified, sometimes empty commits are missed and left around anyway (a somewhat rare bug, but it happens...)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:658
+#, priority:100
+msgid "A minor issue, but users who have a goal to update all names and emails in a repository may be led to --env-filter which will only update authors and committers, missing taggers."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:664
+#, priority:100
+msgid "If the user provides a --tag-name-filter that maps multiple tags to the same name, no warning or error is provided; git-filter-branch simply overwrites each tag in some undocumented pre-defined order resulting in only one tag at the end. (A git-filter-branch regression test requires this surprising behavior.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:667
+#, priority:100
+msgid "Also, the poor performance of git-filter-branch often leads to safety issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:683
+#, priority:100
+msgid "Coming up with the correct shell snippet to do the filtering you want is sometimes difficult unless you're just doing a trivial modification such as deleting a couple files. Unfortunately, people often learn if the snippet is right or wrong by trying it out, but the rightness or wrongness can vary depending on special circumstances (spaces in filenames, non-ascii filenames, funny author names or emails, invalid timezones, presence of grafts or replace objects, etc.), meaning they may have to wait a long time, hit an error, then restart. The performance of git-filter-branch is so bad that this cycle is painful, reducing the time available to carefully re-check (to say nothing about what it does to the patience of the person doing the rewrite even if they do technically have more time available). This problem is extra compounded because errors from broken filters may not be shown for a long time and/or get lost in a sea of output. Even worse, broken filters often just result in silent incorrect rewrites."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:691
+#, priority:100
+msgid "To top it all off, even when users finally find working commands, they naturally want to share them. But they may be unaware that their repo didn't have some special cases that someone else's does. So, when someone else with a different repository runs the same commands, they get hit by the problems above. Or, the user just runs commands that really were vetted for special cases, but they run it on a different OS where it doesn't work, as noted above."
msgstr ""
#. type: Title =
@@ -23475,7 +23744,7 @@ msgid "This command is intended mostly for internal use by scripts automatically
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:64
+#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:68
#, no-wrap, priority:240
msgid "--log[=<n>]"
msgstr ""
@@ -23487,7 +23756,7 @@ msgid "In addition to branch names, populate the log message with one-line descr
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:65
+#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:69
#, ignore-same, no-wrap, priority:240
msgid "--no-log"
msgstr "--no-log"
@@ -24158,9 +24427,9 @@ msgid ""
"\t\t [--signature-file=<file>]\n"
"\t\t [-n | --numbered | -N | --no-numbered]\n"
"\t\t [--start-number <n>] [--numbered-files]\n"
-"\t\t [--in-reply-to=Message-Id] [--suffix=.<sfx>]\n"
+"\t\t [--in-reply-to=<message id>] [--suffix=.<sfx>]\n"
"\t\t [--ignore-if-in-upstream]\n"
-"\t\t [--rfc] [--subject-prefix=Subject-Prefix]\n"
+"\t\t [--rfc] [--subject-prefix=<subject prefix>]\n"
"\t\t [(--reroll-count|-v) <n>]\n"
"\t\t [--to=<email>] [--cc=<email>]\n"
"\t\t [--[no-]cover-letter] [--quiet]\n"
@@ -24209,523 +24478,524 @@ msgid "By default, each output file is numbered sequentially from 1, and uses th
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:70
+#: en/git-format-patch.txt:71
#, priority:100
-msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`."
+msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`. All directory components will be created."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:74
+#: en/git-format-patch.txt:75
#, priority:100
msgid "By default, the subject of a single patch is \"[PATCH] \" followed by the concatenation of lines from the commit message up to the first blank line (see the DISCUSSION section of linkgit:git-commit[1])."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:78
+#: en/git-format-patch.txt:79
#, priority:100
msgid "When multiple patches are output, the subject prefix will instead be \"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. To omit patch numbers from the subject, use `-N`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:83
+#: en/git-format-patch.txt:84
#, priority:100
msgid "If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a `Message-Id` header to reference."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:89
+#: en/git-format-patch.txt:90
#, no-wrap, priority:100
msgid "-<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:91
+#: en/git-format-patch.txt:92
#, priority:100
msgid "Prepare patches from the topmost <n> commits."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:92
+#: en/git-format-patch.txt:93
#, no-wrap, priority:100
msgid "-o <dir>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:93
+#: en/git-format-patch.txt:94
#, no-wrap, priority:100
msgid "--output-directory <dir>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:96
+#: en/git-format-patch.txt:97
#, priority:100
msgid "Use <dir> to store the resulting files, instead of the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:98 en/git-shortlog.txt:30
+#: en/git-format-patch.txt:99 en/git-shortlog.txt:30
#, ignore-same, no-wrap, priority:260
msgid "--numbered"
msgstr "--numbered"
#. type: Plain text
-#: en/git-format-patch.txt:100
+#: en/git-format-patch.txt:101
#, priority:100
msgid "Name output in '[PATCH n/m]' format, even with a single patch."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:102
+#: en/git-format-patch.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-numbered"
msgstr "--no-numbered"
#. type: Plain text
-#: en/git-format-patch.txt:104
+#: en/git-format-patch.txt:105
#, priority:100
msgid "Name output in '[PATCH]' format."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:105
+#: en/git-format-patch.txt:106
#, no-wrap, priority:100
msgid "--start-number <n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:107
+#: en/git-format-patch.txt:108
#, priority:100
msgid "Start numbering the patches at <n> instead of 1."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:108
+#: en/git-format-patch.txt:109
#, ignore-same, no-wrap, priority:100
msgid "--numbered-files"
msgstr "--numbered-files"
#. type: Plain text
-#: en/git-format-patch.txt:111
+#: en/git-format-patch.txt:112
#, priority:100
msgid "Output file names will be a simple number sequence without the default first line of the commit appended."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:113
+#: en/git-format-patch.txt:114
#, ignore-same, no-wrap, priority:100
msgid "--keep-subject"
msgstr "--keep-subject"
#. type: Plain text
-#: en/git-format-patch.txt:116
+#: en/git-format-patch.txt:117
#, priority:100
msgid "Do not strip/add '[PATCH]' from the first line of the commit log message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:122
+#: en/git-format-patch.txt:123
#, priority:100
msgid "Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:123 en/git-pack-objects.txt:59
+#: en/git-format-patch.txt:124 en/git-pack-objects.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--stdout"
msgstr "--stdout"
#. type: Plain text
-#: en/git-format-patch.txt:126
+#: en/git-format-patch.txt:127
#, priority:100
msgid "Print all commits to the standard output in mbox format, instead of creating a file for each one."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:127
+#: en/git-format-patch.txt:128
#, no-wrap, priority:100
msgid "--attach[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:131
+#: en/git-format-patch.txt:132
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: attachment`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:132
+#: en/git-format-patch.txt:133
#, ignore-same, no-wrap, priority:100
msgid "--no-attach"
msgstr "--no-attach"
#. type: Plain text
-#: en/git-format-patch.txt:135
+#: en/git-format-patch.txt:136
#, priority:100
msgid "Disable the creation of an attachment, overriding the configuration setting."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:136
+#: en/git-format-patch.txt:137
#, no-wrap, priority:100
msgid "--inline[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:140
+#: en/git-format-patch.txt:141
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: inline`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:141
+#: en/git-format-patch.txt:142
#, no-wrap, priority:100
msgid "--thread[=<style>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:142
+#: en/git-format-patch.txt:143
#, ignore-same, no-wrap, priority:100
msgid "--no-thread"
msgstr "--no-thread"
#. type: Plain text
-#: en/git-format-patch.txt:147
+#: en/git-format-patch.txt:148
#, priority:100
msgid "Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the first. Also controls generation of the `Message-Id` header to reference."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:153
+#: en/git-format-patch.txt:154
#, priority:100
msgid "The optional <style> argument can be either `shallow` or `deep`. 'shallow' threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order. 'deep' threading makes every mail a reply to the previous one."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:157
+#: en/git-format-patch.txt:158
#, priority:100
msgid "The default is `--no-thread`, unless the `format.thread` configuration is set. If `--thread` is specified without a style, it defaults to the style specified by `format.thread` if any, or else `shallow`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:161
+#: en/git-format-patch.txt:162
#, priority:100
msgid "Beware that the default for 'git send-email' is to thread emails itself. If you want `git format-patch` to take care of threading, you will want to ensure that threading is disabled for `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:162
-#, no-wrap, priority:100
-msgid "--in-reply-to=Message-Id"
-msgstr ""
+#: en/git-format-patch.txt:163
+#, fuzzy, no-wrap, priority:100
+#| msgid "--no-message-id"
+msgid "--in-reply-to=<message id>"
+msgstr "--no-message-id"
#. type: Plain text
-#: en/git-format-patch.txt:166
+#: en/git-format-patch.txt:167
#, priority:100
-msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given Message-Id, which avoids breaking threads to provide a new patch series."
+msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given <message id>, which avoids breaking threads to provide a new patch series."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:167
+#: en/git-format-patch.txt:168
#, ignore-same, no-wrap, priority:100
msgid "--ignore-if-in-upstream"
msgstr "--ignore-if-in-upstream"
#. type: Plain text
-#: en/git-format-patch.txt:173
+#: en/git-format-patch.txt:174
#, priority:100
msgid "Do not include a patch that matches a commit in <until>..<since>. This will examine all patches reachable from <since> but not from <until> and compare them with the patches being generated, and any patch that matches is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:174
+#: en/git-format-patch.txt:175
#, no-wrap, priority:100
-msgid "--subject-prefix=<Subject-Prefix>"
+msgid "--subject-prefix=<subject prefix>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:179
+#: en/git-format-patch.txt:180
#, priority:100
-msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<Subject-Prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
+msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<subject prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:180
+#: en/git-format-patch.txt:181
#, ignore-same, no-wrap, priority:100
msgid "--rfc"
msgstr "--rfc"
#. type: Plain text
-#: en/git-format-patch.txt:184
+#: en/git-format-patch.txt:185
#, priority:100
msgid "Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For Comments\"; use this when sending an experimental patch for discussion rather than application."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:185
+#: en/git-format-patch.txt:186
#, no-wrap, priority:100
msgid "-v <n>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:186
+#: en/git-format-patch.txt:187
#, no-wrap, priority:100
msgid "--reroll-count=<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:193
+#: en/git-format-patch.txt:194
#, priority:100
msgid "Mark the series as the <n>-th iteration of the topic. The output filenames have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default, but configurable via the `--subject-prefix` option) has ` v<n>` appended to it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:194
+#: en/git-format-patch.txt:195
#, no-wrap, priority:100
msgid "--to=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:199
+#: en/git-format-patch.txt:200
#, priority:100
msgid "Add a `To:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-to` discards all `To:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:200
+#: en/git-format-patch.txt:201
#, no-wrap, priority:100
msgid "--cc=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:205
+#: en/git-format-patch.txt:206
#, priority:100
msgid "Add a `Cc:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-cc` discards all `Cc:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:206
+#: en/git-format-patch.txt:207
#, ignore-same, no-wrap, priority:100
msgid "--from"
msgstr "--from"
#. type: Labeled list
-#: en/git-format-patch.txt:207
+#: en/git-format-patch.txt:208
#, no-wrap, priority:100
msgid "--from=<ident>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:213
+#: en/git-format-patch.txt:214
#, priority:100
msgid "Use `ident` in the `From:` header of each commit email. If the author ident of the commit is not textually identical to the provided `ident`, place a `From:` header in the body of the message with the original author. If no `ident` is given, use the committer ident."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:220
+#: en/git-format-patch.txt:221
#, priority:100
msgid "Note that this option is only useful if you are actually sending the emails and want to identify yourself as the sender, but retain the original author (and `git am` will correctly pick up the in-body header). Note also that `git send-email` already handles this transformation for you, and this option should not be used if you are feeding the result to `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:221
+#: en/git-format-patch.txt:222
#, no-wrap, priority:100
msgid "--add-header=<header>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:228
+#: en/git-format-patch.txt:229
#, priority:100
msgid "Add an arbitrary header to the email headers. This is in addition to any configured headers, and may be used multiple times. For example, `--add-header=\"Organization: git-foo\"`. The negated form `--no-add-header` discards *all* (`To:`, `Cc:`, and custom) headers added so far from config or command line."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:229
+#: en/git-format-patch.txt:230
#, ignore-same, no-wrap, priority:100
msgid "--[no-]cover-letter"
msgstr "--[no-]cover-letter"
#. type: Plain text
-#: en/git-format-patch.txt:233
+#: en/git-format-patch.txt:234
#, priority:100
msgid "In addition to the patches, generate a cover letter file containing the branch description, shortlog and the overall diffstat. You can fill in a description in the file before sending it out."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:234
+#: en/git-format-patch.txt:235
#, no-wrap, priority:100
msgid "--interdiff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:242
+#: en/git-format-patch.txt:243
#, priority:100
msgid "As a reviewer aid, insert an interdiff into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` is a single revision naming the tip of the previous series which shares a common base with the series being formatted (for example `git format-patch --cover-letter --interdiff=feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:243
+#: en/git-format-patch.txt:244
#, no-wrap, priority:100
msgid "--range-diff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:254
+#: en/git-format-patch.txt:255
#, priority:100
msgid "As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1]) into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` can be a single revision naming the tip of the previous series if it shares a common base with the series being formatted (for example `git format-patch --cover-letter --range-diff=feature/v1 -3 feature/v2`), or a revision range if the two versions of the series are disjoint (for example `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:259
+#: en/git-format-patch.txt:260
#, priority:100
msgid "Note that diff options passed to the command affect how the primary product of `format-patch` is generated, and they are not passed to the underlying `range-diff` machinery used to generate the cover-letter material (this may change in the future)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:260
+#: en/git-format-patch.txt:261
#, no-wrap, priority:100
msgid "--creation-factor=<percent>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:265
+#: en/git-format-patch.txt:266
#, priority:100
msgid "Used with `--range-diff`, tweak the heuristic which matches up commits between the previous and current series of patches by adjusting the creation/deletion cost fudge factor. See linkgit:git-range-diff[1]) for details."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:266
+#: en/git-format-patch.txt:267
#, no-wrap, priority:100
msgid "--notes[=<ref>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:267 en/pretty-options.txt:81
+#: en/git-format-patch.txt:268 en/pretty-options.txt:81
#, ignore-same, no-wrap, priority:260
msgid "--no-notes"
msgstr "--no-notes"
#. type: Plain text
-#: en/git-format-patch.txt:270
+#: en/git-format-patch.txt:271
#, priority:100
msgid "Append the notes (see linkgit:git-notes[1]) for the commit after the three-dash line."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:278
+#: en/git-format-patch.txt:279
#, priority:100
msgid "The expected use case of this is to write supporting explanation for the commit that does not belong to the commit log message proper, and include it with the patch submission. While one can simply write these explanations after `format-patch` has run but before sending, keeping them as Git notes allows them to be maintained between versions of the patch series (but see the discussion of the `notes.rewrite` configuration options in linkgit:git-notes[1] to use this workflow)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:281
+#: en/git-format-patch.txt:282
#, priority:100
msgid "The default is `--no-notes`, unless the `format.notes` configuration is set."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:282
+#: en/git-format-patch.txt:283
#, no-wrap, priority:100
msgid "--[no-]signature=<signature>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:287
+#: en/git-format-patch.txt:288
#, priority:100
msgid "Add a signature to each message produced. Per RFC 3676 the signature is separated from the body by a line with '-- ' on it. If the signature option is omitted the signature defaults to the Git version number."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:288
+#: en/git-format-patch.txt:289
#, no-wrap, priority:100
msgid "--signature-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:290
+#: en/git-format-patch.txt:291
#, priority:100
msgid "Works just like --signature except the signature is read from a file."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:291
+#: en/git-format-patch.txt:292
#, no-wrap, priority:100
msgid "--suffix=.<sfx>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:296
+#: en/git-format-patch.txt:297
#, priority:100
msgid "Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is `--suffix=.txt`. Leaving this empty will remove the `.patch` suffix."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:299
+#: en/git-format-patch.txt:300
#, priority:100
msgid "Note that the leading character does not have to be a dot; for example, you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:303
+#: en/git-format-patch.txt:304
#, priority:100
msgid "Do not print the names of the generated files to standard output."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:304
+#: en/git-format-patch.txt:305
#, ignore-same, no-wrap, priority:100
msgid "--no-binary"
msgstr "--no-binary"
#. type: Plain text
-#: en/git-format-patch.txt:309
+#: en/git-format-patch.txt:310
#, priority:100
msgid "Do not output contents of changes in binary files, instead display a notice that those files changed. Patches generated using this option cannot be applied properly, but they are still useful for code review."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:310
+#: en/git-format-patch.txt:311
#, ignore-same, no-wrap, priority:100
msgid "--zero-commit"
msgstr "--zero-commit"
#. type: Plain text
-#: en/git-format-patch.txt:313
+#: en/git-format-patch.txt:314
#, priority:100
msgid "Output an all-zero hash in each patch's From header instead of the hash of the commit."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:314
+#: en/git-format-patch.txt:315
#, no-wrap, priority:100
msgid "--base=<commit>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:318
+#: en/git-format-patch.txt:320
#, priority:100
-msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details."
+msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details. If <commit> is \"auto\", a base commit is automatically chosen."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:325
+#: en/git-format-patch.txt:327
#, priority:100
msgid "Treat the revision argument as a <revision range>, even if it is just a single commit (that would normally be treated as a <since>). Note that root commits included in the specified range are always formatted as creation patches, independently of this flag."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:328
+#: en/git-format-patch.txt:330
#, priority:100
msgid "Show progress reports on stderr as patches are generated."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:335
+#: en/git-format-patch.txt:338
#, priority:100
-msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To\" or \"Cc:\" headers, configure attachments, and sign off patches with configuration variables."
+msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To:\" or \"Cc:\" headers, configure attachments, change the patch output directory, and sign off patches with configuration variables."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:347
+#: en/git-format-patch.txt:351
#, no-wrap, priority:100
msgid ""
"[format]\n"
@@ -24737,17 +25007,18 @@ msgid ""
"\tcc = <email>\n"
"\tattach [ = mime-boundary-string ]\n"
"\tsignOff = true\n"
-"\tcoverletter = auto\n"
+"\toutputDirectory = <directory>\n"
+"\tcoverLetter = auto\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:356
+#: en/git-format-patch.txt:360
#, priority:100
msgid "The patch produced by 'git format-patch' is in UNIX mailbox format, with a fixed \"magic\" time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:366
+#: en/git-format-patch.txt:370
#, no-wrap, priority:100
msgid ""
"From 8f72bad1baf19a53459661343e21d6491c3908d3 Mon Sep 17 00:00:00 2001\n"
@@ -24761,7 +25032,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:369
+#: en/git-format-patch.txt:373
#, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -24769,7 +25040,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:372
+#: en/git-format-patch.txt:376
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"Do the same for ia64 so we can have sleek & trim looking\n"
@@ -24777,19 +25048,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:380
+#: en/git-format-patch.txt:384
#, ignore-ellipsis, priority:100
msgid "Typically it will be placed in a MUA's drafts folder, edited to add timely commentary that should not go in the changelog after the three dashes, and then sent as a message whose body, in our example, starts with \"arch/arm config files were...\". On the receiving end, readers can save interesting patches in a UNIX mailbox and apply them with linkgit:git-am[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:386
+#: en/git-format-patch.txt:390
#, priority:100
msgid "When a patch is part of an ongoing discussion, the patch generated by 'git format-patch' can be tweaked to take advantage of the 'git am --scissors' feature. After your response to the discussion comes a line that consists solely of \"`-- >8 --`\" (scissors and perforation), followed by the patch with unnecessary header fields removed:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:390
+#: en/git-format-patch.txt:394
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"...\n"
@@ -24797,13 +25068,13 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:392
+#: en/git-format-patch.txt:396
#, no-wrap, priority:100
msgid "Makes sense to me. How about this patch?\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:395
+#: en/git-format-patch.txt:399
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
@@ -24811,7 +25082,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:398
+#: en/git-format-patch.txt:402
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -24819,61 +25090,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:406
+#: en/git-format-patch.txt:410
#, priority:100
msgid "When sending a patch this way, most often you are sending your own patch, so in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit `From:` and `Date:` lines from the patch file. The patch title is likely to be different from the subject of the discussion the patch is in response to, so it is likely that you would want to keep the Subject: line, like the example above."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:408
+#: en/git-format-patch.txt:412
#, no-wrap, priority:100
msgid "Checking for patch corruption"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:411
+#: en/git-format-patch.txt:415
#, priority:100
msgid "Many mailers if not set up properly will corrupt whitespace. Here are two common types of corruption:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:413
+#: en/git-format-patch.txt:417
#, priority:100
msgid "Empty context lines that do not have _any_ whitespace."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:416
+#: en/git-format-patch.txt:420
#, priority:100
msgid "Non-empty context lines that have one extra whitespace at the beginning."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:418
+#: en/git-format-patch.txt:422
#, priority:100
msgid "One way to test if your MUA is set up correctly is:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:422
+#: en/git-format-patch.txt:426
#, priority:100
msgid "Send the patch to yourself, exactly the way you would, except with To: and Cc: lines that do not contain the list and maintainer address."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:425
+#: en/git-format-patch.txt:429
#, priority:100
msgid "Save that patch to a file in UNIX mailbox format. Call it a.patch, say."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:427
+#: en/git-format-patch.txt:431
#, priority:100
msgid "Apply it:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:432
+#: en/git-format-patch.txt:436
#, no-wrap, priority:100
msgid ""
"$ git fetch <project> master:test-apply\n"
@@ -24883,175 +25154,175 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:434
+#: en/git-format-patch.txt:438
#, priority:100
msgid "If it does not apply correctly, there can be various reasons."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:439
+#: en/git-format-patch.txt:443
#, priority:100
msgid "The patch itself does not apply cleanly. That is _bad_ but does not have much to do with your MUA. You might want to rebase the patch with linkgit:git-rebase[1] before regenerating it in this case."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:444
+#: en/git-format-patch.txt:448
#, priority:100
msgid "The MUA corrupted your patch; \"am\" would complain that the patch does not apply. Look in the .git/rebase-apply/ subdirectory and see what 'patch' file contains and check for the common corruption patterns mentioned above."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:452
+#: en/git-format-patch.txt:456
#, priority:100
msgid "While at it, check the 'info' and 'final-commit' files as well. If what is in 'final-commit' is not exactly what you would want to see in the commit log message, it is very likely that the receiver would end up hand editing the log message when applying your patch. Things like \"Hi, this is my first patch.\\n\" in the patch e-mail should come after the three-dash line that signals the end of the commit message."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:454
+#: en/git-format-patch.txt:458
#, no-wrap, priority:100
msgid "MUA-SPECIFIC HINTS"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:457
+#: en/git-format-patch.txt:461
#, priority:100
msgid "Here are some hints on how to successfully submit patches inline using various mailers."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:459
+#: en/git-format-patch.txt:463
#, no-wrap, priority:100
msgid "GMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:465
+#: en/git-format-patch.txt:469
#, priority:100
msgid "GMail does not have any way to turn off line wrapping in the web interface, so it will mangle any emails that you send. You can however use \"git send-email\" and send your patches through the GMail SMTP server, or use any IMAP email client to connect to the google IMAP server and forward the emails through that."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:468
+#: en/git-format-patch.txt:472
#, priority:100
msgid "For hints on using 'git send-email' to send your patches through the GMail SMTP server, see the EXAMPLE section of linkgit:git-send-email[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:471
+#: en/git-format-patch.txt:475
#, priority:100
msgid "For hints on submission using the IMAP interface, see the EXAMPLE section of linkgit:git-imap-send[1]."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:473
+#: en/git-format-patch.txt:477
#, no-wrap, priority:100
msgid "Thunderbird"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:477
+#: en/git-format-patch.txt:481
#, priority:100
msgid "By default, Thunderbird will both wrap emails as well as flag them as being 'format=flowed', both of which will make the resulting email unusable by Git."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:481
+#: en/git-format-patch.txt:485
#, priority:100
msgid "There are three different approaches: use an add-on to turn off line wraps, configure Thunderbird to not mangle patches, or use an external editor to keep Thunderbird from mangling the patches."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:483
+#: en/git-format-patch.txt:487
#, no-wrap, priority:100
msgid "Approach #1 (add-on)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:491
+#: en/git-format-patch.txt:495
#, priority:100
msgid "Install the Toggle Word Wrap add-on that is available from https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you can tick off. Now you can compose the message as you otherwise do (cut + paste, 'git format-patch' | 'git imap-send', etc), but you have to insert line breaks manually in any text that you type."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:493
+#: en/git-format-patch.txt:497
#, no-wrap, priority:100
msgid "Approach #2 (configuration)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:495
+#: en/git-format-patch.txt:499
#, priority:100
msgid "Three steps:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:499
+#: en/git-format-patch.txt:503
#, ignore-ellipsis, priority:100
msgid "Configure your mail server composition as plain text: Edit...Account Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:501
+#: en/git-format-patch.txt:505
#, priority:100
msgid "Configure your general composition window to not wrap."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:504
+#: en/git-format-patch.txt:508
#, priority:100
msgid "In Thunderbird 2: Edit..Preferences..Composition, wrap plain text messages at 0"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:510
+#: en/git-format-patch.txt:514
#, priority:100
msgid "In Thunderbird 3: Edit..Preferences..Advanced..Config Editor. Search for \"mail.wrap_long_lines\". Toggle it to make sure it is set to `false`. Also, search for \"mailnews.wraplength\" and set the value to 0."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:515
+#: en/git-format-patch.txt:519
#, priority:100
msgid "Disable the use of format=flowed: Edit..Preferences..Advanced..Config Editor. Search for \"mailnews.send_plaintext_flowed\". Toggle it to make sure it is set to `false`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:519
+#: en/git-format-patch.txt:523
#, priority:100
msgid "After that is done, you should be able to compose email as you otherwise would (cut + paste, 'git format-patch' | 'git imap-send', etc), and the patches will not be mangled."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:521
+#: en/git-format-patch.txt:525
#, no-wrap, priority:100
msgid "Approach #3 (external editor)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:526
+#: en/git-format-patch.txt:530
#, priority:100
msgid "The following Thunderbird extensions are needed: AboutConfig from http://aboutconfig.mozdev.org/ and External Editor from http://globs.org/articles.php?lng=en&pg=8"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:528
+#: en/git-format-patch.txt:532
#, priority:100
msgid "Prepare the patch as a text file using your method of choice."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:533
+#: en/git-format-patch.txt:537
#, priority:100
msgid "Before opening a compose window, use Edit->Account Settings to uncheck the \"Compose messages in HTML format\" setting in the \"Composition & Addressing\" panel of the account to be used to send the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:537
+#: en/git-format-patch.txt:541
#, priority:100
msgid "In the main Thunderbird window, 'before' you open the compose window for the patch, use Tools->about:config to set the following to the indicated values:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:541
+#: en/git-format-patch.txt:545
#, no-wrap, priority:100
msgid ""
"\tmailnews.send_plaintext_flowed => false\n"
@@ -25059,25 +25330,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:544
+#: en/git-format-patch.txt:548
#, priority:100
msgid "Open a compose window and click the external editor icon."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:547
+#: en/git-format-patch.txt:551
#, priority:100
msgid "In the external editor window, read in the patch file and exit the editor normally."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:550
+#: en/git-format-patch.txt:554
#, priority:100
msgid "Side note: it may be possible to do step 2 with about:config and the following settings but no one's tried yet."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:555
+#: en/git-format-patch.txt:559
#, no-wrap, priority:100
msgid ""
"\tmail.html_compose => false\n"
@@ -25086,91 +25357,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:560
+#: en/git-format-patch.txt:564
#, priority:100
msgid "There is a script in contrib/thunderbird-patch-inline which can help you include patches with Thunderbird in an easy way. To use it, do the steps above and then use the script as the external editor."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:562
+#: en/git-format-patch.txt:566
#, no-wrap, priority:100
msgid "KMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:564
+#: en/git-format-patch.txt:568
#, priority:100
msgid "This should help you to submit patches inline using KMail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:566
+#: en/git-format-patch.txt:570
#, priority:100
msgid "Prepare the patch as a text file."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:568
+#: en/git-format-patch.txt:572
#, priority:100
msgid "Click on New Mail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:571
+#: en/git-format-patch.txt:575
#, priority:100
msgid "Go under \"Options\" in the Composer window and be sure that \"Word wrap\" is not set."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:573
+#: en/git-format-patch.txt:577
#, ignore-ellipsis, priority:100
msgid "Use Message -> Insert file... and insert the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:576
+#: en/git-format-patch.txt:580
#, priority:100
msgid "Back in the compose window: add whatever other text you wish to the message, complete the addressing and subject fields, and press send."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:578
+#: en/git-format-patch.txt:582
#, no-wrap, priority:100
msgid "BASE TREE INFORMATION"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:587
+#: en/git-format-patch.txt:591
#, priority:100
msgid "The base tree information block is used for maintainers or third party testers to know the exact state the patch series applies to. It consists of the 'base commit', which is a well-known commit that is part of the stable part of the project history everybody else works off of, and zero or more 'prerequisite patches', which are well-known patches in flight that is not yet part of the 'base commit' that need to be applied on top of 'base commit' in topological order before the patches can be applied."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:593
+#: en/git-format-patch.txt:597
#, priority:100
msgid "The 'base commit' is shown as \"base-commit: \" followed by the 40-hex of the commit object name. A 'prerequisite patch' is shown as \"prerequisite-patch-id: \" followed by the 40-hex 'patch id', which can be obtained by passing the patch through the `git patch-id --stable` command."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:597
+#: en/git-format-patch.txt:601
#, priority:100
msgid "Imagine that on top of the public commit P, you applied well-known patches X, Y and Z from somebody else, and then built your three-patch series A, B, C, the history would be like:"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:600
+#: en/git-format-patch.txt:604
#, no-wrap, priority:100
msgid "---P---X---Y---Z---A---B---C\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:607
+#: en/git-format-patch.txt:611
#, priority:100
msgid "With `git format-patch --base=P -3 C` (or variants thereof, e.g. with `--cover-letter` or using `Z..C` instead of `-3 C` to specify the range), the base tree information block is shown at the end of the first message the command outputs (either the first patch, or the cover letter), like this:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:613
+#: en/git-format-patch.txt:617
#, no-wrap, priority:100
msgid ""
"base-commit: P\n"
@@ -25180,13 +25451,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:616
+#: en/git-format-patch.txt:620
#, priority:100
msgid "For non-linear topology, such as"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:621
+#: en/git-format-patch.txt:625
#, no-wrap, priority:100
msgid ""
"---P---X---A---M---C\n"
@@ -25195,91 +25466,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:626
+#: en/git-format-patch.txt:630
#, priority:100
msgid "You can also use `git format-patch --base=P -3 C` to generate patches for A, B and C, and the identifiers for P, X, Y, Z are appended at the end of the first message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:632
+#: en/git-format-patch.txt:636
#, priority:100
msgid "If set `--base=auto` in cmdline, it will track base commit automatically, the base commit will be the merge base of tip commit of the remote-tracking branch and revision-range specified in cmdline. For a local branch, you need to track a remote branch by `git branch --set-upstream-to` before using this option."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:638
+#: en/git-format-patch.txt:642
#, priority:100
msgid "Extract commits between revisions R1 and R2, and apply them on top of the current branch using 'git am' to cherry-pick them:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:641
+#: en/git-format-patch.txt:645
#, no-wrap, priority:100
msgid "$ git format-patch -k --stdout R1..R2 | git am -3 -k\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:645
+#: en/git-format-patch.txt:649
#, priority:100
msgid "Extract all commits which are in the current branch but not in the origin branch:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:648
+#: en/git-format-patch.txt:652
#, no-wrap, priority:100
msgid "$ git format-patch origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:651
+#: en/git-format-patch.txt:655
#, priority:100
msgid "For each commit a separate file is created in the current directory."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:654
+#: en/git-format-patch.txt:658
#, priority:100
msgid "Extract all commits that lead to 'origin' since the inception of the project:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:657
+#: en/git-format-patch.txt:661
#, no-wrap, priority:100
msgid "$ git format-patch --root origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:660
+#: en/git-format-patch.txt:664
#, priority:100
msgid "The same as the previous one:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:663
+#: en/git-format-patch.txt:667
#, no-wrap, priority:100
msgid "$ git format-patch -M -B origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:670
+#: en/git-format-patch.txt:674
#, priority:100
msgid "Additionally, it detects and handles renames and complete rewrites intelligently to produce a renaming patch. A renaming patch reduces the amount of text output, and generally makes it easier to review. Note that non-Git \"patch\" programs won't understand renaming patches, so use it only when you know the recipient uses Git to apply your patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:673
+#: en/git-format-patch.txt:677
#, priority:100
msgid "Extract three topmost commits from the current branch and format them as e-mailable patches:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:676
+#: en/git-format-patch.txt:680
#, no-wrap, priority:100
msgid "$ git format-patch -3\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:681
+#: en/git-format-patch.txt:685
#, ignore-same, priority:100
msgid "linkgit:git-am[1], linkgit:git-send-email[1]"
msgstr "linkgit:git-am[1], linkgit:git-send-email[1]"
@@ -25775,43 +26046,43 @@ msgid "The below documentation is the same as what's found in linkgit:git-config
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:127
+#: en/git-gc.txt:126
#, priority:100
-msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, refs saved by 'git filter-branch' in refs/original/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
+msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, notes saved by 'git notes' under refs/notes/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:134
+#: en/git-gc.txt:133
#, priority:100
msgid "On the other hand, when 'git gc' runs concurrently with another process, there is a risk of it deleting an object that the other process is using but hasn't created a reference to. This may just cause the other process to fail or may corrupt the repository if the other process later adds a reference to the deleted object. Git has two features that significantly mitigate this problem:"
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:137
+#: en/git-gc.txt:136
#, priority:100
msgid "Any object with modification time newer than the `--prune` date is kept, along with everything reachable from it."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:141
+#: en/git-gc.txt:140
#, priority:100
msgid "Most operations that add an object to the database update the modification time of the object if it is already present so that #1 applies."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:145
+#: en/git-gc.txt:144
#, priority:100
msgid "However, these features fall short of a complete solution, so users who run commands concurrently have to live with some risk of corruption (which seems to be low in practice)."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:151
+#: en/git-gc.txt:150
#, priority:100
msgid "The 'git gc --auto' command will run the 'pre-auto-gc' hook. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:159
+#: en/git-gc.txt:158
#, ignore-same, priority:100
msgid "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
msgstr "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
@@ -26077,7 +26348,7 @@ msgid "For each <pathspec> given on command line, descend at most <depth> levels
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:399
+#: en/git-grep.txt:128 en/git-submodule.txt:400
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
@@ -26293,7 +26564,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:951
+#: en/git-grep.txt:217 en/rev-list-options.txt:967
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -26443,127 +26714,151 @@ msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:280
+#: en/git-grep.txt:277
+#, priority:100
+msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:282
+#, priority:100
+msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:287
+#, priority:100
+msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:291
+#, priority:100
+msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:297
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:281
+#: en/git-grep.txt:298
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:282
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:283 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:284
+#: en/git-grep.txt:301
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:289
+#: en/git-grep.txt:306
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:290 en/rev-list-options.txt:65
+#: en/git-grep.txt:307 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:294
+#: en/git-grep.txt:311
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:299
+#: en/git-grep.txt:316
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:300
+#: en/git-grep.txt:317
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:303
+#: en/git-grep.txt:320
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:307
+#: en/git-grep.txt:324
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:328
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:318
+#: en/git-grep.txt:335
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:321
+#: en/git-grep.txt:338
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:322
+#: en/git-grep.txt:339
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:325
+#: en/git-grep.txt:342
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:326
+#: en/git-grep.txt:343
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:329
+#: en/git-grep.txt:346
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:330
+#: en/git-grep.txt:347
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:332
+#: en/git-grep.txt:349
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
@@ -26781,25 +27076,13 @@ msgstr ""
#. type: Plain text
#: en/git-gui.txt:116
#, priority:100
-msgid "A 'git gui' development repository can be obtained from:"
+msgid "The official repository of the 'git gui' project can be found at:"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:118
#, no-wrap, priority:100
-msgid " git clone git://repo.or.cz/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:122
-#, no-wrap, priority:100
-msgid " git clone http://repo.or.cz/r/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:124
-#, priority:100
-msgid "or browsed online at http://repo.or.cz/w/git-gui.git/[]."
+msgid " https://github.com/prati0100/git-gui.git/\n"
msgstr ""
#. type: Title =
@@ -30411,29 +30694,29 @@ msgstr ""
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
-#. type: Plain text
-#: en/git-ls-remote.txt:110
+#. type: delimited block -
+#: en/git-ls-remote.txt:111
#, no-wrap, priority:100
msgid ""
-"\t$ git ls-remote --tags ./.\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"\t$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
-"\t5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"\tc781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
-"\t$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
-"\t$ git ls-remote --tags korg v\\*\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"$ git ls-remote --tags ./.\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
+"$ git ls-remote --tags korg v\\*\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:114
+#: en/git-ls-remote.txt:116
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -30941,7 +31224,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:358
+#: en/git-merge-base.txt:60 en/git-rebase.txt:376
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -30970,235 +31253,235 @@ msgstr ""
msgid "For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:86
+#. type: delimited block .
+#: en/git-merge-base.txt:87
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---B\n"
-"\t /\n"
-"\t---o---1---o---o---o---A\n"
+"\t o---o---o---B\n"
+"\t/\n"
+"---o---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:88
+#: en/git-merge-base.txt:90
#, priority:100
msgid "the merge base between 'A' and 'B' is '1'."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:92
+#: en/git-merge-base.txt:94
#, priority:100
msgid "Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the merge base between 'A' and a hypothetical commit 'M', which is a merge between 'B' and 'C'. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:98
+#. type: delimited block .
+#: en/git-merge-base.txt:101
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---C\n"
-"\t /\n"
-"\t / o---o---o---B\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---C\n"
+" /\n"
+" / o---o---o---B\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:101
+#: en/git-merge-base.txt:105
#, priority:100
msgid "the result of `git merge-base A B C` is '1'. This is because the equivalent topology with a merge commit 'M' between 'B' and 'C' is:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:108
+#. type: delimited block .
+#: en/git-merge-base.txt:113
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---o\n"
-"\t / \\\n"
-"\t / o---o---o---o---M\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---o\n"
+" / \\\n"
+" / o---o---o---o---M\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:112
+#: en/git-merge-base.txt:118
#, priority:100
msgid "and the result of `git merge-base A M` is '1'. Commit '2' is also a common ancestor between 'A' and 'M', but '1' is a better common ancestor, because '2' is an ancestor of '1'. Hence, '2' is not a merge base."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:115
+#: en/git-merge-base.txt:121
#, priority:100
msgid "The result of `git merge-base --octopus A B C` is '2', because '2' is the best common ancestor of all commits."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:118
+#: en/git-merge-base.txt:124
#, priority:100
msgid "When the history involves criss-cross merges, there can be more than one 'best' common ancestor for two commits. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:124
+#. type: delimited block .
+#: en/git-merge-base.txt:131
#, no-wrap, priority:100
msgid ""
-"\t---1---o---A\n"
-"\t \\ /\n"
-"\t X\n"
-"\t / \\\n"
-"\t---2---o---o---B\n"
+"---1---o---A\n"
+" \\ /\n"
+" X\n"
+" / \\\n"
+"---2---o---o---B\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:128
+#: en/git-merge-base.txt:136
#, priority:100
msgid "both '1' and '2' are merge-bases of A and B. Neither one is better than the other (both are 'best' merge bases). When the `--all` option is not given, it is unspecified which best one is output."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:133
+#: en/git-merge-base.txt:141
#, priority:100
msgid "A common idiom to check \"fast-forward-ness\" between two commits A and B is (or at least used to be) to compute the merge base between A and B, and check if it is the same as A, in which case, A is an ancestor of B. You will see this idiom used often in older scripts."
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:139
+#. type: delimited block .
+#: en/git-merge-base.txt:148
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tA=$(git rev-parse --verify A)\n"
-"\tif test \"$A\" = \"$(git merge-base A B)\"\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"A=$(git rev-parse --verify A)\n"
+"if test \"$A\" = \"$(git merge-base A B)\"\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:141
+#: en/git-merge-base.txt:151
#, priority:100
msgid "In modern git, you can say this in a more direct way:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:146
+#. type: delimited block .
+#: en/git-merge-base.txt:157
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tif git merge-base --is-ancestor A B\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"if git merge-base --is-ancestor A B\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:148
+#: en/git-merge-base.txt:160
#, priority:100
msgid "instead."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:150
+#: en/git-merge-base.txt:162
#, no-wrap, priority:100
msgid "Discussion on fork-point mode"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:156
+#: en/git-merge-base.txt:168
#, priority:100
msgid "After working on the `topic` branch created with `git switch -c topic origin/master`, the history of remote-tracking branch `origin/master` may have been rewound and rebuilt, leading to a history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:164
+#. type: delimited block .
+#: en/git-merge-base.txt:177
#, no-wrap, priority:100
msgid ""
-"\t o---B2\n"
-"\t /\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t \\\n"
-"\t B0\n"
-"\t \\\n"
-"\t D0---D1---D (topic)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\\n"
+"\t B0\n"
+"\t \\\n"
+"\t D0---D1---D (topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:170
+#: en/git-merge-base.txt:184
#, priority:100
msgid "where `origin/master` used to point at commits B0, B1, B2 and now it points at B, and your `topic` branch was started on top of it back when `origin/master` was at B0, and you built three commits, D0, D1, and D, on top of it. Imagine that you now want to rebase the work you did on the topic on top of the updated origin/master."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:176
+#: en/git-merge-base.txt:190
#, priority:100
msgid "In such a case, `git merge-base origin/master topic` would return the parent of B0 in the above picture, but B0^..D is *not* the range of commits you would want to replay on top of B (it includes B0, which is not what you wrote; it is a commit the other side discarded when it moved its tip from B0 to B1)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:184
+#: en/git-merge-base.txt:198
#, priority:100
msgid "`git merge-base --fork-point origin/master topic` is designed to help in such a case. It takes not only B but also B0, B1, and B2 (i.e. old tips of the remote-tracking branches your repository's reflog knows about) into account to see on which commit your topic branch was built and finds B0, allowing you to replay only the commits on your topic, excluding the commits the other side later discarded."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:186
+#: en/git-merge-base.txt:200
#, priority:100
msgid "Hence"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:188
+#: en/git-merge-base.txt:202
#, no-wrap, priority:100
msgid " $ fork_point=$(git merge-base --fork-point origin/master topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:190
+#: en/git-merge-base.txt:204
#, priority:100
msgid "will find B0, and"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:192
+#: en/git-merge-base.txt:206
#, no-wrap, priority:100
msgid " $ git rebase --onto origin/master $fork_point topic\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:195
+#: en/git-merge-base.txt:209
#, priority:100
msgid "will replay D0, D1 and D on top of B to create a new history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:203
+#. type: delimited block .
+#: en/git-merge-base.txt:218
#, no-wrap, priority:100
msgid ""
-"\t\t\t o---B2\n"
-"\t\t\t/\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t\t\\ \\\n"
-"\t\t B0 D0'--D1'--D' (topic - updated)\n"
-"\t\t \\\n"
-"\t\t D0---D1---D (topic - old)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\ \\\n"
+"\t B0 D0'--D1'--D' (topic - updated)\n"
+"\t \\\n"
+"\t D0---D1---D (topic - old)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:210
+#: en/git-merge-base.txt:226
#, priority:100
msgid "A caveat is that older reflog entries in your repository may be expired by `git gc`. If B0 no longer appears in the reflog of the remote-tracking branch `origin/master`, the `--fork-point` mode obviously cannot find it and fails, avoiding to give a random and useless result (such as the parent of B0, like the same command without the `--fork-point` option gives)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:221
+#: en/git-merge-base.txt:237
#, priority:100
msgid "Also, the remote-tracking branch you use the `--fork-point` mode with must be the one your topic forked from its tip. If you forked from an older commit than the tip, this mode would not find the fork point (imagine in the above sample history B0 did not exist, origin/master started at B1, moved to B2 and then B, and you forked your topic at origin/master^ when origin/master was B1; the shape of the history would be the same as above, without B0, and the parent of B1 is what `git merge-base origin/master topic` correctly finds, but the `--fork-point` mode will not, because it is not one of the commits that used to be at the tip of origin/master)."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:224
+#: en/git-merge-base.txt:240
#, no-wrap, priority:100
msgid "See also"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:228
+#: en/git-merge-base.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
msgstr "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
@@ -31409,31 +31692,31 @@ msgstr ""
msgid "Examples:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:62
+#. type: delimited block -
+#: en/git-merge-index.txt:63
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
-" This is MM from the original tree.\t\t\t# original\n"
-" This is modified MM in the branch A.\t\t\t# merge1\n"
-" This is modified MM in the branch B.\t\t\t# merge2\n"
-" This is modified MM in the branch B.\t\t\t# current contents\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
+"This is MM from the original tree.\t\t# original\n"
+"This is modified MM in the branch A.\t\t# merge1\n"
+"This is modified MM in the branch B.\t\t# merge2\n"
+"This is modified MM in the branch B.\t\t# current contents\n"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:71
+#. type: delimited block -
+#: en/git-merge-index.txt:74
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
-" cat: : No such file or directory\n"
-" This is added AA in the branch A.\n"
-" This is added AA in the branch B.\n"
-" This is added AA in the branch B.\n"
-" fatal: merge program failed\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
+"cat: : No such file or directory\n"
+"This is added AA in the branch A.\n"
+"This is added AA in the branch B.\n"
+"This is added AA in the branch B.\n"
+"fatal: merge program failed\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-index.txt:76
+#: en/git-merge-index.txt:80
#, priority:100
msgid "where the latter example shows how 'git merge-index' will stop trying to merge once anything has returned an error (i.e., `cat` returned an error for the AA file, because it didn't exist in the original, and thus 'git merge-index' didn't even try to merge the MM thing)."
msgstr ""
@@ -31731,7 +32014,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n"
-"\t[-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
+"\t[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
"\t[--[no-]allow-unrelated-histories]\n"
"\t[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]\n"
"'git merge' (--continue | --abort | --quit)\n"
@@ -32812,7 +33095,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:281 en/merge-options.txt:108
+#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -33792,7 +34075,7 @@ msgid "Conflicts can occur when applying a commit to p4. When this happens, the
msgstr ""
#. type: Labeled list
-#: en/git-p4.txt:359 en/git-submodule.txt:270
+#: en/git-p4.txt:359 en/git-submodule.txt:271
#, no-wrap, priority:220
msgid "--branch <branch>"
msgstr ""
@@ -34928,7 +35211,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:263 en/rev-list-options.txt:760
+#: en/git-pack-objects.txt:263 en/rev-list-options.txt:776
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -34940,13 +35223,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:266 en/rev-list-options.txt:767
+#: en/git-pack-objects.txt:266 en/rev-list-options.txt:783
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:269 en/rev-list-options.txt:770
+#: en/git-pack-objects.txt:269 en/rev-list-options.txt:786
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -34958,7 +35241,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:276 en/rev-list-options.txt:777
+#: en/git-pack-objects.txt:276 en/rev-list-options.txt:793
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -34970,7 +35253,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:281 en/rev-list-options.txt:785
+#: en/git-pack-objects.txt:281 en/rev-list-options.txt:801
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -35729,13 +36012,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:502
+#: en/git-pull.txt:136 en/git-rebase.txt:524
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:503
+#: en/git-pull.txt:137 en/git-rebase.txt:525
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -37528,8 +37811,8 @@ msgstr ""
#: en/git-rebase.txt:16
#, no-wrap, priority:100
msgid ""
-"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
-"\t[<upstream> [<branch>]]\n"
+"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>]\n"
+"\t[--onto <newbase> | --keep-base] [<upstream> [<branch>]]\n"
"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
"\t--root [<branch>]\n"
"'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch)\n"
@@ -37848,512 +38131,542 @@ msgstr ""
msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:220
+#, ignore-same, no-wrap, priority:100
+msgid "--keep-base"
+msgstr "--keep-base"
+
#. type: Plain text
-#: en/git-rebase.txt:224
+#: en/git-rebase.txt:225
+#, ignore-ellipsis, priority:100
+msgid "Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running 'git rebase --keep-base <upstream> <branch>' is equivalent to running 'git rebase --onto <upstream>... <upstream>'."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:230
+#, priority:100
+msgid "This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:235
+#, priority:100
+msgid "Although both this option and --fork-point find the merge base between <upstream> and <branch>, this option uses the merge base as the _starting point_ on which new commits will be created, whereas --fork-point uses the merge base to determine the _set of commits_ which will be rebased."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#, priority:100
+msgid "See also INCOMPATIBLE OPTIONS below."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:242
#, priority:100
msgid "Upstream branch to compare against. May be any valid commit, not just an existing branch name. Defaults to the configured upstream for the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:230
+#: en/git-rebase.txt:248
#, priority:100
msgid "Restart the rebasing process after having resolved a merge conflict."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237
+#: en/git-rebase.txt:255
#, priority:100
msgid "Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:242
+#: en/git-rebase.txt:260
#, priority:100
msgid "Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:243 en/git-rebase.txt:538
+#: en/git-rebase.txt:261 en/git-rebase.txt:560
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:246
+#: en/git-rebase.txt:264
#, priority:100
msgid "Keep the commits that do not change anything from its parents in the result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:248 en/git-rebase.txt:255 en/git-rebase.txt:280 en/git-rebase.txt:293 en/git-rebase.txt:302 en/git-rebase.txt:344 en/git-rebase.txt:379 en/git-rebase.txt:386 en/git-rebase.txt:393 en/git-rebase.txt:405 en/git-rebase.txt:445 en/git-rebase.txt:470 en/git-rebase.txt:482 en/git-rebase.txt:501
-#, priority:100
-msgid "See also INCOMPATIBLE OPTIONS below."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rebase.txt:253
+#: en/git-rebase.txt:271
#, priority:100
msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:258
+#: en/git-rebase.txt:276
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:259 en/git-rebase.txt:539
+#: en/git-rebase.txt:277 en/git-rebase.txt:561
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:261
+#: en/git-rebase.txt:279
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:266
+#: en/git-rebase.txt:284
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:272
+#: en/git-rebase.txt:290
#, priority:100
msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:278
+#: en/git-rebase.txt:296
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:286
+#: en/git-rebase.txt:304
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:291
+#: en/git-rebase.txt:309
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:294
+#: en/git-rebase.txt:312
#, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:295
+#: en/git-rebase.txt:313
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:300
+#: en/git-rebase.txt:318
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:317
+#: en/git-rebase.txt:335
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:321
+#: en/git-rebase.txt:339
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:325
+#: en/git-rebase.txt:343
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:329
+#: en/git-rebase.txt:347
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:332
+#: en/git-rebase.txt:350
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:333 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:336
+#: en/git-rebase.txt:354
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:345 en/merge-options.txt:47
+#: en/git-rebase.txt:363 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:346
+#: en/git-rebase.txt:364
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:351
+#: en/git-rebase.txt:369
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:357
+#: en/git-rebase.txt:375
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:359
+#: en/git-rebase.txt:377
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:363
+#: en/git-rebase.txt:381
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:387
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:372
+#: en/git-rebase.txt:390
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:394
+#, priority:100
+msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:399
#, priority:100
msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:384
+#: en/git-rebase.txt:406
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:391
+#: en/git-rebase.txt:413
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:421
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:403
+#: en/git-rebase.txt:425
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:407
+#: en/git-rebase.txt:429
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:415
+#: en/git-rebase.txt:437
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:422
+#: en/git-rebase.txt:444
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:426
+#: en/git-rebase.txt:448
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges`, but in contrast to that option works well in interactive rebases: commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:430
+#: en/git-rebase.txt:452
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:432
+#: en/git-rebase.txt:454
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:434 en/git-rebase.txt:535 en/git-svn.txt:680
+#: en/git-rebase.txt:456 en/git-rebase.txt:557 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:439
+#: en/git-rebase.txt:461
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:443
+#: en/git-rebase.txt:465
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:446
+#: en/git-rebase.txt:468
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:447
+#: en/git-rebase.txt:469
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:474
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:455
+#: en/git-rebase.txt:477
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:457
+#: en/git-rebase.txt:479
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:459
+#: en/git-rebase.txt:481
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:483
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:487
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:490
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:480
+#: en/git-rebase.txt:502
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:505
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:484
+#: en/git-rebase.txt:506
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:495
+#: en/git-rebase.txt:517
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:499
+#: en/git-rebase.txt:521
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:509
+#: en/git-rebase.txt:531
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:510
+#: en/git-rebase.txt:532
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:511
+#: en/git-rebase.txt:533
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:514
+#: en/git-rebase.txt:536
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:516
+#: en/git-rebase.txt:538
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:519
+#: en/git-rebase.txt:541
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:523
+#: en/git-rebase.txt:545
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:527
+#: en/git-rebase.txt:549
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:530
+#: en/git-rebase.txt:552
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:553
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:555
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Plain text
-#: en/git-rebase.txt:534
+#: en/git-rebase.txt:556
#, ignore-same, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:537
+#: en/git-rebase.txt:559
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:540
+#: en/git-rebase.txt:562
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:542
+#: en/git-rebase.txt:564
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:544
+#: en/git-rebase.txt:566
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:567
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:546
+#: en/git-rebase.txt:568
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:547
+#: en/git-rebase.txt:569
#, priority:100
-msgid "--rebase-merges and --strategy"
+msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:548
+#: en/git-rebase.txt:570
#, priority:100
-msgid "--rebase-merges and --strategy-option"
+msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:550
+#: en/git-rebase.txt:572
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:575
#, no-wrap, priority:100
msgid "There are some subtle differences how the backends behave.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:556
+#: en/git-rebase.txt:578
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38361,7 +38674,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:561
+#: en/git-rebase.txt:583
#, no-wrap, priority:100
msgid ""
"The am backend drops any \"empty\" commits, regardless of whether the\n"
@@ -38371,7 +38684,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:588
#, no-wrap, priority:100
msgid ""
"The interactive backend drops commits by default that\n"
@@ -38381,7 +38694,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:591
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38389,7 +38702,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:573
+#: en/git-rebase.txt:595
#, no-wrap, priority:100
msgid ""
"Directory rename heuristics are enabled in the merge and interactive\n"
@@ -38398,145 +38711,145 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:597
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:577
+#: en/git-rebase.txt:599
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:582
+#: en/git-rebase.txt:604
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:587
+#: en/git-rebase.txt:609
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:589
+#: en/git-rebase.txt:611
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:596
+#: en/git-rebase.txt:618
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:598
+#: en/git-rebase.txt:620
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:600
+#: en/git-rebase.txt:622
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:601
+#: en/git-rebase.txt:623
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:602
+#: en/git-rebase.txt:624
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:603
+#: en/git-rebase.txt:625
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:605
+#: en/git-rebase.txt:627
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:607
+#: en/git-rebase.txt:629
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:631
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:610
+#: en/git-rebase.txt:632
#, priority:100
msgid "commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:612
+#: en/git-rebase.txt:634
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:614
+#: en/git-rebase.txt:636
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:615
+#: en/git-rebase.txt:637
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:616
+#: en/git-rebase.txt:638
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:644
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:646
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:626
+#: en/git-rebase.txt:648
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:653
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:658
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -38545,73 +38858,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:641
+#: en/git-rebase.txt:663
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:668
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:649
+#: en/git-rebase.txt:671
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:652
+#: en/git-rebase.txt:674
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:655
+#: en/git-rebase.txt:677
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:685
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:667
+#: en/git-rebase.txt:689
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:693
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:696
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:699
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:680
+#: en/git-rebase.txt:702
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:687
+#: en/git-rebase.txt:709
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -38622,25 +38935,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:691
+#: en/git-rebase.txt:713
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:694
+#: en/git-rebase.txt:716
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:701
+#: en/git-rebase.txt:723
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:710
+#: en/git-rebase.txt:732
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -38653,31 +38966,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:715
+#: en/git-rebase.txt:737
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:720
+#: en/git-rebase.txt:742
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:745
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:727
+#: en/git-rebase.txt:749
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:759
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -38691,85 +39004,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:740
+#: en/git-rebase.txt:762
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:746
+#: en/git-rebase.txt:768
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:750
+#: en/git-rebase.txt:772
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:752
+#: en/git-rebase.txt:774
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:756
+#: en/git-rebase.txt:778
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:760
+#: en/git-rebase.txt:782
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:763
+#: en/git-rebase.txt:785
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:765
+#: en/git-rebase.txt:787
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:767
+#: en/git-rebase.txt:789
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:794
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:775
+#: en/git-rebase.txt:797
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:804
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:809
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:816
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38780,13 +39093,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:819
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:826
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38797,13 +39110,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:808
+#: en/git-rebase.txt:830
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:815
+#: en/git-rebase.txt:837
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38814,73 +39127,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:822
+#: en/git-rebase.txt:844
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:824
+#: en/git-rebase.txt:846
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:825
+#: en/git-rebase.txt:847
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:829
+#: en/git-rebase.txt:851
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:836
+#: en/git-rebase.txt:859
#, priority:100
-msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or `filter-branch`."
+msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:839
+#: en/git-rebase.txt:862
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:867
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:848
+#: en/git-rebase.txt:871
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:850
+#: en/git-rebase.txt:873
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:875
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:858
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38891,19 +39204,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:885
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:866
+#: en/git-rebase.txt:889
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:894
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -38913,67 +39226,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:876
+#: en/git-rebase.txt:899
#, priority:100
-msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge-base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
+msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:880
+#: en/git-rebase.txt:903
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:883
+#: en/git-rebase.txt:906
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:886
+#: en/git-rebase.txt:909
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:888
+#: en/git-rebase.txt:911
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:893
+#: en/git-rebase.txt:916
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:895
+#: en/git-rebase.txt:918
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:926
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:907
+#: en/git-rebase.txt:930
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:912
+#: en/git-rebase.txt:935
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:922
+#: en/git-rebase.txt:945
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -38987,25 +39300,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:929
+#: en/git-rebase.txt:952
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:932
+#: en/git-rebase.txt:955
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:935 en/git-rebase.txt:1012
+#: en/git-rebase.txt:958 en/git-rebase.txt:1035
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:941
+#: en/git-rebase.txt:964
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39016,7 +39329,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:946
+#: en/git-rebase.txt:969
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39026,7 +39339,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:950
+#: en/git-rebase.txt:973
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39035,55 +39348,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:954
+#: en/git-rebase.txt:977
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:962
+#: en/git-rebase.txt:985
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:992
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:975
+#: en/git-rebase.txt:998
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:978
+#: en/git-rebase.txt:1001
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1008
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:989
+#: en/git-rebase.txt:1012
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:996
+#: en/git-rebase.txt:1019
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1003
+#: en/git-rebase.txt:1026
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39094,13 +39407,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1009
+#: en/git-rebase.txt:1032
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1015
+#: en/git-rebase.txt:1038
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39108,7 +39421,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1022
+#: en/git-rebase.txt:1045
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39120,7 +39433,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1049
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39129,37 +39442,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1035
+#: en/git-rebase.txt:1058
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1037
+#: en/git-rebase.txt:1060
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1039
+#: en/git-rebase.txt:1062
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1043
+#: en/git-rebase.txt:1066
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1068
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1072
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -39467,117 +39780,118 @@ msgstr ""
msgid "Using this hook, it is easy to generate mails describing the updates to the repository. This example script sends one mail message per ref listing the commits pushed to the repository, and logs the push certificates of signed pushes with good signatures to a logger service:"
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:191
+#. type: delimited block -
+#: en/git-receive-pack.txt:192
#, no-wrap, priority:100
msgid ""
-"\t#!/bin/sh\n"
-"\t# mail out commit update information.\n"
-"\twhile read oval nval ref\n"
-"\tdo\n"
-"\t\tif expr \"$oval\" : '0*$' >/dev/null\n"
-"\t\tthen\n"
-"\t\t\techo \"Created a new ref, with the following commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\"\n"
-"\t\telse\n"
-"\t\t\techo \"New commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
-"\t\tfi |\n"
-"\t\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
-"\tdone\n"
-"\t# log signed push certificate, if any\n"
-"\tif test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"#!/bin/sh\n"
+"# mail out commit update information.\n"
+"while read oval nval ref\n"
+"do\n"
+"\tif expr \"$oval\" : '0*$' >/dev/null\n"
"\tthen\n"
-"\t\t(\n"
-"\t\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
-"\t\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
-"\t\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
-"\tfi\n"
-"\texit 0\n"
+"\t\techo \"Created a new ref, with the following commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\"\n"
+"\telse\n"
+"\t\techo \"New commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
+"\tfi |\n"
+"\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
+"done\n"
+"# log signed push certificate, if any\n"
+"if test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"then\n"
+"\t(\n"
+"\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
+"\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
+"\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
+"fi\n"
+"exit 0\n"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:194
+#: en/git-receive-pack.txt:196
#, priority:100
msgid "The exit code from this hook invocation is ignored, however a non-zero exit code will generate an error message."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:200
+#: en/git-receive-pack.txt:202
#, priority:100
msgid "Note that it is possible for refname to not have sha1-new when this hook runs. This can easily occur if another user modifies the ref after it was updated by 'git-receive-pack', but before the hook was able to evaluate it. It is recommended that hooks rely on sha1-new rather than the current value of refname."
msgstr ""
#. type: Title -
-#: en/git-receive-pack.txt:202
+#: en/git-receive-pack.txt:204
#, no-wrap, priority:100
msgid "POST-UPDATE HOOK"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:207
+#: en/git-receive-pack.txt:209
#, priority:100
msgid "After all other processing, if at least one ref was updated, and if $GIT_DIR/hooks/post-update file exists and is executable, then post-update will be called with the list of refs that have been updated. This can be used to implement any repository wide cleanup tasks."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:211
+#: en/git-receive-pack.txt:213
#, priority:100
msgid "The exit code from this hook invocation is ignored; the only thing left for 'git-receive-pack' to do at that point is to exit itself anyway."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:214
+#: en/git-receive-pack.txt:216
#, priority:100
msgid "This hook can be used, for example, to run `git update-server-info` if the repository is packed and is served via a dumb transport."
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:217
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/git-receive-pack.txt:220
+#, fuzzy, no-wrap, priority:100
+#| msgid "git-update-server-info(1)"
msgid ""
-"\t#!/bin/sh\n"
-"\texec git update-server-info\n"
-msgstr ""
+"#!/bin/sh\n"
+"exec git update-server-info\n"
+msgstr "git-update-server-info(1)"
#. type: Title -
-#: en/git-receive-pack.txt:220
+#: en/git-receive-pack.txt:224
#, no-wrap, priority:100
msgid "QUARANTINE ENVIRONMENT"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:227
+#: en/git-receive-pack.txt:231
#, priority:100
msgid "When `receive-pack` takes in objects, they are placed into a temporary \"quarantine\" directory within the `$GIT_DIR/objects` directory and migrated into the main object store only after the `pre-receive` hook has completed. If the push fails before then, the temporary directory is removed entirely."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:229
+#: en/git-receive-pack.txt:233
#, priority:100
msgid "This has a few user-visible effects and caveats:"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:235
+#: en/git-receive-pack.txt:239
#, priority:100
msgid "Pushes which fail due to problems with the incoming pack, missing objects, or due to the `pre-receive` hook will not leave any on-disk data. This is usually helpful to prevent repeated failed pushes from filling up your disk, but can make debugging more challenging."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:238
+#: en/git-receive-pack.txt:242
#, priority:100
msgid "Any objects created by the `pre-receive` hook will be created in the quarantine directory (and migrated only if it succeeds)."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:244
+#: en/git-receive-pack.txt:248
#, priority:100
msgid "The `pre-receive` hook MUST NOT update any refs to point to quarantined objects. Other programs accessing the repository will not be able to see the objects (and if the pre-receive hook fails, those refs would become corrupted). For safety, any ref updates from within `pre-receive` are automatically rejected."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:249
+#: en/git-receive-pack.txt:253
#, ignore-same, priority:100
msgid "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
msgstr "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
@@ -40905,7 +41219,7 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:131
#, priority:100
-msgid "linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and linkgit:git-rebase[1], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
+msgid "linkgit:git-hash-object[1], linkgit:git-rebase[1], and https://github.com/newren/git-filter-repo[git-filter-repo], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
msgstr ""
#. type: Plain text
@@ -40928,9 +41242,10 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:158
-#, priority:100
-msgid "linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1]"
-msgstr ""
+#, fuzzy, priority:100
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] https://github.com/newren/git-filter-repo[git-filter-repo]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title =
#: en/git-request-pull.txt:2
@@ -41722,7 +42037,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:228 en/git-stash.txt:229
+#: en/git-reset.txt:228 en/git-stash.txt:230
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -42450,102 +42765,49 @@ msgid "git-rev-list - Lists commit objects in reverse chronological order"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:65
+#: en/git-rev-list.txt:13
#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"'git rev-list' [ --max-count=<number> ]\n"
-"\t [ --skip=<number> ]\n"
-"\t [ --max-age=<timestamp> ]\n"
-"\t [ --min-age=<timestamp> ]\n"
-"\t [ --sparse ]\n"
-"\t [ --merges ]\n"
-"\t [ --no-merges ]\n"
-"\t [ --min-parents=<number> ]\n"
-"\t [ --no-min-parents ]\n"
-"\t [ --max-parents=<number> ]\n"
-"\t [ --no-max-parents ]\n"
-"\t [ --first-parent ]\n"
-"\t [ --remove-empty ]\n"
-"\t [ --full-history ]\n"
-"\t [ --not ]\n"
-"\t [ --all ]\n"
-"\t [ --branches[=<pattern>] ]\n"
-"\t [ --tags[=<pattern>] ]\n"
-"\t [ --remotes[=<pattern>] ]\n"
-"\t [ --glob=<glob-pattern> ]\n"
-"\t [ --ignore-missing ]\n"
-"\t [ --stdin ]\n"
-"\t [ --quiet ]\n"
-"\t [ --topo-order ]\n"
-"\t [ --parents ]\n"
-"\t [ --timestamp ]\n"
-"\t [ --left-right ]\n"
-"\t [ --left-only ]\n"
-"\t [ --right-only ]\n"
-"\t [ --cherry-mark ]\n"
-"\t [ --cherry-pick ]\n"
-"\t [ --encoding=<encoding> ]\n"
-"\t [ --(author|committer|grep)=<pattern> ]\n"
-"\t [ --regexp-ignore-case | -i ]\n"
-"\t [ --extended-regexp | -E ]\n"
-"\t [ --fixed-strings | -F ]\n"
-"\t [ --date=<format>]\n"
-"\t [ [ --objects | --objects-edge | --objects-edge-aggressive ]\n"
-"\t [ --unpacked ]\n"
-"\t [ --object-names | --no-object-names ]\n"
-"\t [ --filter=<filter-spec> [ --filter-print-omitted ] ] ]\n"
-"\t [ --missing=<missing-action> ]\n"
-"\t [ --pretty | --header ]\n"
-"\t [ --bisect ]\n"
-"\t [ --bisect-vars ]\n"
-"\t [ --bisect-all ]\n"
-"\t [ --merge ]\n"
-"\t [ --reverse ]\n"
-"\t [ --walk-reflogs ]\n"
-"\t [ --no-walk ] [ --do-walk ]\n"
-"\t [ --count ]\n"
-"\t [ --use-bitmap-index ]\n"
-"\t <commit>... [ \\-- <paths>... ]\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:73
+msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rev-list.txt:21
#, priority:100
msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:80
+#: en/git-rev-list.txt:28
#, priority:100
msgid "You can think of this as a set operation. Commits given on the command line form a set of commits that are reachable from any of them, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:82
+#: en/git-rev-list.txt:30
#, priority:100
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:85
+#: en/git-rev-list.txt:33
#, no-wrap, priority:100
msgid "\t$ git rev-list foo bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:89
+#: en/git-rev-list.txt:37
#, priority:100
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:93
+#: en/git-rev-list.txt:41
#, priority:100
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:97
+#: en/git-rev-list.txt:45
#, no-wrap, priority:100
msgid ""
"\t$ git rev-list origin..HEAD\n"
@@ -42553,13 +42815,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:102
+#: en/git-rev-list.txt:50
#, ignore-ellipsis, priority:100
msgid "Another special notation is \"'<commit1>'...'<commit2>'\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:106
+#: en/git-rev-list.txt:54
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git rev-list A B --not $(git merge-base --all A B)\n"
@@ -42567,7 +42829,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:113
+#: en/git-rev-list.txt:61
#, priority:100
msgid "'rev-list' is a very essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For this reason, it has a lot of different options that enables it to be used by commands as different as 'git bisect' and 'git repack'."
msgstr ""
@@ -44689,31 +44951,31 @@ msgstr ""
msgid "To use 'git send-email' to send your patches through the GMail SMTP server, edit ~/.gitconfig to specify your account settings:"
msgstr ""
-#. type: Plain text
-#: en/git-send-email.txt:494
+#. type: delimited block -
+#: en/git-send-email.txt:495
#, no-wrap, priority:100
msgid ""
-"\t[sendemail]\n"
-"\t\tsmtpEncryption = tls\n"
-"\t\tsmtpServer = smtp.gmail.com\n"
-"\t\tsmtpUser = yourname@gmail.com\n"
-"\t\tsmtpServerPort = 587\n"
+"[sendemail]\n"
+"\tsmtpEncryption = tls\n"
+"\tsmtpServer = smtp.gmail.com\n"
+"\tsmtpUser = yourname@gmail.com\n"
+"\tsmtpServerPort = 587\n"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:498
+#: en/git-send-email.txt:500
#, priority:100
msgid "If you have multifactor authentication setup on your gmail account, you will need to generate an app-specific password for use with 'git send-email'. Visit https://security.google.com/settings/security/apppasswords to create it."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:501
+#: en/git-send-email.txt:503
#, priority:100
msgid "Once your commits are ready to be sent to the mailing list, run the following commands:"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:505
+#: en/git-send-email.txt:507
#, no-wrap, priority:100
msgid ""
"\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -44722,19 +44984,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:510
+#: en/git-send-email.txt:512
#, priority:100
msgid "The first time you run it, you will be prompted for your credentials. Enter the app-specific or your regular password as appropriate. If you have credential helper configured (see linkgit:git-credential[1]), the password will be saved in the credential store so you won't have to type it the next time."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:518
#, priority:100
msgid "Note: the following core Perl modules that may be installed with your distribution of Perl are required: MIME::Base64, MIME::QuotedPrint, Net::Domain and Net::SMTP. These additional Perl modules are also required: Authen::SASL and Mail::Address."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:521
+#: en/git-send-email.txt:523
#, priority:100
msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
msgstr ""
@@ -46323,25 +46585,25 @@ msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--a
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:92
+#: en/git-stash.txt:93
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs, and any non-option arguments form the message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:93
+#: en/git-stash.txt:94
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:100
+#: en/git-stash.txt:101
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:104
+#: en/git-stash.txt:105
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46349,139 +46611,139 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:108
+#: en/git-stash.txt:109
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:109
+#: en/git-stash.txt:110
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:119
+#: en/git-stash.txt:120
#, priority:240
msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:120
+#: en/git-stash.txt:121
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:126
+#: en/git-stash.txt:127
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:130
+#: en/git-stash.txt:131
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:135
+#: en/git-stash.txt:136
#, priority:240
msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:138
+#: en/git-stash.txt:139
#, priority:240
msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:139
+#: en/git-stash.txt:140
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:145
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:145
+#: en/git-stash.txt:146
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:153
+#: en/git-stash.txt:154
#, priority:240
msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:159
+#: en/git-stash.txt:160
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:160
+#: en/git-stash.txt:161
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:164
+#: en/git-stash.txt:165
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:165
+#: en/git-stash.txt:166
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:171
+#: en/git-stash.txt:172
#, priority:240
msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:172 en/git-update-ref.txt:100
+#: en/git-stash.txt:173 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:179
+#: en/git-stash.txt:180
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:180
+#: en/git-stash.txt:181
#, no-wrap, priority:240
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:186
+#: en/git-stash.txt:187
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:195
+#: en/git-stash.txt:196
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:199
+#: en/git-stash.txt:200
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46490,31 +46752,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:203
+#: en/git-stash.txt:204
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:208
+#: en/git-stash.txt:209
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:214
+#: en/git-stash.txt:215
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:219
+#: en/git-stash.txt:220
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:227
+#: en/git-stash.txt:228
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -46526,13 +46788,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:235
+#: en/git-stash.txt:236
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:246
+#: en/git-stash.txt:247
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46547,13 +46809,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:249
+#: en/git-stash.txt:250
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:257
+#: en/git-stash.txt:258
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46565,19 +46827,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:259
+#: en/git-stash.txt:260
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:264
+#: en/git-stash.txt:265
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:275
+#: en/git-stash.txt:276
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46592,19 +46854,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:277
+#: en/git-stash.txt:278
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:283
+#: en/git-stash.txt:284
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:288
+#: en/git-stash.txt:289
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -46613,7 +46875,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:298
+#: en/git-stash.txt:299
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -46691,61 +46953,61 @@ msgid "In addition to the names of files that have been changed, also show the t
msgstr ""
#. type: Plain text
-#: en/git-status.txt:65
+#: en/git-status.txt:66
#, priority:280
msgid "The mode parameter is used to specify the handling of untracked files. It is optional: it defaults to 'all', and if specified, it must be stuck to the option (e.g. `-uno`, but not `-u no`)."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:69
+#: en/git-status.txt:70
#, no-wrap, priority:280
msgid "'no' - Show no untracked files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:70
+#: en/git-status.txt:71
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:81
+#: en/git-status.txt:82
#, priority:280
msgid "When `-u` option is not used, untracked files and directories are shown (i.e. the same as specifying `normal`), to help you avoid forgetting to add newly created files. Because it takes extra work to find untracked files in the filesystem, this mode may take some time in a large working tree. Consider enabling untracked cache and split index if supported (see `git update-index --untracked-cache` and `git update-index --split-index`), Otherwise you can use `no` to have `git status` return more quickly without showing untracked files."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:99
+#: en/git-status.txt:101
#, priority:280
msgid "Ignore changes to submodules when looking for changes. <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 before 1.7.0). Using \"all\" hides all changes to submodules (and suppresses the output of submodule summaries when the config option `status.submoduleSummary` is set)."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:100
+#: en/git-status.txt:102
#, no-wrap, priority:280
msgid "--ignored[=<mode>]"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:102
+#: en/git-status.txt:104
#, priority:280
msgid "Show ignored files as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:105
+#: en/git-status.txt:108
#, priority:280
msgid "The mode parameter is used to specify the handling of ignored files. It is optional: it defaults to 'traditional'."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:109
+#: en/git-status.txt:112
#, priority:280
msgid "'traditional' - Shows ignored files and directories, unless"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:112
+#: en/git-status.txt:115
#, no-wrap, priority:280
msgid ""
"--untracked-files=all is specified, in which case\n"
@@ -46754,109 +47016,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:113
+#: en/git-status.txt:116
#, no-wrap, priority:280
msgid "'no'\t - Show no ignored files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:114
+#: en/git-status.txt:117
#, no-wrap, priority:280
msgid "'matching' - Shows ignored files and directories matching an\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:115
+#: en/git-status.txt:118
#, no-wrap, priority:280
msgid "ignore pattern.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:121
+#: en/git-status.txt:124
#, priority:280
msgid "When 'matching' mode is specified, paths that explicitly match an ignored pattern are shown. If a directory matches an ignore pattern, then it is shown, but not paths contained in the ignored directory. If a directory does not match an ignore pattern, but all contents are ignored, then the directory is not shown, but all contents are shown."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:125
+#: en/git-status.txt:129
#, priority:280
msgid "Terminate entries with NUL, instead of LF. This implies the `--porcelain=v1` output format if no other format is given."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:132
+#: en/git-status.txt:136
#, priority:280
msgid "Display untracked files in columns. See configuration variable column.status for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:133
+#: en/git-status.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--ahead-behind"
msgstr "--ahead-behind"
#. type: Labeled list
-#: en/git-status.txt:134
+#: en/git-status.txt:138
#, ignore-same, no-wrap, priority:280
msgid "--no-ahead-behind"
msgstr "--no-ahead-behind"
#. type: Plain text
-#: en/git-status.txt:137
+#: en/git-status.txt:141
#, priority:280
msgid "Display or do not display detailed ahead/behind counts for the branch relative to its upstream branch. Defaults to true."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:138
+#: en/git-status.txt:142
#, ignore-same, no-wrap, priority:280
msgid "--renames"
msgstr "--renames"
#. type: Plain text
-#: en/git-status.txt:142
+#: en/git-status.txt:146
#, priority:280
msgid "Turn on/off rename detection regardless of user configuration. See also linkgit:git-diff[1] `--no-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:147
+#: en/git-status.txt:151
#, priority:280
msgid "Turn on rename detection, optionally setting the similarity threshold. See also linkgit:git-diff[1] `--find-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:150
+#: en/git-status.txt:154
#, priority:280
msgid "See the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:158
+#: en/git-status.txt:162
#, priority:280
msgid "The output from this command is designed to be used as a commit template comment. The default, long format, is designed to be human readable, verbose and descriptive. Its contents and format are subject to change at any time."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:163
+#: en/git-status.txt:167
#, priority:280
msgid "The paths mentioned in the output, unlike many other Git commands, are made relative to the current directory if you are working in a subdirectory (this is on purpose, to help cutting and pasting). See the status.relativePaths config option below."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:165
+#: en/git-status.txt:169
#, no-wrap, priority:280
msgid "Short Format"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:169
+#: en/git-status.txt:173
#, priority:280
msgid "In the short-format, the status of each path is shown as one of these forms"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:172
+#: en/git-status.txt:176
#, no-wrap, priority:280
msgid ""
"\tXY PATH\n"
@@ -46864,73 +47126,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:176
+#: en/git-status.txt:180
#, priority:280
msgid "where `ORIG_PATH` is where the renamed/copied contents came from. `ORIG_PATH` is only shown when the entry is renamed or copied. The `XY` is a two-letter status code."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:182
+#: en/git-status.txt:186
#, priority:280
msgid "The fields (including the `->`) are separated from each other by a single space. If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash-escaped."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:188
+#: en/git-status.txt:192
#, priority:280
msgid "For paths with merge conflicts, `X` and `Y` show the modification states of each side of the merge. For paths that do not have merge conflicts, `X` shows the status of the index, and `Y` shows the status of the work tree. For untracked paths, `XY` are `??`. Other status codes can be interpreted as follows:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:190
+#: en/git-status.txt:194
#, priority:280
msgid "' ' = unmodified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:191
+#: en/git-status.txt:195
#, priority:280
msgid "'M' = modified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:192
+#: en/git-status.txt:196
#, priority:280
msgid "'A' = added"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:193
+#: en/git-status.txt:197
#, priority:280
msgid "'D' = deleted"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:194
+#: en/git-status.txt:198
#, priority:280
msgid "'R' = renamed"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:195
+#: en/git-status.txt:199
#, priority:280
msgid "'C' = copied"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:196
+#: en/git-status.txt:200
#, priority:280
msgid "'U' = updated but unmerged"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:199
+#: en/git-status.txt:203
#, priority:280
msgid "Ignored files are not listed, unless `--ignored` option is in effect, in which case `XY` are `!!`."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:226
+#: en/git-status.txt:230
#, no-wrap, priority:280
msgid ""
"X Y Meaning\n"
@@ -46961,7 +47223,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:235
+#: en/git-status.txt:239
#, no-wrap, priority:280
msgid ""
"Submodules have more state and instead report\n"
@@ -46974,91 +47236,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:238
+#: en/git-status.txt:242
#, priority:280
msgid "'m' and '?' are applied recursively. For example if a nested submodule in a submodule contains an untracked file, this is reported as '?' as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:240
+#: en/git-status.txt:244
#, priority:280
msgid "If -b is used the short-format status is preceded by a line"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:242
+#: en/git-status.txt:246
#, no-wrap, priority:280
msgid " ## branchname tracking info\n"
msgstr ""
#. type: Title ~
-#: en/git-status.txt:244
+#: en/git-status.txt:248
#, no-wrap, priority:280
msgid "Porcelain Format Version 1"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:251
+#: en/git-status.txt:255
#, priority:280
msgid "Version 1 porcelain format is similar to the short format, but is guaranteed not to change in a backwards-incompatible way between Git versions or based on user configuration. This makes it ideal for parsing by scripts. The description of the short format above also describes the porcelain format, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:254
+#: en/git-status.txt:258
#, priority:280
msgid "The user's color.status configuration is not respected; color will always be off."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:257
+#: en/git-status.txt:261
#, priority:280
msgid "The user's status.relativePaths configuration is not respected; paths shown will always be relative to the repository root."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:267
+#: en/git-status.txt:271
#, priority:280
msgid "There is also an alternate -z format recommended for machine parsing. In that format, the status field is the same, but some other things change. First, the '\\->' is omitted from rename entries and the field order is reversed (e.g 'from \\-> to' becomes 'to from'). Second, a NUL (ASCII 0) follows each filename, replacing space as a field separator and the terminating newline (but a space still separates the status field from the first filename). Third, filenames containing special characters are not specially formatted; no quoting or backslash-escaping is performed."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:269
+#: en/git-status.txt:273
#, priority:280
msgid "Any submodule changes are reported as modified `M` instead of `m` or single `?`."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:271
+#: en/git-status.txt:275
#, no-wrap, priority:280
msgid "Porcelain Format Version 2"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:276
+#: en/git-status.txt:280
#, priority:280
msgid "Version 2 format adds more detailed information about the state of the worktree and changed items. Version 2 also defines an extensible set of easy to parse optional headers."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:280
+#: en/git-status.txt:284
#, priority:280
msgid "Header lines start with \"#\" and are added in response to specific command line arguments. Parsers should ignore headers they don't recognize."
msgstr ""
#. type: Title ^
-#: en/git-status.txt:282
+#: en/git-status.txt:286
#, no-wrap, priority:280
msgid "Branch Headers"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:286
+#: en/git-status.txt:290
#, priority:280
msgid "If `--branch` is given, a series of header lines are printed with information about the current branch."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:296
+#: en/git-status.txt:300
#, no-wrap, priority:280
msgid ""
"Line Notes\n"
@@ -47072,43 +47334,43 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:299
+#: en/git-status.txt:303
#, no-wrap, priority:280
msgid "Changed Tracked Entries"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:306
+#: en/git-status.txt:310
#, priority:280
msgid "Following the headers, a series of lines are printed for tracked entries. One of three different line formats may be used to describe an entry depending on the type of change. Tracked entries are printed in an undefined order; parsers should allow for a mixture of the 3 line types in any order."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:308
+#: en/git-status.txt:312
#, priority:280
msgid "Ordinary changed entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:310
+#: en/git-status.txt:314
#, no-wrap, priority:280
msgid " 1 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:312
+#: en/git-status.txt:316
#, priority:280
msgid "Renamed or copied entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:314
+#: en/git-status.txt:318
#, no-wrap, priority:280
msgid " 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:345
+#: en/git-status.txt:349
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47143,19 +47405,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:349
+#: en/git-status.txt:353
#, priority:280
msgid "Unmerged entries have the following format; the first character is a \"u\" to distinguish from ordinary changed entries."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:351
+#: en/git-status.txt:355
#, no-wrap, priority:280
msgid " u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:368
+#: en/git-status.txt:372
#, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47176,85 +47438,85 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:371
+#: en/git-status.txt:375
#, no-wrap, priority:280
msgid "Other Items"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:376
+#: en/git-status.txt:380
#, priority:280
msgid "Following the tracked entries (and if requested), a series of lines will be printed for untracked and then ignored items found in the worktree."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:378
+#: en/git-status.txt:382
#, priority:280
msgid "Untracked items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:380
+#: en/git-status.txt:384
#, no-wrap, priority:280
msgid " ? <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:382
+#: en/git-status.txt:386
#, priority:280
msgid "Ignored items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:384
+#: en/git-status.txt:388
#, no-wrap, priority:280
msgid " ! <path>\n"
msgstr ""
#. type: Title ^
-#: en/git-status.txt:386
+#: en/git-status.txt:390
#, no-wrap, priority:280
msgid "Pathname Format Notes and -z"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:391
+#: en/git-status.txt:395
#, priority:280
msgid "When the `-z` option is given, pathnames are printed as is and without any quoting and lines are terminated with a NUL (ASCII 0x00) byte."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:395
+#: en/git-status.txt:399
#, 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])."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:404
+#: en/git-status.txt:408
#, priority:280
msgid "The command honors `color.status` (or `status.color` -- they mean the same thing and the latter is kept for backward compatibility) and `color.status.<slot>` configuration variables to colorize its output."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:408
+#: en/git-status.txt:412
#, priority:280
msgid "If the config variable `status.relativePaths` is set to false, then all paths shown are relative to the repository root, not to the current directory."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:419
+#: en/git-status.txt:423
#, priority:280
msgid "If `status.submoduleSummary` is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). Please note that the summary output from the status command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings."
msgstr ""
#. type: Title -
-#: en/git-status.txt:421
+#: en/git-status.txt:425
#, no-wrap, priority:280
msgid "BACKGROUND REFRESH"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:432
+#: en/git-status.txt:436
#, priority:280
msgid "By default, `git status` will automatically refresh the index, updating the cached stat information from the working tree and writing out the result. Writing out the updated index is an optimization that isn't strictly necessary (`status` computes the values for itself, but writing them out is just to save subsequent programs from repeating our computation). When `status` is run in the background, the lock held during the write may conflict with other simultaneous processes, causing them to fail. Scripts running `status` in the background should consider using `git --no-optional-locks status` (see linkgit:git[1] for details)."
msgstr ""
@@ -47698,282 +47960,288 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:176
#, no-wrap, priority:220
-msgid "set-branch ((-d|--default)|(-b|--branch <branch>)) [--] <path>"
+msgid "set-branch (-b|--branch) <branch> [--] <path>"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-submodule.txt:177
+#, no-wrap, priority:220
+msgid "set-branch (-d|--default) [--] <path>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:181
+#: en/git-submodule.txt:182
#, priority:220
msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:182
+#: en/git-submodule.txt:183
#, ignore-ellipsis, no-wrap, priority:220
msgid "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:191
+#: en/git-submodule.txt:192
#, priority:220
msgid "Show commit summary between the given commit (defaults to HEAD) and working tree/index. For a submodule in question, a series of commits in the submodule between the given super project commit and the index or working tree (switched by `--cached`) are shown. If the option `--files` is given, show the series of commits in the submodule between the index of the super project and the working tree of the submodule (this option doesn't allow to use the `--cached` option or to provide an explicit commit)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:194
+#: en/git-submodule.txt:195
#, priority:220
msgid "Using the `--submodule=log` option with linkgit:git-diff[1] will provide that information too."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:195
+#: en/git-submodule.txt:196
#, no-wrap, priority:220
msgid "foreach [--recursive] <command>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:216
+#: en/git-submodule.txt:217
#, priority:220
msgid "Evaluates an arbitrary shell command in each checked out submodule. The command has access to the variables $name, $sm_path, $displaypath, $sha1 and $toplevel: $name is the name of the relevant submodule section in `.gitmodules`, $sm_path is the path of the submodule as recorded in the immediate superproject, $displaypath contains the relative path from the current working directory to the submodules root directory, $sha1 is the commit as recorded in the immediate superproject, and $toplevel is the absolute path to the top-level of the immediate superproject. Note that to avoid conflicts with '$PATH' on Windows, the '$path' variable is now a deprecated synonym of '$sm_path' variable. Any submodules defined in the superproject but not checked out are ignored by this command. Unless given `--quiet`, foreach prints the name of each submodule before evaluating the command. If `--recursive` is given, submodules are traversed recursively (i.e. the given shell command is evaluated in nested submodules as well). A non-zero return from the command in any submodule causes the processing to terminate. This can be overridden by adding '|| :' to the end of the command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:219
+#: en/git-submodule.txt:220
#, priority:220
msgid "As an example, the command below will show the path and currently checked out commit for each submodule:"
msgstr ""
#. type: delimited block -
-#: en/git-submodule.txt:222
+#: en/git-submodule.txt:223
#, no-wrap, priority:220
msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:224
+#: en/git-submodule.txt:225
#, ignore-ellipsis, no-wrap, priority:220
msgid "sync [--recursive] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:231
+#: en/git-submodule.txt:232
#, priority:220
msgid "Synchronizes submodules' remote URL configuration setting to the value specified in `.gitmodules`. It will only affect those submodules which already have a URL entry in .git/config (that is the case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:234
+#: en/git-submodule.txt:235
#, priority:220
msgid "`git submodule sync` synchronizes all submodules while `git submodule sync -- A` synchronizes submodule \"A\" only."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:237
+#: en/git-submodule.txt:238
#, priority:220
msgid "If `--recursive` is specified, this command will recurse into the registered submodules, and sync any nested submodules within."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:238
+#: en/git-submodule.txt:239
#, no-wrap, priority:220
msgid "absorbgitdirs"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:245
+#: en/git-submodule.txt:246
#, priority:220
msgid "If a git directory of a submodule is inside the submodule, move the git directory of the submodule into its superprojects `$GIT_DIR/modules` path and then connect the git directory and its working directory by setting the `core.worktree` and adding a .git file pointing to the git directory embedded in the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:249
+#: en/git-submodule.txt:250
#, priority:220
msgid "A repository that was cloned independently and later added as a submodule or old setups have the submodules git directory inside the submodule instead of embedded into the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:251
+#: en/git-submodule.txt:252
#, priority:220
msgid "This command is recursive by default."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:257
+#: en/git-submodule.txt:258
#, priority:220
msgid "Only print error messages."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:264
+#: en/git-submodule.txt:265
#, priority:220
msgid "This option is only valid for add and update commands. Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:268
+#: en/git-submodule.txt:269
#, priority:220
msgid "This option is only valid for the deinit command. Unregister all submodules in the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:269
+#: en/git-submodule.txt:270
#, fuzzy, no-wrap, priority:220
#| msgid "--branch"
msgid "-b <branch>"
msgstr "--branch"
#. type: Plain text
-#: en/git-submodule.txt:277
+#: en/git-submodule.txt:278
#, priority:220
msgid "Branch of repository to add as submodule. The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository. If the option is not specified, it defaults to 'master'."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:290
+#: en/git-submodule.txt:291
#, priority:220
msgid "This option is only valid for add, deinit and update commands. When running add, allow adding an otherwise ignored submodule path. When running deinit the submodule working trees will be removed even if they contain local changes. When running update (only effective with the checkout procedure), throw away local changes in submodules when switching to a different commit; and always run a checkout operation in the submodule, even if the commit listed in the index of the containing repository matches the commit checked out in the submodule."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:295
+#: en/git-submodule.txt:296
#, priority:220
msgid "This option is only valid for status and summary commands. These commands typically use the commit found in the submodule HEAD, but with this option, the commit stored in the index is used instead."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:296
+#: en/git-submodule.txt:297
#, ignore-same, no-wrap, priority:220
msgid "--files"
msgstr "--files"
#. type: Plain text
-#: en/git-submodule.txt:300
+#: en/git-submodule.txt:301
#, priority:220
msgid "This option is only valid for the summary command. This command compares the commit in the index with that in the submodule HEAD when this option is used."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:302
+#: en/git-submodule.txt:303
#, ignore-same, no-wrap, priority:220
msgid "--summary-limit"
msgstr "--summary-limit"
#. type: Plain text
-#: en/git-submodule.txt:308
+#: en/git-submodule.txt:309
#, priority:220
msgid "This option is only valid for the summary command. Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:309
+#: en/git-submodule.txt:310
#, ignore-same, no-wrap, priority:220
msgid "--remote"
msgstr "--remote"
#. type: Plain text
-#: en/git-submodule.txt:318
+#: en/git-submodule.txt:319
#, priority:220
msgid "This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:324
+#: en/git-submodule.txt:325
#, priority:220
msgid "This works for any of the supported update procedures (`--checkout`, `--rebase`, etc.). The only change is the source of the target SHA-1. For example, `submodule update --remote --merge` will merge upstream submodule changes into the submodules, while `submodule update --merge` will merge superproject gitlink changes into the submodules."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:329
+#: en/git-submodule.txt:330
#, priority:220
msgid "In order to ensure a current tracking branch state, `update --remote` fetches the submodule's remote repository before calculating the SHA-1. If you don't want to fetch, you should use `submodule update --remote --no-fetch`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:339
+#: en/git-submodule.txt:340
#, priority:220
msgid "Use this option to integrate changes from the upstream subproject with your submodule's current HEAD. Alternatively, you can run `git pull` from the submodule, which is equivalent except for the remote branch name: `update --remote` uses the default upstream repository and `submodule.<name>.branch`, while `git pull` uses the submodule's `branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want to distribute the default upstream branch with the superproject and `branch.<name>.merge` if you want a more native feel while working in the submodule itself."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:341
+#: en/git-submodule.txt:342
#, ignore-same, no-wrap, priority:220
msgid "--no-fetch"
msgstr "--no-fetch"
#. type: Plain text
-#: en/git-submodule.txt:344
+#: en/git-submodule.txt:345
#, priority:220
msgid "This option is only valid for the update command. Don't fetch new objects from the remote site."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:345
+#: en/git-submodule.txt:346
#, ignore-same, no-wrap, priority:220
msgid "--checkout"
msgstr "--checkout"
#. type: Plain text
-#: en/git-submodule.txt:353
+#: en/git-submodule.txt:354
#, priority:220
msgid "This option is only valid for the update command. Checkout the commit recorded in the superproject on a detached HEAD in the submodule. This is the default behavior, the main use of this option is to override `submodule.$name.update` when set to a value other than `checkout`. If the key `submodule.$name.update` is either not explicitly set or set to `checkout`, this option is implicit."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:363
+#: en/git-submodule.txt:364
#, priority:220
msgid "This option is only valid for the update command. Merge the commit recorded in the superproject into the current branch of the submodule. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve the resulting conflicts within the submodule with the usual conflict resolution tools. If the key `submodule.$name.update` is set to `merge`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:364
+#: en/git-submodule.txt:365
#, ignore-same, no-wrap, priority:220
msgid "--rebase"
msgstr "--rebase"
#. type: Plain text
-#: en/git-submodule.txt:372
+#: en/git-submodule.txt:373
#, priority:220
msgid "This option is only valid for the update command. Rebase the current branch onto the commit recorded in the superproject. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve these failures with linkgit:git-rebase[1]. If the key `submodule.$name.update` is set to `rebase`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:373
+#: en/git-submodule.txt:374
#, ignore-same, no-wrap, priority:220
msgid "--init"
msgstr "--init"
#. type: Plain text
-#: en/git-submodule.txt:377
+#: en/git-submodule.txt:378
#, priority:220
msgid "This option is only valid for the update command. Initialize all submodules for which \"git submodule init\" has not been called so far before updating."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:378
+#: en/git-submodule.txt:379
#, ignore-same, no-wrap, priority:220
msgid "--name"
msgstr "--name"
#. type: Plain text
-#: en/git-submodule.txt:382
+#: en/git-submodule.txt:383
#, priority:220
msgid "This option is only valid for the add command. It sets the submodule's name to the given string instead of defaulting to its path. The name must be valid as a directory name and may not end with a '/'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:383
+#: en/git-submodule.txt:384
#, no-wrap, priority:220
msgid "--reference <repository>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:387 en/git-submodule.txt:396
+#: en/git-submodule.txt:388 en/git-submodule.txt:397
#, priority:220
msgid "This option is only valid for add and update commands. These commands sometimes need to clone a remote repository. In this case, this option will be passed to the linkgit:git-clone[1] command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:391
+#: en/git-submodule.txt:392
#, no-wrap, priority:220
msgid ""
"*NOTE*: Do *not* use this option unless you have read the note\n"
@@ -47982,61 +48250,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:398
+#: en/git-submodule.txt:399
#, no-wrap, priority:220
msgid "*NOTE*: see the NOTE for the `--reference` option.\n"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:404
+#: en/git-submodule.txt:405
#, priority:220
msgid "This option is only valid for foreach, update, status and sync commands. Traverse submodules recursively. The operation is performed not only in the submodules of the current repo, but also in any nested submodules inside those submodules (and so on)."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:405
+#: en/git-submodule.txt:406
#, ignore-same, no-wrap, priority:220
msgid "--depth"
msgstr "--depth"
#. type: Plain text
-#: en/git-submodule.txt:409
+#: en/git-submodule.txt:410
#, priority:220
msgid "This option is valid for add and update commands. Create a 'shallow' clone with a history truncated to the specified number of revisions. See linkgit:git-clone[1]"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:410
+#: en/git-submodule.txt:411
#, ignore-same, no-wrap, priority:220
msgid "--[no-]recommend-shallow"
msgstr "--[no-]recommend-shallow"
#. type: Plain text
-#: en/git-submodule.txt:415
+#: en/git-submodule.txt:416
#, priority:220
msgid "This option is only valid for the update command. The initial clone of a submodule will use the recommended `submodule.<name>.shallow` as provided by the `.gitmodules` file by default. To ignore the suggestions use `--no-recommend-shallow`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:421
+#: en/git-submodule.txt:422
#, priority:220
msgid "This option is only valid for the update command. Clone new submodules in parallel with as many jobs. Defaults to the `submodule.fetchJobs` option."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:426
+#: en/git-submodule.txt:427
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:434
+#: en/git-submodule.txt:435
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:438
+#: en/git-submodule.txt:439
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -48668,7 +48936,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:889
+#: en/git-svn.txt:346 en/rev-list-options.txt:905
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -49481,7 +49749,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:777
#, priority:100
-msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider linkgit:git-filter-branch[1] instead. filter-branch also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
+msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports, and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider https://github.com/newren/git-filter-repo[git-filter-repo] instead. filter-repo also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
msgstr ""
#. type: Labeled list
@@ -51407,16 +51675,6 @@ msgid ""
"#\n"
msgstr ""
-#. type: delimited block -
-#: en/git.txt:310
-#, 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/git.txt:315
#, no-wrap, priority:100
@@ -55458,98 +55716,104 @@ msgstr ""
msgid "This option determines how the merge message will be cleaned up before commiting. See linkgit:git-commit[1] for more details. In addition, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on to the commit machinery in the case of a merge conflict."
msgstr ""
+#. type: Labeled list
+#: en/merge-options.txt:44
+#, ignore-same, no-wrap, priority:240
+msgid "--ff-only"
+msgstr "--ff-only"
+
#. type: Plain text
-#: en/merge-options.txt:46
+#: en/merge-options.txt:50
#, priority:240
-msgid "When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. This is the default behavior."
+msgid "Specifies how a merge is handled when the merged-in history is already a descendant of the current history. `--ff` is the default unless merging an annotated (and possibly signed) tag that is not stored in its natural place in the `refs/tags/` hierarchy, in which case `--no-ff` is assumed."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:52
+#: en/merge-options.txt:55
#, priority:240
-msgid "Create a merge commit even when the merge resolves as a fast-forward. This is the default behaviour when merging an annotated (and possibly signed) tag that is not stored in its natural place in 'refs/tags/' hierarchy."
+msgid "With `--ff`, when possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit."
msgstr ""
-#. type: Labeled list
-#: en/merge-options.txt:53
-#, ignore-same, no-wrap, priority:240
-msgid "--ff-only"
-msgstr "--ff-only"
+#. type: Plain text
+#: en/merge-options.txt:58
+#, priority:240
+msgid "With `--no-ff`, create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward."
+msgstr ""
#. type: Plain text
-#: en/merge-options.txt:57
+#: en/merge-options.txt:61
#, priority:240
-msgid "Refuse to merge and exit with a non-zero status unless the current `HEAD` is already up to date or the merge can be resolved as a fast-forward."
+msgid "With `--ff-only`, resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:63
+#: en/merge-options.txt:67
#, priority:240
msgid "GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:69
+#: en/merge-options.txt:73
#, priority:240
msgid "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also linkgit:git-fmt-merge-msg[1]."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:72
+#: en/merge-options.txt:76
#, priority:240
msgid "With --no-log do not list one-line descriptions from the actual commits being merged."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:74
+#: en/merge-options.txt:78
#, ignore-same, no-wrap, priority:240
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
-#: en/merge-options.txt:83
+#: en/merge-options.txt:87
#, priority:240
msgid "With --no-signoff do not add a Signed-off-by line."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:89
+#: en/merge-options.txt:93
#, priority:240
msgid "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:92
+#: en/merge-options.txt:96
#, priority:240
msgid "With -n or --no-stat do not show a diffstat at the end of the merge."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:93
+#: en/merge-options.txt:97
#, ignore-same, no-wrap, priority:240
msgid "--squash"
msgstr "--squash"
#. type: Labeled list
-#: en/merge-options.txt:94
+#: en/merge-options.txt:98
#, ignore-same, no-wrap, priority:240
msgid "--no-squash"
msgstr "--no-squash"
#. type: Plain text
-#: en/merge-options.txt:102
+#: en/merge-options.txt:106
#, priority:240
msgid "Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:105
+#: en/merge-options.txt:109
#, priority:240
msgid "With --no-squash perform the merge and commit the result. This option can be used to override --squash."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:107
+#: en/merge-options.txt:111
#, priority:240
msgid "With --squash, --commit is not allowed, and will fail."
msgstr ""
@@ -55557,71 +55821,77 @@ msgstr ""
#. type: Plain text
#: en/merge-options.txt:115
#, priority:240
+msgid "This option bypasses the pre-merge and commit-msg hooks. See also linkgit:githooks[5]."
+msgstr ""
+
+#. type: Plain text
+#: en/merge-options.txt:123
+#, priority:240
msgid "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise)."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:116
+#: en/merge-options.txt:124
#, no-wrap, priority:240
msgid "-X <option>"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:120
+#: en/merge-options.txt:128
#, priority:240
msgid "Pass merge strategy specific option through to the merge strategy."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:121
+#: en/merge-options.txt:129
#, ignore-same, no-wrap, priority:240
msgid "--verify-signatures"
msgstr "--verify-signatures"
#. type: Labeled list
-#: en/merge-options.txt:122
+#: en/merge-options.txt:130
#, ignore-same, no-wrap, priority:240
msgid "--no-verify-signatures"
msgstr "--no-verify-signatures"
#. type: Plain text
-#: en/merge-options.txt:128
+#: en/merge-options.txt:136
#, priority:240
msgid "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:130
+#: en/merge-options.txt:138
#, ignore-same, no-wrap, priority:240
msgid "--no-summary"
msgstr "--no-summary"
#. type: Plain text
-#: en/merge-options.txt:133
+#: en/merge-options.txt:141
#, priority:240
msgid "Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:138
+#: en/merge-options.txt:146
#, priority:240
msgid "Operate quietly. Implies --no-progress."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:149
+#: en/merge-options.txt:157
#, priority:240
msgid "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:152
+#: en/merge-options.txt:160
#, ignore-same, no-wrap, priority:240
msgid "--allow-unrelated-histories"
msgstr "--allow-unrelated-histories"
#. type: Plain text
-#: en/merge-options.txt:158
+#: en/merge-options.txt:166
#, priority:240
msgid "By default, `git merge` command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added."
msgstr ""
@@ -56958,7 +57228,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:215
#, priority:260
-msgid "minutes ago`}; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -59336,263 +59606,281 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:762
#, priority:260
+msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:771
+#, ignore-ellipsis, priority:260
+msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:775
+#, priority:260
+msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:778
+#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:779
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:766
+#: en/rev-list-options.txt:782
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:773
+#: en/rev-list-options.txt:789
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:781
+#: en/rev-list-options.txt:797
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:800
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:791
+#: en/rev-list-options.txt:807
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:793
+#: en/rev-list-options.txt:809
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:801
+#: en/rev-list-options.txt:817
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:802
+#: en/rev-list-options.txt:818
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:804
+#: en/rev-list-options.txt:820
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:822
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:812
+#: en/rev-list-options.txt:828
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:832
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:818
+#: en/rev-list-options.txt:834
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:819
+#: en/rev-list-options.txt:835
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:826
+#: en/rev-list-options.txt:842
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:847
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:833
+#: en/rev-list-options.txt:849
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:852
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:838
+#: en/rev-list-options.txt:854
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:839
+#: en/rev-list-options.txt:855
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:840
+#: en/rev-list-options.txt:856
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:859
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:846
+#: en/rev-list-options.txt:862
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:864
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:873
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:864
+#: en/rev-list-options.txt:880
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:868
+#: en/rev-list-options.txt:884
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:875
+#: en/rev-list-options.txt:891
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:894
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:880
+#: en/rev-list-options.txt:896
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:882
+#: en/rev-list-options.txt:898
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:884
+#: en/rev-list-options.txt:900
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:887
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:892
+#: en/rev-list-options.txt:908
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:909
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:896
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:898
+#: en/rev-list-options.txt:914
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:902
+#: en/rev-list-options.txt:918
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:907
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:925
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:932
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -59603,19 +59891,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:919
+#: en/rev-list-options.txt:935
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:922
+#: en/rev-list-options.txt:938
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:929
+#: en/rev-list-options.txt:945
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -59627,85 +59915,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:931
+#: en/rev-list-options.txt:947
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:937
+#: en/rev-list-options.txt:953
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:939
+#: en/rev-list-options.txt:955
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:942
+#: en/rev-list-options.txt:958
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:943
+#: en/rev-list-options.txt:959
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:949
+#: en/rev-list-options.txt:965
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:959
+#: en/rev-list-options.txt:975
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:963
+#: en/rev-list-options.txt:979
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:984
#, priority:260
msgid "Listed below are options that control the formatting of diff output. Some of them are specific to linkgit:git-rev-list[1], however other diff options may be given. See linkgit:git-diff-files[1] for more options."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:991
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:981
+#: en/rev-list-options.txt:997
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:1012
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1015
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1018
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.nl.po b/po/documentation.nl.po
index 07320c7ce55d5d3772d7fe5fadd5e01f521bbcd4..2f3a04aebfc933ab28572006de52c95d702c919f 100644
--- a/po/documentation.nl.po
+++ b/po/documentation.nl.po
@@ -6,9 +6,9 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2019-08-27 18:53+0200\n"
+"POT-Creation-Date: 2019-12-08 16:35+0100\n"
"PO-Revision-Date: 2019-10-31 12:31+0100\n"
-"Last-Translator: Matthias A횩hauer <mha1993@live.de>\n"
+"Last-Translator: Matthias Ahauer <mha1993@live.de>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
@@ -23,19 +23,19 @@ msgstr "-b"
#. type: Plain text
#: en/blame-options.txt:4
-#, ignore-translated, priority:100
+#, priority:100
msgid "Show blank SHA-1 for boundary commits. This can also be controlled via the `blame.blankboundary` config option."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:319 en/git-fsck.txt:38 en/git-rebase.txt:471
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:321 en/git-fsck.txt:38 en/git-rebase.txt:493
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
#. type: Plain text
#: en/blame-options.txt:8
-#, ignore-translated, priority:100
+#, priority:100
msgid "Do not treat root commits as boundaries. This can also be controlled via the `blame.showRoot` config option."
msgstr ""
@@ -88,7 +88,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1000
+#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1016
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -124,7 +124,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:433 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -466,7 +466,7 @@ msgid "Get and set repository or global options."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1505
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1528
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-export[1]"
msgstr "linkgit:git-fast-export[1]"
@@ -478,7 +478,7 @@ msgid "Git data exporter."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:243
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-import[1]"
msgstr "linkgit:git-fast-import[1]"
@@ -2259,95 +2259,95 @@ msgstr ""
msgid "Example"
msgstr ""
-#. type: Plain text
-#: en/config.txt:185
+#. type: delimited block -
+#: en/config.txt:186
#, no-wrap, priority:100
msgid ""
-"\t# Core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"# Core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:190
+#. type: delimited block -
+#: en/config.txt:191
#, no-wrap, priority:100
msgid ""
-"\t# Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"# Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:194
+#. type: delimited block -
+#: en/config.txt:195
#, no-wrap, priority:100
msgid ""
-"\t[branch \"devel\"]\n"
-"\t\tremote = origin\n"
-"\t\tmerge = refs/heads/devel\n"
+"[branch \"devel\"]\n"
+"\tremote = origin\n"
+"\tmerge = refs/heads/devel\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:199
+#. type: delimited block -
+#: en/config.txt:200
#, no-wrap, priority:100
msgid ""
-"\t# Proxy settings\n"
-"\t[core]\n"
-"\t\tgitProxy=\"ssh\" for \"kernel.org\"\n"
-"\t\tgitProxy=default-proxy ; for the rest\n"
+"# Proxy settings\n"
+"[core]\n"
+"\tgitProxy=\"ssh\" for \"kernel.org\"\n"
+"\tgitProxy=default-proxy ; for the rest\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:204
+#. type: delimited block -
+#: en/config.txt:205
#, no-wrap, priority:100
msgid ""
-"\t[include]\n"
-"\t\tpath = /path/to/foo.inc ; include by absolute path\n"
-"\t\tpath = foo.inc ; find \"foo.inc\" relative to the current file\n"
-"\t\tpath = ~/foo.inc ; find \"foo.inc\" in your `$HOME` directory\n"
+"[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: Plain text
-#: en/config.txt:208
+#. type: delimited block -
+#: en/config.txt:209
#, no-wrap, priority:100
msgid ""
-"\t; include if $GIT_DIR is /path/to/foo/.git\n"
-"\t[includeIf \"gitdir:/path/to/foo/.git\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; 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: Plain text
-#: en/config.txt:212
+#. type: delimited block -
+#: en/config.txt:213
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside /path/to/group\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside /path/to/group\n"
+"[includeIf \"gitdir:/path/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:216
+#. type: delimited block -
+#: en/config.txt:217
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside $HOME/to/group\n"
-"\t[includeIf \"gitdir:~/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside $HOME/to/group\n"
+"[includeIf \"gitdir:~/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:222
+#. type: delimited block -
+#: en/config.txt:223
#, no-wrap, priority:100
msgid ""
-"\t; relative paths are always relative to the including\n"
-"\t; file (if the condition is true); their location is not\n"
-"\t; affected by the condition\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = foo.inc\n"
+"; 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:227
+#: en/config.txt:229
#, no-wrap, priority:100
msgid ""
"\t; include only if we are in a worktree where foo-branch is\n"
@@ -2357,43 +2357,43 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/config.txt:229
+#: en/config.txt:231
#, no-wrap, priority:100
msgid "Values"
msgstr ""
#. type: Plain text
-#: en/config.txt:234
+#: 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:235
+#: en/config.txt:237
#, no-wrap, priority:100
msgid "boolean"
msgstr ""
#. type: Plain text
-#: en/config.txt:240
+#: 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:241
+#: en/config.txt:243
#, no-wrap, priority:100
msgid "true"
msgstr ""
#. type: Plain text
-#: en/config.txt:242
+#: en/config.txt:244
#, priority:100
msgid "Boolean true literals are `yes`, `on`, `true`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:244
+#: en/config.txt:246
#, no-wrap, priority:100
msgid ""
"and `1`. Also, a variable defined without `= <value>`\n"
@@ -2401,109 +2401,109 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/config.txt:245
+#: en/config.txt:247
#, no-wrap, priority:100
msgid "false"
msgstr ""
#. type: Plain text
-#: en/config.txt:246
+#: en/config.txt:248
#, priority:100
msgid "Boolean false literals are `no`, `off`, `false`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:247
+#: en/config.txt:249
#, no-wrap, priority:100
msgid "`0` and the empty string.\n"
msgstr ""
#. type: Plain text
-#: en/config.txt:251
+#: 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:252
+#: en/config.txt:254
#, no-wrap, priority:100
msgid "integer"
msgstr ""
#. type: Plain text
-#: en/config.txt:256
+#: 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:257 en/diff-options.txt:356 en/git-for-each-ref.txt:177
+#: 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:261
+#: 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:265
+#: en/config.txt:267
#, 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."
msgstr ""
#. type: Plain text
-#: en/config.txt:270
+#: en/config.txt:272
#, 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:277
+#: en/config.txt:279
#, 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:280
+#: en/config.txt:282
#, 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:289
+#: en/config.txt:291
#, 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:290
+#: en/config.txt:292
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:296
+#: en/config.txt:298
#, 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:299 en/git-imap-send.txt:58
+#: en/config.txt:301 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:304
+#: en/config.txt:306
#, 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:309
+#: en/config.txt:311
#, 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 ""
@@ -3241,53 +3241,53 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
#, no-wrap, priority:260
-msgid "Generating patches with -p"
+msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:10
+#: en/diff-generate-patch.txt:14
#, priority:260
-msgid "When \"git-diff-index\", \"git-diff-tree\", or \"git-diff-files\" are run with a `-p` option, \"git diff\" without the `--raw` option, or \"git log\" with the \"-p\" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
+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:13
+#: 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:15
+#: 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:17
+#: 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:21
+#: 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:25
+#: 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:27
+#: 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:39
+#: en/diff-generate-patch.txt:43
#, no-wrap, priority:260
msgid ""
"old mode <mode>\n"
@@ -3304,43 +3304,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:42
+#: 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:44
+#: 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:51
+#: 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:55
+#: en/diff-generate-patch.txt:59
#, priority:260
-msgid "The index line includes the SHA-1 checksum 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."
+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:59
+#: 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:64
+#: 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:71
+#: en/diff-generate-patch.txt:75
#, no-wrap, priority:260
msgid ""
"diff --git a/a b/b\n"
@@ -3352,25 +3352,25 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/diff-generate-patch.txt:74
+#: en/diff-generate-patch.txt:78
#, no-wrap, priority:260
-msgid "combined diff format"
+msgid "Combined diff format"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:82
+#: 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:84
+#: en/diff-generate-patch.txt:88
#, priority:260
-msgid "A 'combined diff' format looks like this:"
+msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:93
+#: en/diff-generate-patch.txt:97
#, no-wrap, priority:260
msgid ""
"diff --combined describe.c\n"
@@ -3383,7 +3383,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:103
+#: en/diff-generate-patch.txt:107
#, no-wrap, priority:260
msgid ""
"- static void describe(char *arg)\n"
@@ -3398,7 +3398,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:113
+#: en/diff-generate-patch.txt:117
#, no-wrap, priority:260
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
@@ -3413,37 +3413,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:117
+#: en/diff-generate-patch.txt:121
#, priority:260
-msgid "It is preceded with a \"git diff\" header, that looks like this (when `-c` option is used):"
+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:119
+#: en/diff-generate-patch.txt:123
#, no-wrap, priority:260
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:121
+#: en/diff-generate-patch.txt:125
#, priority:260
-msgid "or like this (when `--cc` option is used):"
+msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:123
+#: en/diff-generate-patch.txt:127
#, no-wrap, priority:260
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:126
+#: 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:131
+#: en/diff-generate-patch.txt:135
#, no-wrap, priority:260
msgid ""
"index <hash>,<hash>..<hash>\n"
@@ -3453,91 +3453,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:137
+#: 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:139
+#: 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:141 en/diff-generate-patch.txt:152 en/diff-generate-patch.txt:153 en/diff-generate-patch.txt:154
+#: 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:142 en/diff-generate-patch.txt:155
+#: 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:146
+#: 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:150
+#: 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:159
+#: 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:165
+#: 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 for apply. The change is similar to the change in the extended 'index' header:"
+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:167
+#: 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:170
+#: 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:179
+#: 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:185
+#: 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:191
+#: 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:197
+#: 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:327 en/merge-options.txt:86
+#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3549,7 +3549,7 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:186 en/git-add.txt:111 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/diff-options.txt:23 en/fetch-options.txt:198 en/git-add.txt:111 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
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
@@ -3573,7 +3573,7 @@ msgid "\tThis is the default.\n"
msgstr ""
#. 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:117 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
+#: 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:118 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"
@@ -3992,7 +3992,7 @@ msgid "Synonym for --dirstat=files,param1,param2..."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:129
+#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--summary"
msgstr "--summary"
@@ -4016,7 +4016,7 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:122 en/git-update-index.txt:168
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:168
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4425,7 +4425,7 @@ msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:402 en/git-status.txt:139
+#: en/diff-options.txt:402 en/git-status.txt:143
#, ignore-same, no-wrap, priority:280
msgid "--no-renames"
msgstr "--no-renames"
@@ -4529,7 +4529,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:463
#, priority:280
-msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
+msgid "It affects the way a change that amounts to a total rewrite of a file does not appear as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
msgstr ""
#. type: Plain text
@@ -4545,7 +4545,7 @@ msgid "-M[<n>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:473 en/git-status.txt:143
+#: en/diff-options.txt:473 en/git-status.txt:147
#, no-wrap, priority:280
msgid "--find-renames[=<n>]"
msgstr ""
@@ -4968,7 +4968,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:203 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:52 en/git-clone.txt:120 en/git-commit.txt:314 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:301 en/git-gc.txt:68 en/git-grep.txt:296 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:315 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:255 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:136 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:215 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:316 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:302 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:256 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5022,7 +5022,7 @@ msgid "Allow (or disallow) external text conversion filters to be run when compa
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:85
+#: en/diff-options.txt:722 en/git-status.txt:87
#, no-wrap, priority:280
msgid "--ignore-submodules[=<when>]"
msgstr ""
@@ -5100,7 +5100,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:265 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:266 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5232,7 +5232,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:48 en/git-commit.txt:317 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:50 en/git-commit.txt:319 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5244,13 +5244,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:34 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:195 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:347 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:278 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:279 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:35 en/git-fast-import.txt:37 en/git-filter-branch.txt:196 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:279 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:280 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5282,7 +5282,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:112 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:113 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5360,7 +5360,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:47 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:97 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:326 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:301 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:85
+#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:98 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:302 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5426,187 +5426,211 @@ msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:167
+#: en/fetch-options.txt:164
+#, priority:220
+msgid "Number of parallel children to be used for all forms of fetching."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:169
+#, priority:220
+msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:172
#, priority:220
-msgid "Number of parallel children to be used for fetching submodules. Each will fetch from different submodules, such that fetching many submodules will be faster. By default submodules will be fetched one at a time."
+msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:168 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:173 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:171
+#: en/fetch-options.txt:176
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:172
+#: en/fetch-options.txt:177 en/git-branch.txt:225 en/git-push.txt:349
+#, ignore-same, no-wrap, priority:240
+msgid "--set-upstream"
+msgstr "--set-upstream"
+
+#. type: Plain text
+#: en/fetch-options.txt:183
+#, priority:220
+msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:184
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:188
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177
+#: en/fetch-options.txt:189
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:184
+#: en/fetch-options.txt:196
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:199
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:194
+#: en/fetch-options.txt:206
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:195 en/git-clone.txt:182
+#: en/fetch-options.txt:207 en/git-clone.txt:182
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:212
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:202 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:51 en/git-clone.txt:119 en/git-commit.txt:313 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:300 en/git-grep.txt:295 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:314 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:254 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:135
+#: en/fetch-options.txt:214 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:315 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:301 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:255 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:207
+#: en/fetch-options.txt:219
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:208 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:298 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:318 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:139
+#: en/fetch-options.txt:220 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:300 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:209 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:299 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:319 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:140
+#: en/fetch-options.txt:221 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:301 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:211 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:142
+#: en/fetch-options.txt:223 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:213 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:326 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:258 en/git-switch.txt:144 en/merge-options.txt:143
+#: en/fetch-options.txt:225 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:328 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:259 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:218 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:230 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:219 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:231 en/git-ls-remote.txt:73 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:220 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:232 en/git-clone.txt:135 en/git-ls-remote.txt:74
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-clone.txt:142
+#: en/fetch-options.txt:239 en/git-clone.txt:142
#, priority:300
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:240
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:233
+#: en/fetch-options.txt:245
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:234
+#: en/fetch-options.txt:246
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:240
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:241 en/git-push.txt:398
+#: en/fetch-options.txt:253 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:242 en/git-push.txt:399
+#: en/fetch-options.txt:254 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:244 en/git-push.txt:401
+#: en/fetch-options.txt:256 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:245 en/git-push.txt:402
+#: en/fetch-options.txt:257 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:246 en/git-push.txt:403
+#: en/fetch-options.txt:258 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:247 en/git-push.txt:405
+#: en/fetch-options.txt:259 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5646,7 +5670,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:20 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:67 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
+#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr ""
@@ -5688,13 +5712,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr ""
#. type: Title -
-#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:83 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:85 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:115 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:253 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:86 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:254 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:52 en/git-grep.txt:308 en/git-status.txt:148
+#: en/git-add.txt:52 en/git-grep.txt:325 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
@@ -5706,7 +5730,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:67 en/git-grep.txt:314
+#: en/git-add.txt:67 en/git-grep.txt:331
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -5724,13 +5748,13 @@ msgid "Allow adding otherwise ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:42 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:394 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:43 en/git-rebase.txt:395 en/git-rebase.txt:536 en/git-svn.txt:297
+#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5754,7 +5778,7 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:275 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
@@ -5844,7 +5868,7 @@ msgid "This option is primarily to help users who are used to older versions of
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:146 en/git-format-patch.txt:101 en/git-submodule.txt:340
+#: en/git-add.txt:146 en/git-format-patch.txt:102 en/git-submodule.txt:341
#, no-wrap, priority:300
msgid "-N"
msgstr ""
@@ -5934,7 +5958,7 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:343 en/git-grep.txt:304 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
+#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:345 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr ""
@@ -5946,7 +5970,7 @@ msgid "This option can be used to separate command-line options from the list of
msgstr ""
#. type: Title -
-#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:357 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:153 en/git-fetch.txt:242 en/git-filter-branch.txt:234 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:634 en/git-grep.txt:316 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:206 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:359 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:638 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr ""
@@ -5988,7 +6012,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:221 en/git-rebase.txt:591
+#: en/git-add.txt:221 en/git-rebase.txt:613
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr ""
@@ -6000,7 +6024,7 @@ msgid "When the command enters the interactive mode, it shows the output of the
msgstr ""
#. type: Plain text
-#: en/git-add.txt:230 en/git-clean.txt:83
+#: en/git-add.txt:230 en/git-clean.txt:85
#, priority:300
msgid "The command loop shows the list of subcommands available, and gives a prompt \"What now> \". In general, when the prompt ends with a single '>', you can pick only one of the choices given and type return, like this:"
msgstr ""
@@ -6300,7 +6324,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:135 en/git-commit-tree.txt:118 en/git-commit.txt:487 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:241 en/git-fast-import.txt:1503 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:679 en/git-gc.txt:154 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:112 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:247 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:519 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:292 en/git-status.txt:434 en/git-submodule.txt:436 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
+#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:489 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1526 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:683 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:437 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
@@ -6312,13 +6336,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:139 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:495 en/git-config.txt:492 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:245 en/git-fast-import.txt:1507 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:480 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:683 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:334 en/git-gui.txt:126 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:116 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:230 en/git-merge-file.txt:94 en/git-merge-index.txt:78 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1052 en/git-receive-pack.txt:251 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:123 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:523 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:300 en/git-status.txt:438 en/git-stripspace.txt:93 en/git-submodule.txt:440 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
+#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:497 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1530 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:693 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:687 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:441 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
#, no-wrap, priority:300
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:140 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:496 en/git-config.txt:493 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:246 en/git-fast-import.txt:1508 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:481 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:684 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:335 en/git-gui.txt:127 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:117 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:231 en/git-merge-file.txt:95 en/git-merge-index.txt:79 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1053 en/git-receive-pack.txt:252 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:124 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:524 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:301 en/git-status.txt:439 en/git-stripspace.txt:94 en/git-submodule.txt:441 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
+#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:498 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1531 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:694 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:688 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:442 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6368,7 +6392,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:118 en/git-rebase.txt:387 en/git-revert.txt:98 en/merge-options.txt:73
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:119 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6410,7 +6434,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:969
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:985
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6440,7 +6464,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:267 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:989
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1005
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6532,37 +6556,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:303 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:304 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:307 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:373 en/git-rebase.txt:524
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:374
+#: en/git-am.txt:109 en/git-rebase.txt:396
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:337
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6622,7 +6646,7 @@ msgid "Run interactively."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:380 en/git-rebase.txt:521
+#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6634,7 +6658,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:381 en/git-rebase.txt:522
+#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6646,7 +6670,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:256 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6658,31 +6682,31 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:333 en/git-rebase.txt:308 en/git-revert.txt:91 en/merge-options.txt:58
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:335 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:334 en/git-rebase.txt:309 en/git-revert.txt:92 en/merge-options.txt:59
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:336 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:338 en/git-rebase.txt:313 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:340 en/git-rebase.txt:331 en/git-revert.txt:96
#, priority:280
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:228 en/sequencer.txt:1
+#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:246 en/sequencer.txt:1
#, ignore-same, no-wrap, priority:240
msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:406 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:997
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1013
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6712,7 +6736,7 @@ msgid "When a patch failure occurs, <msg> will be printed to the screen before e
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:231 en/sequencer.txt:15
+#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:249 en/sequencer.txt:15
#, ignore-same, no-wrap, priority:240
msgid "--abort"
msgstr "--abort"
@@ -6724,7 +6748,7 @@ msgid "Restore the original branch and abort the patching operation."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:238 en/sequencer.txt:10
+#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:256 en/sequencer.txt:10
#, ignore-same, no-wrap, priority:240
msgid "--quit"
msgstr "--quit"
@@ -6736,7 +6760,7 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:262
+#: en/git-am.txt:179 en/git-rebase.txt:280
#, ignore-same, no-wrap, priority:100
msgid "--show-current-patch"
msgstr "--show-current-patch"
@@ -6748,7 +6772,7 @@ msgid "Show the patch being applied when \"git am\" is stopped because of confli
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:451 en/git-format-patch.txt:351 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:188 en/git-tag.txt:231
+#: en/git-am.txt:184 en/git-commit.txt:453 en/git-format-patch.txt:355 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
@@ -6832,7 +6856,7 @@ msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the curren
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:471 en/git-gc.txt:147
+#: en/git-am.txt:234 en/git-commit.txt:473 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
@@ -6930,7 +6954,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:322 en/merge-options.txt:84
+#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -6972,7 +6996,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:291
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:292
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7044,7 +7068,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:342
+#: en/git-apply.txt:134 en/git-rebase.txt:360
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7260,7 +7284,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:330 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:398 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:332 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -9182,7 +9206,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:525
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9218,13 +9242,13 @@ msgid "Sorting and filtering branches are case insensitive."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:153 en/git-status.txt:126 en/git-tag.txt:134
+#: en/git-branch.txt:153 en/git-status.txt:130 en/git-tag.txt:134
#, no-wrap, priority:280
msgid "--column[=<options>]"
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:154 en/git-status.txt:127 en/git-tag.txt:135
+#: en/git-branch.txt:154 en/git-status.txt:131 en/git-tag.txt:135
#, ignore-same, no-wrap, priority:280
msgid "--no-column"
msgstr "--no-column"
@@ -9349,12 +9373,6 @@ msgstr "--no-track"
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
-#. type: Labeled list
-#: en/git-branch.txt:225 en/git-push.txt:349
-#, ignore-same, no-wrap, priority:240
-msgid "--set-upstream"
-msgstr "--set-upstream"
-
#. type: Plain text
#: en/git-branch.txt:228
#, priority:240
@@ -9624,7 +9642,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-filter-branch.txt:449 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10244,7 +10262,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:152 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10893,7 +10911,7 @@ msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will al
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:226
+#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
@@ -11090,7 +11108,7 @@ msgid "Only meaningful with `--stdin`; paths are separated with NUL character in
msgstr ""
#. type: Plain text
-#: en/git-checkout-index.txt:73 en/git-commit.txt:345 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
+#: en/git-checkout-index.txt:73 en/git-commit.txt:347 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
#, priority:280
msgid "Do not interpret any more arguments as options."
msgstr ""
@@ -11411,7 +11429,7 @@ msgid "Quiet, suppress feedback messages."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:144
+#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:152
#, ignore-same, no-wrap, priority:240
msgid "--no-progress"
msgstr "--no-progress"
@@ -11597,7 +11615,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:241 en/git-rebase.txt:268 en/git-rebase.txt:529 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:354 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
+#: en/git-checkout.txt:241 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:355 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11717,7 +11735,7 @@ msgid "In the default overlay mode, `git checkout` never removes files from the
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:312 en/git-rebase.txt:225 en/git-switch.txt:36
+#: en/git-checkout.txt:312 en/git-rebase.txt:243 en/git-switch.txt:36
#, no-wrap, priority:240
msgid "<branch>"
msgstr ""
@@ -12423,7 +12441,7 @@ msgid "This option determines how the commit message will be cleaned up before b
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:65 en/git-clean.txt:61
+#: en/git-cherry-pick.txt:65 en/git-clean.txt:63
#, ignore-same, no-wrap, priority:100
msgid "-x"
msgstr "-x"
@@ -12507,7 +12525,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:249 en/git-rebase.txt:532
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:267 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12531,7 +12549,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:282 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:109
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12549,7 +12567,7 @@ msgid "-X<option>"
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:125
#, no-wrap, priority:240
msgid "--strategy-option=<option>"
msgstr ""
@@ -12745,7 +12763,7 @@ msgid "Show the commit subjects next to the SHA1s."
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:32 en/git-rebase.txt:220
+#: en/git-cherry.txt:32 en/git-rebase.txt:238
#, no-wrap, priority:100
msgid "<upstream>"
msgstr ""
@@ -12763,7 +12781,7 @@ msgid "<head>"
msgstr ""
#. type: Plain text
-#: en/git-cherry.txt:38 en/git-rebase.txt:227
+#: en/git-cherry.txt:38 en/git-rebase.txt:245
#, priority:100
msgid "Working branch; defaults to HEAD."
msgstr ""
@@ -12976,85 +12994,85 @@ msgid "If any optional `<path>...` arguments are given, only those paths are aff
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:33
+#: en/git-clean.txt:35
#, priority:100
-msgid "Remove untracked directories in addition to untracked files. If an untracked directory is managed by a different Git repository, it is not removed by default. Use -f option twice if you really want to remove such a directory."
+msgid "Normally, when no <path> is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. If any paths are specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under `--force`) will be removed."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:41
+#: en/git-clean.txt:43
#, priority:100
-msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f, -n or -i. Git will refuse to delete directories with .git sub directory or file unless a second -f is given."
+msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f or -i. Git will refuse to modify untracked nested git repositories (directories with a .git subdirectory) unless a second -f is given."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:46
+#: en/git-clean.txt:48
#, priority:100
msgid "Show what would be done and clean files interactively. See ``Interactive mode'' for details."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:50
+#: en/git-clean.txt:52
#, priority:100
msgid "Don't actually remove anything, just show what would be done."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:55
+#: en/git-clean.txt:57
#, priority:100
msgid "Be quiet, only report errors, but not the files that are successfully removed."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:56
+#: en/git-clean.txt:58
#, no-wrap, priority:100
msgid "-e <pattern>"
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:57 en/git-ls-files.txt:85 en/git-name-rev.txt:33
+#: en/git-clean.txt:59 en/git-ls-files.txt:85 en/git-name-rev.txt:33
#, no-wrap, priority:100
msgid "--exclude=<pattern>"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:60
+#: en/git-clean.txt:62
#, priority:100
msgid "Use the given exclude pattern in addition to the standard ignore rules (see linkgit:gitignore[5])."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:68
+#: en/git-clean.txt:70
#, priority:100
msgid "Don't use the standard ignore rules (see linkgit:gitignore[5]), but still use the ignore rules given with `-e` options from the command line. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git restore' or 'git reset') to create a pristine working directory to test a clean build."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:69
+#: en/git-clean.txt:71
#, no-wrap, priority:100
msgid "-X"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:72
+#: en/git-clean.txt:74
#, priority:100
msgid "Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files."
msgstr ""
#. type: Title -
-#: en/git-clean.txt:74
+#: en/git-clean.txt:76
#, no-wrap, priority:100
msgid "Interactive mode"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:78
+#: en/git-clean.txt:80
#, priority:100
msgid "When the command enters the interactive mode, it shows the files and directories to be cleaned, and goes into its interactive command loop."
msgstr ""
#. type: delimited block -
-#: en/git-clean.txt:89
+#: en/git-clean.txt:91
#, no-wrap, priority:100
msgid ""
" *** Commands ***\n"
@@ -13064,91 +13082,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:92
+#: en/git-clean.txt:94
#, priority:100
msgid "You also could say `c` or `clean` above as long as the choice is unique."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:94
+#: en/git-clean.txt:96
#, priority:100
msgid "The main command loop has 6 subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:95
+#: en/git-clean.txt:97
#, no-wrap, priority:100
msgid "clean"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:98
+#: en/git-clean.txt:100
#, priority:100
msgid "Start cleaning files and directories, and then quit."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:99
+#: en/git-clean.txt:101
#, no-wrap, priority:100
msgid "filter by pattern"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:107
+#: en/git-clean.txt:109
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Input ignore patterns>>\" prompt. You can input space-separated patterns to exclude files and directories from deletion. E.g. \"*.c *.h\" will excludes files end with \".c\" and \".h\" from deletion. When you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:108
+#: en/git-clean.txt:110
#, no-wrap, priority:100
msgid "select by numbers"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:119
+#: en/git-clean.txt:121
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Select items to delete>>\" prompt. When the prompt ends with double '>>' like this, you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything. Also when you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:120
+#: en/git-clean.txt:122
#, no-wrap, priority:100
msgid "ask each"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:125
+#: en/git-clean.txt:127
#, priority:100
msgid "This will start to clean, and you must confirm one by one in order to delete items. Please note that this action is not as efficient as the above two actions."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:126
+#: en/git-clean.txt:128
#, no-wrap, priority:100
msgid "quit"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:129
+#: en/git-clean.txt:131
#, priority:100
msgid "This lets you quit without do cleaning."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:130
+#: en/git-clean.txt:132
#, no-wrap, priority:100
msgid "help"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:133
+#: en/git-clean.txt:135
#, priority:100
msgid "Show brief usage of interactive git-clean."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:137 en/git-status.txt:436
+#: en/git-clean.txt:139 en/git-status.txt:440
#, ignore-same, priority:280
msgid "linkgit:gitignore[5]"
msgstr "linkgit:gitignore[5]"
@@ -13287,7 +13305,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:108 en/git-submodule.txt:392
+#: en/git-clone.txt:108 en/git-submodule.txt:393
#, ignore-same, no-wrap, priority:300
msgid "--dissociate"
msgstr "--dissociate"
@@ -13517,7 +13535,7 @@ msgstr "--[no-]remote-submodules"
#. type: Plain text
#: en/git-clone.txt:269
#, priority:300
-msgid "All submodules which are cloned will use the status of the submodule�셲 remote-tracking branch to update the submodule, rather than the superproject�셲 recorded SHA-1. Equivalent to passing `--remote` to `git submodule update`."
+msgid "All submodules which are cloned will use the status of the submodules remote-tracking branch to update the submodule, rather than the superprojects recorded SHA-1. Equivalent to passing `--remote` to `git submodule update`."
msgstr ""
#. type: Labeled list
@@ -13533,13 +13551,13 @@ msgid "Instead of placing the cloned repository where it is supposed to be, plac
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:277 en/git-submodule.txt:416
+#: en/git-clone.txt:277 en/git-submodule.txt:417
#, no-wrap, priority:300
msgid "-j <n>"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:278 en/git-submodule.txt:417
+#: en/git-clone.txt:278 en/git-submodule.txt:418
#, no-wrap, priority:300
msgid "--jobs <n>"
msgstr ""
@@ -13897,7 +13915,7 @@ msgid "Read the commit log message from the given file. Use `-` to read from the
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:68 en/git-commit.txt:339
+#: en/git-commit-tree.txt:68 en/git-commit.txt:341
#, ignore-same, no-wrap, priority:280
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
@@ -13981,7 +13999,7 @@ msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:477 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:428 en/git-svn.txt:1156
+#: en/git-commit-tree.txt:114 en/git-commit.txt:479 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:429 en/git-svn.txt:1156
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
@@ -14287,13 +14305,13 @@ msgid "When editing the commit message, start the editor with the contents in th
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:173 en/merge-options.txt:81
+#: en/git-commit.txt:173 en/merge-options.txt:85
#, priority:280
msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:175 en/git-rebase.txt:330
+#: en/git-commit.txt:175 en/git-rebase.txt:348 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14500,115 +14518,115 @@ msgid "Show untracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:288
+#: en/git-commit.txt:289
#, priority:280
msgid "The mode parameter is optional (defaults to 'all'), and is used to specify the handling of untracked files; when -u is not used, the default is 'normal', i.e. show untracked files and directories."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:290 en/git-status.txt:67 en/git-status.txt:107
+#: en/git-commit.txt:291 en/git-status.txt:68 en/git-status.txt:110
#, priority:280
msgid "The possible options are:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:292
+#: en/git-commit.txt:293
#, no-wrap, priority:280
msgid "'no' - Show no untracked files\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:293
+#: en/git-commit.txt:294
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:294 en/git-status.txt:71
+#: en/git-commit.txt:295 en/git-status.txt:72
#, no-wrap, priority:280
msgid "'all' - Also shows individual files in untracked directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:297 en/git-status.txt:84
+#: en/git-commit.txt:298 en/git-status.txt:85
#, priority:280
msgid "The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:308
+#: en/git-commit.txt:310
#, priority:280
msgid "Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template to help the user describe the commit by reminding what changes the commit has. Note that this diff output doesn't have its lines prefixed with '#'. This diff will not be a part of the commit message. See the `commit.verbose` configuration variable in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:312
+#: en/git-commit.txt:314
#, priority:280
msgid "If specified twice, show in addition the unified diff between what would be committed and the worktree files, i.e. the unstaged changes to tracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:316
+#: en/git-commit.txt:318
#, priority:280
msgid "Suppress commit summary message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:321
+#: en/git-commit.txt:323
#, priority:280
msgid "Do not create a commit, but show a list of paths that are to be committed, paths with local changes that will be left uncommitted and paths that are untracked."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:322
+#: en/git-commit.txt:324
#, ignore-same, no-wrap, priority:280
msgid "--status"
msgstr "--status"
#. type: Plain text
-#: en/git-commit.txt:327
+#: en/git-commit.txt:329
#, priority:280
msgid "Include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the commit message. Defaults to on, but can be used to override configuration variable commit.status."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:328
+#: en/git-commit.txt:330
#, ignore-same, no-wrap, priority:280
msgid "--no-status"
msgstr "--no-status"
#. type: Plain text
-#: en/git-commit.txt:332
+#: en/git-commit.txt:334
#, priority:280
msgid "Do not include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the default commit message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:342
+#: en/git-commit.txt:344
#, priority:280
msgid "Countermand `commit.gpgSign` configuration variable that is set to force each and every commit to be signed."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:346 en/git-rm.txt:29
+#: en/git-commit.txt:348 en/git-rm.txt:29
#, ignore-ellipsis, no-wrap, priority:280
msgid "<file>..."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:352
+#: en/git-commit.txt:354
#, priority:280
msgid "When files are given on the command line, the command commits the contents of the named files, without recording the changes already staged. The contents of these files are also staged for the next commit on top of what have been staged before."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:369
+#: en/git-commit.txt:371
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:375
+#: en/git-commit.txt:377
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14618,13 +14636,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:383
+#: en/git-commit.txt:385
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:388
+#: en/git-commit.txt:390
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14633,19 +14651,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:393
+#: en/git-commit.txt:395
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:398
+#: en/git-commit.txt:400
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:404
+#: en/git-commit.txt:406
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14655,31 +14673,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:411
+#: en/git-commit.txt:413
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:414 en/git-commit.txt:440
+#: en/git-commit.txt:416 en/git-commit.txt:442
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:418
+#: en/git-commit.txt:420
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:426
+#: en/git-commit.txt:428
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:432
+#: en/git-commit.txt:434
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14689,55 +14707,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:437
+#: en/git-commit.txt:439
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:448
+#: en/git-commit.txt:450
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:460
+#: en/git-commit.txt:462
#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:464
+#: en/git-commit.txt:466
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:469
+#: en/git-commit.txt:471
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:475
+#: en/git-commit.txt:477
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:479
+#: en/git-commit.txt:481
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:485
+#: en/git-commit.txt:487
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:493
+#: en/git-commit.txt:495
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -15405,211 +15423,211 @@ msgstr ""
msgid "Given a .git/config like this:"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:347
+#. type: delimited block -
+#: en/git-config.txt:348
#, no-wrap, priority:100
msgid ""
-"\t#\n"
-"\t# This is the config file, and\n"
-"\t# a '#' or ';' character indicates\n"
-"\t# a comment\n"
-"\t#\n"
+"#\n"
+"# This is the config file, and\n"
+"# a '#' or ';' character indicates\n"
+"# a comment\n"
+"#\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:352
+#. type: delimited block -
+#: en/git-config.txt:353 en/git.txt:310
#, no-wrap, priority:100
msgid ""
-"\t; core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"; core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:357
+#. type: delimited block -
+#: en/git-config.txt:358
#, no-wrap, priority:100
msgid ""
-"\t; Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"; Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:362
+#. type: delimited block -
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
-"\t; Proxy settings\n"
-"\t[core]\n"
-"\t\tgitproxy=proxy-command for kernel.org\n"
-"\t\tgitproxy=default-proxy ; for all the rest\n"
+"; Proxy settings\n"
+"[core]\n"
+"\tgitproxy=proxy-command for kernel.org\n"
+"\tgitproxy=default-proxy ; for all the rest\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:369
+#. type: delimited block -
+#: en/git-config.txt:370
#, no-wrap, priority:100
msgid ""
-"\t; HTTP\n"
-"\t[http]\n"
-"\t\tsslVerify\n"
-"\t[http \"https://weak.example.com\"]\n"
-"\t\tsslVerify = false\n"
-"\t\tcookieFile = /tmp/cookie.txt\n"
+"; HTTP\n"
+"[http]\n"
+"\tsslVerify\n"
+"[http \"https://weak.example.com\"]\n"
+"\tsslVerify = false\n"
+"\tcookieFile = /tmp/cookie.txt\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:371
+#: en/git-config.txt:373
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:374
+#: en/git-config.txt:376
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:379
+#: en/git-config.txt:381
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:382
+#: en/git-config.txt:384
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:385
+#: en/git-config.txt:387
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:389
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:390
+#: en/git-config.txt:392
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:394
+#: en/git-config.txt:396
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:398
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:399
+#: en/git-config.txt:401
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:402 en/git-gui.txt:120 en/git-merge-index.txt:64
+#: en/git-config.txt:404 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:407
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:410
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:413
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:414
+#: en/git-config.txt:416
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:417
+#: en/git-config.txt:419
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:421
+#: en/git-config.txt:423
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:424
+#: en/git-config.txt:426
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:428
+#: en/git-config.txt:430
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:431
+#: en/git-config.txt:433
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:434
+#: en/git-config.txt:436
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:437
+#: en/git-config.txt:439
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:440
+#: en/git-config.txt:442
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:443
+#: en/git-config.txt:445
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:447
+#: en/git-config.txt:449
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:453
+#: en/git-config.txt:455
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15619,13 +15637,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:457
+#: en/git-config.txt:459
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:466
+#: en/git-config.txt:468
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15638,19 +15656,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:471 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1029 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
+#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:476
+#: en/git-config.txt:478
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:482
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15658,13 +15676,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:483
+#: en/git-config.txt:485
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:488
+#: en/git-config.txt:490
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -17027,7 +17045,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
msgstr ""
#. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:234
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
#, no-wrap, priority:100
msgid "LIMITATIONS"
msgstr ""
@@ -18532,7 +18550,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:976
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:992
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19084,7 +19102,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:422
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:423
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -19180,13 +19198,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:982
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:998
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:988
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1004
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -19541,9 +19559,9 @@ msgid "This program dumps the given revisions in a form suitable to be piped int
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:22
+#: en/git-fast-export.txt:23
#, priority:100
-msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a kind of an interactive 'git filter-branch'."
+msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
@@ -19630,146 +19648,158 @@ msgstr ""
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
+#. type: Labeled list
+#: en/git-fast-export.txt:79
+#, ignore-same, no-wrap, priority:100
+msgid "--mark-tags"
+msgstr "--mark-tags"
+
+#. type: Plain text
+#: en/git-fast-export.txt:87
+#, priority:100
+msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
+msgstr ""
+
#. type: Plain text
-#: en/git-fast-export.txt:83
+#: en/git-fast-export.txt:92
#, priority:100
-msgid "Any commits that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
+msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:84
+#: en/git-fast-export.txt:93
#, ignore-same, no-wrap, priority:100
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
-#: en/git-fast-export.txt:89
+#: en/git-fast-export.txt:98
#, priority:100
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:90
+#: en/git-fast-export.txt:99
#, ignore-same, no-wrap, priority:100
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
-#: en/git-fast-export.txt:93
+#: en/git-fast-export.txt:102
#, priority:100
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:94
+#: en/git-fast-export.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
-#: en/git-fast-export.txt:101
+#: en/git-fast-export.txt:110
#, priority:100
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
+#: en/git-fast-export.txt:111 en/git-ls-tree.txt:72
#, ignore-same, no-wrap, priority:100
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
-#: en/git-fast-export.txt:107
+#: en/git-fast-export.txt:116
#, priority:100
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:108
+#: en/git-fast-export.txt:117
#, ignore-same, no-wrap, priority:100
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
-#: en/git-fast-export.txt:112
+#: en/git-fast-export.txt:121
#, priority:100
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:113
+#: en/git-fast-export.txt:122
#, ignore-same, no-wrap, priority:100
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
-#: en/git-fast-export.txt:124
+#: en/git-fast-export.txt:133
#, priority:100
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:125
+#: en/git-fast-export.txt:134
#, ignore-same, no-wrap, priority:100
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
-#: en/git-fast-export.txt:131
+#: en/git-fast-export.txt:140
#, priority:100
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:132
+#: en/git-fast-export.txt:141
#, no-wrap, priority:100
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:138
+#: en/git-fast-export.txt:147
#, priority:100
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be reencoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:139
+#: en/git-fast-export.txt:148
#, ignore-same, no-wrap, priority:100
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
-#: en/git-fast-export.txt:142
+#: en/git-fast-export.txt:151
#, priority:100
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:143
+#: en/git-fast-export.txt:152
#, ignore-ellipsis, no-wrap, priority:100
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:160
#, priority:100
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:157
+#: en/git-fast-export.txt:166
#, no-wrap, priority:100
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:162
+#: en/git-fast-export.txt:171
#, priority:100
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:167
+#: en/git-fast-export.txt:176
#, no-wrap, priority:100
msgid ""
"$ git fast-export master~5..master |\n"
@@ -19778,55 +19808,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:180
#, priority:100
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:175
+#: en/git-fast-export.txt:184
#, priority:100
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
-#: en/git-fast-export.txt:178
+#: en/git-fast-export.txt:187
#, no-wrap, priority:100
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:186
+#: en/git-fast-export.txt:195
#, priority:100
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:198
+#: en/git-fast-export.txt:207
#, priority:100
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:201
+#: en/git-fast-export.txt:210
#, priority:100
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:204
+#: en/git-fast-export.txt:213
#, no-wrap, priority:100
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:209
+#: en/git-fast-export.txt:218
#, priority:100
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:215
+#: en/git-fast-export.txt:224
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git init anon-repo\n"
@@ -19836,25 +19866,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:222
+#: en/git-fast-export.txt:231
#, priority:100
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:225
+#: en/git-fast-export.txt:234
#, no-wrap, priority:100
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:240
#, priority:100
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:239
+#: en/git-fast-export.txt:248
#, priority:100
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
@@ -20088,7 +20118,7 @@ msgid "See linkgit:git-config[1]"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:144 en/git-p4.txt:507
+#: en/git-fast-import.txt:144 en/git-filter-branch.txt:463 en/git-p4.txt:507
#, no-wrap, priority:100
msgid "PERFORMANCE"
msgstr ""
@@ -20322,7 +20352,7 @@ msgid "fast-import accepts several commands to update the current repository and
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:319 en/git-fast-import.txt:381
+#: en/git-fast-import.txt:319 en/git-fast-import.txt:388
#, ignore-same, no-wrap, priority:100
msgid "`commit`"
msgstr "`commit`"
@@ -20334,7 +20364,7 @@ msgid "Creates a new branch or updates an existing branch by creating a new comm
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:324 en/git-fast-import.txt:771
+#: en/git-fast-import.txt:324 en/git-fast-import.txt:778
#, ignore-same, no-wrap, priority:100
msgid "`tag`"
msgstr "`tag`"
@@ -20346,7 +20376,7 @@ msgid "Creates an annotated tag object from an existing commit or branch. Light
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:330 en/git-fast-import.txt:815
+#: en/git-fast-import.txt:330 en/git-fast-import.txt:823
#, ignore-same, no-wrap, priority:100
msgid "`reset`"
msgstr "`reset`"
@@ -20358,7 +20388,7 @@ msgid "Reset an existing branch (or a new branch) to a specific revision. This
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:335 en/git-fast-import.txt:844
+#: en/git-fast-import.txt:335 en/git-fast-import.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`blob`"
msgstr "`blob`"
@@ -20370,109 +20400,121 @@ msgid "Convert raw file data into a blob, for future use in a `commit` command.
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:340 en/git-fast-import.txt:917
+#: en/git-fast-import.txt:340 en/git-fast-import.txt:925
+#, ignore-same, no-wrap, priority:100
+msgid "`alias`"
+msgstr "`alias`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:346
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
+msgstr ""
+
+#. type: Title ~
+#: en/git-fast-import.txt:347 en/git-fast-import.txt:940
#, ignore-same, no-wrap, priority:100
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
-#: en/git-fast-import.txt:345
+#: en/git-fast-import.txt:352
#, priority:100
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:346 en/git-fast-import.txt:945
+#: en/git-fast-import.txt:353 en/git-fast-import.txt:968
#, ignore-same, no-wrap, priority:100
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
-#: en/git-fast-import.txt:350
+#: en/git-fast-import.txt:357
#, priority:100
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:351 en/git-fast-import.txt:1152
+#: en/git-fast-import.txt:358 en/git-fast-import.txt:1175
#, ignore-same, no-wrap, priority:100
msgid "`done`"
msgstr "`done`"
#. type: Plain text
-#: en/git-fast-import.txt:355
+#: en/git-fast-import.txt:362
#, priority:100
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:356 en/git-fast-import.txt:970
+#: en/git-fast-import.txt:363 en/git-fast-import.txt:993
#, ignore-same, no-wrap, priority:100
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
-#: en/git-fast-import.txt:360
+#: en/git-fast-import.txt:367
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:361 en/git-fast-import.txt:985
+#: en/git-fast-import.txt:368 en/git-fast-import.txt:1008
#, ignore-same, no-wrap, priority:100
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
-#: en/git-fast-import.txt:365
+#: en/git-fast-import.txt:372
#, priority:100
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:366 en/git-fast-import.txt:1016
+#: en/git-fast-import.txt:373 en/git-fast-import.txt:1039
#, ignore-same, no-wrap, priority:100
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
-#: en/git-fast-import.txt:370
+#: en/git-fast-import.txt:377
#, priority:100
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:371 en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:378 en/git-fast-import.txt:1092
#, ignore-same, no-wrap, priority:100
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
#, priority:100
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:1124
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:1147
#, ignore-same, no-wrap, priority:100
msgid "`option`"
msgstr "`option`"
#. type: Plain text
-#: en/git-fast-import.txt:379
+#: en/git-fast-import.txt:386
#, priority:100
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:384
+#: en/git-fast-import.txt:391
#, priority:100
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
#, no-wrap, priority:100
msgid ""
"\t'commit' SP <ref> LF\n"
@@ -20483,247 +20525,247 @@ msgid ""
"\t('encoding' SP <encoding>)?\n"
"\tdata\n"
"\t('from' SP <commit-ish> LF)?\n"
-"\t('merge' SP <commit-ish> LF)?\n"
+"\t('merge' SP <commit-ish> LF)*\n"
"\t(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*\n"
"\tLF?\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:405
+#: en/git-fast-import.txt:412
#, priority:100
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:411
+#: en/git-fast-import.txt:418
#, priority:100
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:417
+#: en/git-fast-import.txt:424
#, priority:100
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:425
+#: en/git-fast-import.txt:432
#, priority:100
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:432
+#: en/git-fast-import.txt:439
#, priority:100
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:434
+#: en/git-fast-import.txt:441
#, ignore-same, no-wrap, priority:100
msgid "`author`"
msgstr "`author`"
#. type: Plain text
-#: en/git-fast-import.txt:440
+#: en/git-fast-import.txt:447
#, priority:100
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:442
+#: en/git-fast-import.txt:449
#, ignore-same, no-wrap, priority:100
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
-#: en/git-fast-import.txt:445
+#: en/git-fast-import.txt:452
#, priority:100
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
#, priority:100
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:458
+#: en/git-fast-import.txt:465
#, priority:100
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:460
+#: en/git-fast-import.txt:467
#, ignore-same, no-wrap, priority:100
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
-#: en/git-fast-import.txt:464
+#: en/git-fast-import.txt:471
#, priority:100
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:466
+#: en/git-fast-import.txt:473
#, ignore-same, no-wrap, priority:100
msgid "`from`"
msgstr "`from`"
#. type: Plain text
-#: en/git-fast-import.txt:472
+#: en/git-fast-import.txt:479
#, priority:100
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
#, priority:100
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:485
+#: en/git-fast-import.txt:492
#, priority:100
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
#, priority:100
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:491
+#: en/git-fast-import.txt:498
#, priority:100
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:493
+#: en/git-fast-import.txt:500
#, priority:100
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:499
+#: en/git-fast-import.txt:506
#, priority:100
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:501
+#: en/git-fast-import.txt:508
#, priority:100
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:503
+#: en/git-fast-import.txt:510
#, priority:100
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
#, priority:100
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:509
+#: en/git-fast-import.txt:516
#, priority:100
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:512
+#: en/git-fast-import.txt:519
#, priority:100
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
#, no-wrap, priority:100
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:521
+#: en/git-fast-import.txt:528
#, priority:100
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:523
+#: en/git-fast-import.txt:530
#, ignore-same, no-wrap, priority:100
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
-#: en/git-fast-import.txt:531
+#: en/git-fast-import.txt:538
#, priority:100
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:534
+#: en/git-fast-import.txt:541
#, priority:100
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:536
+#: en/git-fast-import.txt:543
#, ignore-same, no-wrap, priority:100
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:540
+#: en/git-fast-import.txt:547
#, priority:100
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:541 en/git-fast-import.txt:708
+#: en/git-fast-import.txt:548 en/git-fast-import.txt:715
#, no-wrap, priority:100
msgid "External data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:544
+#: en/git-fast-import.txt:551
#, priority:100
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:547
+#: en/git-fast-import.txt:554
#, no-wrap, priority:100
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
#, priority:100
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:555 en/git-fast-import.txt:721
+#: en/git-fast-import.txt:562 en/git-fast-import.txt:728
#, no-wrap, priority:100
msgid "Inline data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:559
+#: en/git-fast-import.txt:566
#, priority:100
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
#, no-wrap, priority:100
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -20731,259 +20773,259 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:566 en/git-fast-import.txt:732
+#: en/git-fast-import.txt:573 en/git-fast-import.txt:739
#, priority:100
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:569
+#: en/git-fast-import.txt:576
#, priority:100
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
#, priority:100
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:574
+#: en/git-fast-import.txt:581
#, priority:100
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:575
+#: en/git-fast-import.txt:582
#, priority:100
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
#, priority:100
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:580
+#: en/git-fast-import.txt:587
#, priority:100
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:583
+#: en/git-fast-import.txt:590
#, priority:100
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:587
+#: en/git-fast-import.txt:594
#, priority:100
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:594
+#: en/git-fast-import.txt:601
#, priority:100
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
#, priority:100
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:598
+#: en/git-fast-import.txt:605
#, priority:100
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:599
+#: en/git-fast-import.txt:606
#, priority:100
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:600
+#: en/git-fast-import.txt:607
#, priority:100
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:602
+#: en/git-fast-import.txt:609
#, priority:100
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:604
+#: en/git-fast-import.txt:611
#, priority:100
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:606
+#: en/git-fast-import.txt:613
#, priority:100
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:608
+#: en/git-fast-import.txt:615
#, ignore-same, no-wrap, priority:100
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
-#: en/git-fast-import.txt:614
+#: en/git-fast-import.txt:621
#, priority:100
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
#, no-wrap, priority:100
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
#, priority:100
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:624
+#: en/git-fast-import.txt:631
#, ignore-same, no-wrap, priority:100
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
#, priority:100
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:632
+#: en/git-fast-import.txt:639
#, no-wrap, priority:100
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:638 en/git-fast-import.txt:658
+#: en/git-fast-import.txt:645 en/git-fast-import.txt:665
#, priority:100
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:643
+#: en/git-fast-import.txt:650
#, priority:100
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:645
+#: en/git-fast-import.txt:652
#, ignore-same, no-wrap, priority:100
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
-#: en/git-fast-import.txt:649
+#: en/git-fast-import.txt:656
#, priority:100
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:652
+#: en/git-fast-import.txt:659
#, no-wrap, priority:100
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:663
+#: en/git-fast-import.txt:670
#, priority:100
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:672
+#: en/git-fast-import.txt:679
#, priority:100
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
-#: en/git-fast-import.txt:679
+#: en/git-fast-import.txt:686
#, priority:100
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:682
+#: en/git-fast-import.txt:689
#, no-wrap, priority:100
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:688
+#: en/git-fast-import.txt:695
#, priority:100
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:696
+#: en/git-fast-import.txt:703
#, priority:100
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:698
+#: en/git-fast-import.txt:705
#, ignore-same, no-wrap, priority:100
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:707
+#: en/git-fast-import.txt:714
#, priority:100
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:712
+#: en/git-fast-import.txt:719
#, priority:100
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:715
+#: en/git-fast-import.txt:722
#, no-wrap, priority:100
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:720
+#: en/git-fast-import.txt:727
#, priority:100
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:725
+#: en/git-fast-import.txt:732
#, priority:100
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:729
+#: en/git-fast-import.txt:736
#, no-wrap, priority:100
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -20991,76 +21033,77 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:735
+#: en/git-fast-import.txt:742
#, priority:100
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:737
+#: en/git-fast-import.txt:744
#, ignore-same, no-wrap, priority:100
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
-#: en/git-fast-import.txt:743
+#: en/git-fast-import.txt:750
#, priority:100
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:746
+#: en/git-fast-import.txt:753
#, no-wrap, priority:100
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:752
+#: en/git-fast-import.txt:759
#, priority:100
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:756
+#: en/git-fast-import.txt:763
#, priority:100
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:758
+#: en/git-fast-import.txt:765
#, ignore-same, no-wrap, priority:100
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
-#: en/git-fast-import.txt:763
+#: en/git-fast-import.txt:770
#, priority:100
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:766
+#: en/git-fast-import.txt:773
#, no-wrap, priority:100
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:769
+#: en/git-fast-import.txt:776
#, priority:100
msgid "where `<object-identifer>` is any string not containing LF."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:774
+#: en/git-fast-import.txt:781
#, priority:100
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:781
+#: en/git-fast-import.txt:789
#, no-wrap, priority:100
msgid ""
"\t'tag' SP <name> LF\n"
+"\tmark?\n"
"\t'from' SP <commit-ish> LF\n"
"\toriginal-oid?\n"
"\t'tagger' (SP <name>)? SP LT <email> GT SP <when> LF\n"
@@ -21068,55 +21111,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:784
+#: en/git-fast-import.txt:792
#, priority:100
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:789
+#: en/git-fast-import.txt:797
#, priority:100
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:793
+#: en/git-fast-import.txt:801
#, priority:100
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:796
+#: en/git-fast-import.txt:804
#, priority:100
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:799
+#: en/git-fast-import.txt:807
#, priority:100
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:813
#, priority:100
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:813
+#: en/git-fast-import.txt:821
#, priority:100
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:820
+#: en/git-fast-import.txt:828
#, priority:100
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:825
+#: en/git-fast-import.txt:833
#, no-wrap, priority:100
msgid ""
"\t'reset' SP <ref> LF\n"
@@ -21125,25 +21168,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:829
+#: en/git-fast-import.txt:837
#, priority:100
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:831 en/git-fast-import.txt:943
+#: en/git-fast-import.txt:839 en/git-fast-import.txt:966
#, priority:100
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:834
+#: en/git-fast-import.txt:842
#, priority:100
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:838
+#: en/git-fast-import.txt:846
#, no-wrap, priority:100
msgid ""
"\treset refs/tags/938\n"
@@ -21151,19 +21194,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:850
#, priority:100
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:849
+#: en/git-fast-import.txt:857
#, priority:100
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:855
+#: en/git-fast-import.txt:863
#, no-wrap, priority:100
msgid ""
"\t'blob' LF\n"
@@ -21173,43 +21216,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:861
+#: en/git-fast-import.txt:869
#, priority:100
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:871
#, ignore-same, no-wrap, priority:100
msgid "`data`"
msgstr "`data`"
#. type: Plain text
-#: en/git-fast-import.txt:870
+#: en/git-fast-import.txt:878
#, priority:100
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:875
+#: en/git-fast-import.txt:883
#, priority:100
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:876
+#: en/git-fast-import.txt:884
#, no-wrap, priority:100
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:878
+#: en/git-fast-import.txt:886
#, priority:100
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:882
+#: en/git-fast-import.txt:890
#, no-wrap, priority:100
msgid ""
"\t'data' SP <count> LF\n"
@@ -21217,31 +21260,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:888
+#: en/git-fast-import.txt:896
#, priority:100
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:893
+#: en/git-fast-import.txt:901
#, priority:100
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:894
+#: en/git-fast-import.txt:902
#, no-wrap, priority:100
msgid "Delimited format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:899
+#: en/git-fast-import.txt:907
#, priority:100
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:905
+#: en/git-fast-import.txt:913
#, no-wrap, priority:100
msgid ""
"\t'data' SP '<<' <delim> LF\n"
@@ -21251,25 +21294,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:921
#, priority:100
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:915
+#: en/git-fast-import.txt:923
#, priority:100
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:920
+#: en/git-fast-import.txt:928
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object."
+msgstr ""
+
+#. type: delimited block .
+#: en/git-fast-import.txt:934
+#, no-wrap, priority:100
+msgid ""
+"\t'alias' LF\n"
+"\tmark\n"
+"\t'to' SP <commit-ish> LF\n"
+"\tLF?\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:937
+#, priority:100
+msgid "For a detailed description of `<commit-ish>` see above under `from`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:943
#, priority:100
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:924
+#: en/git-fast-import.txt:947
#, no-wrap, priority:100
msgid ""
"\t'checkpoint' LF\n"
@@ -21277,31 +21342,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:930
+#: en/git-fast-import.txt:953
#, priority:100
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:935
+#: en/git-fast-import.txt:958
#, priority:100
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:941
+#: en/git-fast-import.txt:964
#, priority:100
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:950
+#: en/git-fast-import.txt:973
#, priority:100
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:954
+#: en/git-fast-import.txt:977
#, no-wrap, priority:100
msgid ""
"\t'progress' SP <any> LF\n"
@@ -21309,67 +21374,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:960
+#: en/git-fast-import.txt:983
#, priority:100
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:986
#, no-wrap, priority:100
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:968
+#: en/git-fast-import.txt:991
#, priority:100
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:976
+#: en/git-fast-import.txt:999
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:979
+#: en/git-fast-import.txt:1002
#, no-wrap, priority:100
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:983 en/git-fast-import.txt:1014 en/git-fast-import.txt:1067
+#: en/git-fast-import.txt:1006 en/git-fast-import.txt:1037 en/git-fast-import.txt:1090
#, priority:100
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:991
+#: en/git-fast-import.txt:1014
#, priority:100
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:994
+#: en/git-fast-import.txt:1017
#, no-wrap, priority:100
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1022
#, priority:100
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:1024
#, priority:100
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1005
+#: en/git-fast-import.txt:1028
#, no-wrap, priority:100
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21377,283 +21442,283 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1011
+#: en/git-fast-import.txt:1034
#, priority:100
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1022
+#: en/git-fast-import.txt:1045
#, priority:100
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1025
+#: en/git-fast-import.txt:1048
#, priority:100
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1049
#, no-wrap, priority:100
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1030
+#: en/git-fast-import.txt:1053
#, priority:100
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1033
+#: en/git-fast-import.txt:1056
#, no-wrap, priority:100
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1035
+#: en/git-fast-import.txt:1058
#, no-wrap, priority:100
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1041
+#: en/git-fast-import.txt:1064
#, priority:100
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1044
+#: en/git-fast-import.txt:1067
#, no-wrap, priority:100
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1047
+#: en/git-fast-import.txt:1070
#, priority:100
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1072
#, priority:100
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1075
#, no-wrap, priority:100
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1080
#, priority:100
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1060
+#: en/git-fast-import.txt:1083
#, priority:100
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1086
#, no-wrap, priority:100
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1072
+#: en/git-fast-import.txt:1095
#, priority:100
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1075
+#: en/git-fast-import.txt:1098
#, no-wrap, priority:100
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1078
+#: en/git-fast-import.txt:1101
#, priority:100
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1079 en/git-fast-import.txt:1146
+#: en/git-fast-import.txt:1102 en/git-fast-import.txt:1169
#, no-wrap, priority:100
msgid "date-format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1080 en/git-fast-import.txt:1148
+#: en/git-fast-import.txt:1103 en/git-fast-import.txt:1171
#, no-wrap, priority:100
msgid "export-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1081
+#: en/git-fast-import.txt:1104
#, no-wrap, priority:100
msgid "relative-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1082
+#: en/git-fast-import.txt:1105
#, no-wrap, priority:100
msgid "no-relative-marks"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1083 en/git-fast-import.txt:1150
+#: en/git-fast-import.txt:1106 en/git-fast-import.txt:1173
#, no-wrap, priority:100
msgid "force"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1087
+#: en/git-fast-import.txt:1110
#, priority:100
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1088 en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1111 en/git-fast-import.txt:1170
#, no-wrap, priority:100
msgid "import-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1089
+#: en/git-fast-import.txt:1112
#, no-wrap, priority:100
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1097
+#: en/git-fast-import.txt:1120
#, priority:100
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1098
+#: en/git-fast-import.txt:1121
#, no-wrap, priority:100
msgid "get-mark"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1122
#, no-wrap, priority:100
msgid "cat-blob"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1100
+#: en/git-fast-import.txt:1123
#, no-wrap, priority:100
msgid "ls"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1108
+#: en/git-fast-import.txt:1131
#, priority:100
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1109
+#: en/git-fast-import.txt:1132
#, no-wrap, priority:100
msgid "notes"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1114
+#: en/git-fast-import.txt:1137
#, priority:100
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1138
#, no-wrap, priority:100
msgid "done"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1122
+#: en/git-fast-import.txt:1145
#, priority:100
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1129
+#: en/git-fast-import.txt:1152
#, priority:100
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1132
+#: en/git-fast-import.txt:1155
#, no-wrap, priority:100
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1137
+#: en/git-fast-import.txt:1160
#, priority:100
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1141
+#: en/git-fast-import.txt:1164
#, priority:100
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1144
+#: en/git-fast-import.txt:1167
#, priority:100
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1149
+#: en/git-fast-import.txt:1172
#, priority:100
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1178
#, priority:100
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1159
+#: en/git-fast-import.txt:1182
#, priority:100
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1161
+#: en/git-fast-import.txt:1184
#, no-wrap, priority:100
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1168
+#: en/git-fast-import.txt:1191
#, priority:100
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1175
+#: en/git-fast-import.txt:1198
#, priority:100
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1203
#, no-wrap, priority:100
msgid ""
"\tmkfifo fast-import-output\n"
@@ -21662,49 +21727,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1184
+#: en/git-fast-import.txt:1207
#, priority:100
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1188
+#: en/git-fast-import.txt:1211
#, priority:100
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1213
#, no-wrap, priority:100
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1196
+#: en/git-fast-import.txt:1219
#, priority:100
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1203
+#: en/git-fast-import.txt:1226
#, priority:100
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1211
+#: en/git-fast-import.txt:1234
#, priority:100
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1236
#, priority:100
msgid "An example crash:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1229
+#: en/git-fast-import.txt:1252
#, no-wrap, priority:100
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
@@ -21724,7 +21789,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1256
#, no-wrap, priority:100
msgid ""
"\t$ git fast-import <in\n"
@@ -21733,7 +21798,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1239
+#: en/git-fast-import.txt:1262
#, no-wrap, priority:100
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
@@ -21744,13 +21809,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1241
+#: en/git-fast-import.txt:1264
#, no-wrap, priority:100
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1251
+#: en/git-fast-import.txt:1274
#, no-wrap, priority:100
msgid ""
"\tMost Recent Commands Before Crash\n"
@@ -21765,13 +21830,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1252
+#: en/git-fast-import.txt:1275
#, no-wrap, priority:100
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1255
+#: en/git-fast-import.txt:1278
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
@@ -21779,25 +21844,25 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1256
+#: en/git-fast-import.txt:1279
#, no-wrap, priority:100
msgid "active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1259
+#: en/git-fast-import.txt:1282
#, priority:100
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1260
+#: en/git-fast-import.txt:1283
#, priority:100
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1264
+#: en/git-fast-import.txt:1287
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
@@ -21806,7 +21871,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1270
+#: en/git-fast-import.txt:1293
#, no-wrap, priority:100
msgid ""
"status : active loaded dirty\n"
@@ -21818,307 +21883,307 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1274
+#: en/git-fast-import.txt:1297
#, priority:100
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1277
+#: en/git-fast-import.txt:1300
#, no-wrap, priority:100
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1280
+#: en/git-fast-import.txt:1303
#, priority:100
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1282
+#: en/git-fast-import.txt:1305
#, no-wrap, priority:100
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1290
+#: en/git-fast-import.txt:1313
#, priority:100
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1294
+#: en/git-fast-import.txt:1317
#, priority:100
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1296
+#: en/git-fast-import.txt:1319
#, no-wrap, priority:100
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1301
+#: en/git-fast-import.txt:1324
#, priority:100
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1305
+#: en/git-fast-import.txt:1328
#, priority:100
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1307
+#: en/git-fast-import.txt:1330
#, no-wrap, priority:100
msgid "Handling Renames"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1312
+#: en/git-fast-import.txt:1335
#, priority:100
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1337
#, no-wrap, priority:100
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1341
#, priority:100
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1325
+#: en/git-fast-import.txt:1348
#, priority:100
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1331
+#: en/git-fast-import.txt:1354
#, priority:100
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1337
+#: en/git-fast-import.txt:1360
#, priority:100
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1363
#, priority:100
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1342
+#: en/git-fast-import.txt:1365
#, no-wrap, priority:100
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1346
+#: en/git-fast-import.txt:1369
#, priority:100
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1353
+#: en/git-fast-import.txt:1376
#, priority:100
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1358
+#: en/git-fast-import.txt:1381
#, priority:100
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1360
+#: en/git-fast-import.txt:1383
#, no-wrap, priority:100
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1367
+#: en/git-fast-import.txt:1390
#, priority:100
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1369
+#: en/git-fast-import.txt:1392
#, no-wrap, priority:100
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1399
#, priority:100
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1379
+#: en/git-fast-import.txt:1402
#, no-wrap, priority:100
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1385
+#: en/git-fast-import.txt:1408
#, priority:100
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1393
+#: en/git-fast-import.txt:1416
#, priority:100
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1423
#, priority:100
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1407
+#: en/git-fast-import.txt:1430
#, priority:100
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1415
+#: en/git-fast-import.txt:1438
#, priority:100
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1417
+#: en/git-fast-import.txt:1440
#, no-wrap, priority:100
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1423
+#: en/git-fast-import.txt:1446
#, priority:100
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1448
#, no-wrap, priority:100
msgid "per object"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1432
+#: en/git-fast-import.txt:1455
#, priority:100
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1438
+#: en/git-fast-import.txt:1461
#, priority:100
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1440
+#: en/git-fast-import.txt:1463
#, no-wrap, priority:100
msgid "per mark"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1446
+#: en/git-fast-import.txt:1469
#, priority:100
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1448
+#: en/git-fast-import.txt:1471
#, no-wrap, priority:100
msgid "per branch"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1474
#, priority:100
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1457
+#: en/git-fast-import.txt:1480
#, priority:100
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1464
+#: en/git-fast-import.txt:1487
#, priority:100
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1468
+#: en/git-fast-import.txt:1491
#, priority:100
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1496
#, priority:100
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1498
#, no-wrap, priority:100
msgid "per active tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1480
+#: en/git-fast-import.txt:1503
#, priority:100
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1482
+#: en/git-fast-import.txt:1505
#, no-wrap, priority:100
msgid "per active file entry"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1488
+#: en/git-fast-import.txt:1511
#, priority:100
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1493
+#: en/git-fast-import.txt:1516
#, priority:100
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1495
+#: en/git-fast-import.txt:1518
#, no-wrap, priority:100
msgid "SIGNALS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1501
+#: en/git-fast-import.txt:1524
#, priority:100
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -22679,7 +22744,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1041
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -22795,20 +22860,32 @@ msgid ""
"\t[--state-branch <branch>] [--] [<rev-list options>...]\n"
msgstr ""
+#. type: Title -
+#: en/git-filter-branch.txt:20
+#, no-wrap, priority:100
+msgid "WARNING"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:31
+#, priority:100
+msgid "'git filter-branch' has a plethora of pitfalls that can produce non-obvious manglings of the intended history rewrite (and can leave you with little time to investigate such problems since it has such abysmal performance). These safety and performance issues cannot be backward compatibly fixed and as such, its use is not recommended. Please use an alternative history filtering tool such as https://github.com/newren/git-filter-repo/[git filter-repo]. If you still need to use 'git filter-branch', please carefully read <<SAFETY>> (and <<PERFORMANCE>>) to learn about the land mines of filter-branch, and then vigilantly avoid as many of the hazards listed there as reasonably possible."
+msgstr ""
+
#. type: Plain text
-#: en/git-filter-branch.txt:27
+#: en/git-filter-branch.txt:40
#, priority:100
msgid "Lets you rewrite Git revision history by rewriting the branches mentioned in the <rev-list options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge information) will be preserved."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:34
+#: en/git-filter-branch.txt:47
#, priority:100
msgid "The command will only rewrite the _positive_ refs mentioned in the command line (e.g. if you pass 'a..b', only 'b' will be rewritten). If you specify no filters, the commits will be recommitted without any changes, which would normally have no effect. Nevertheless, this may be useful in the future for compensating for some Git bugs or such, therefore such a usage is permitted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:39
+#: en/git-filter-branch.txt:52
#, no-wrap, priority:100
msgid ""
"*NOTE*: This command honors `.git/info/grafts` file and refs in\n"
@@ -22818,7 +22895,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:48
+#: en/git-filter-branch.txt:61
#, no-wrap, priority:100
msgid ""
"*WARNING*! The rewritten history will have different object names for all\n"
@@ -22832,337 +22909,337 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:52
+#: en/git-filter-branch.txt:65
#, priority:100
msgid "Always verify that the rewritten version is correct: The original refs, if different from the rewritten ones, will be stored in the namespace 'refs/original/'."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:56
+#: en/git-filter-branch.txt:69
#, priority:100
msgid "Note that since this operation is very I/O expensive, it might be a good idea to redirect the temporary directory off-disk with the `-d` option, e.g. on tmpfs. Reportedly the speedup is very noticeable."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:59
+#: en/git-filter-branch.txt:72
#, no-wrap, priority:100
msgid "Filters"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:71
+#: en/git-filter-branch.txt:84
#, priority:100
msgid "The filters are applied in the order as listed below. The <command> argument is always evaluated in the shell context using the 'eval' command (with the notable exception of the commit filter, for technical reasons). Prior to that, the `$GIT_COMMIT` environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, and GIT_COMMITTER_DATE are taken from the current commit and exported to the environment, in order to affect the author and committer identities of the replacement commit created by linkgit:git-commit-tree[1] after the filters have run."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:74
+#: en/git-filter-branch.txt:87
#, priority:100
msgid "If any evaluation of <command> returns a non-zero exit status, the whole operation will be aborted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:80
+#: en/git-filter-branch.txt:93
#, priority:100
msgid "A 'map' function is available that takes an \"original sha1 id\" argument and outputs a \"rewritten sha1 id\" if the commit has been already rewritten, and \"original sha1 id\" otherwise; the 'map' function can return several ids on separate lines if your commit filter emitted multiple commits."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:85
+#: en/git-filter-branch.txt:98
#, no-wrap, priority:100
msgid "--setup <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:91
+#: en/git-filter-branch.txt:104
#, priority:100
msgid "This is not a real filter executed for each commit but a one time setup just before the loop. Therefore no commit-specific variables are defined yet. Functions or variables defined here can be used or modified in the following filter steps except the commit filter, for technical reasons."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:92
+#: en/git-filter-branch.txt:105
#, no-wrap, priority:100
msgid "--subdirectory-filter <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:96
+#: en/git-filter-branch.txt:109
#, priority:100
msgid "Only look at the history which touches the given subdirectory. The result will contain that directory (and only that) as its project root. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:97
+#: en/git-filter-branch.txt:110
#, no-wrap, priority:100
msgid "--env-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:102
+#: en/git-filter-branch.txt:115
#, priority:100
msgid "This filter may be used if you only need to modify the environment in which the commit will be performed. Specifically, you might want to rewrite the author/committer name/email/time environment variables (see linkgit:git-commit-tree[1] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:103
+#: en/git-filter-branch.txt:116
#, no-wrap, priority:100
msgid "--tree-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:110
+#: en/git-filter-branch.txt:123
#, priority:100
msgid "This is the filter for rewriting the tree and its contents. The argument is evaluated in shell with the working directory set to the root of the checked out tree. The new tree is then used as-is (new files are auto-added, disappeared files are auto-removed - neither .gitignore files nor any other ignore rules *HAVE ANY EFFECT*!)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:111
+#: en/git-filter-branch.txt:124
#, no-wrap, priority:100
msgid "--index-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:117
+#: en/git-filter-branch.txt:130
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the index. It is similar to the tree filter but does not check out the tree, which makes it much faster. Frequently used with `git rm --cached --ignore-unmatch ...`, see EXAMPLES below. For hairy cases, see linkgit:git-update-index[1]."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:118
+#: en/git-filter-branch.txt:131
#, no-wrap, priority:100
msgid "--parent-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:125
+#: en/git-filter-branch.txt:138
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the commit's parent list. It will receive the parent string on stdin and shall output the new parent string on stdout. The parent string is in the format described in linkgit:git-commit-tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and \"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:126
+#: en/git-filter-branch.txt:139
#, no-wrap, priority:100
msgid "--msg-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:131
+#: en/git-filter-branch.txt:144
#, priority:100
msgid "This is the filter for rewriting the commit messages. The argument is evaluated in the shell with the original commit message on standard input; its standard output is used as the new commit message."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:132
+#: en/git-filter-branch.txt:145
#, no-wrap, priority:100
msgid "--commit-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:138
+#: en/git-filter-branch.txt:151
#, ignore-ellipsis, priority:100
msgid "This is the filter for performing the commit. If this filter is specified, it will be called instead of the 'git commit-tree' command, with arguments of the form \"<TREE_ID> [(-p <PARENT_COMMIT_ID>)...]\" and the log message on stdin. The commit id is expected on stdout."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:142
+#: en/git-filter-branch.txt:155
#, priority:100
msgid "As a special extension, the commit filter may emit multiple commit ids; in that case, the rewritten children of the original commit will have all of them as parents."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:147
+#: en/git-filter-branch.txt:160
#, priority:100
msgid "You can use the 'map' convenience function in this filter, and other convenience functions, too. For example, calling 'skip_commit \"$@\"' will leave out the current commit (but not its changes! If you want that, use 'git rebase' instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:151
+#: en/git-filter-branch.txt:164
#, priority:100
msgid "You can also use the `git_commit_non_empty_tree \"$@\"` instead of `git commit-tree \"$@\"` if you don't wish to keep commits with a single parent and that makes no change to the tree."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:152
+#: en/git-filter-branch.txt:165
#, no-wrap, priority:100
msgid "--tag-name-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:158
+#: en/git-filter-branch.txt:171
#, priority:100
msgid "This is the filter for rewriting tag names. When passed, it will be called for every tag ref that points to a rewritten object (or to a tag object which points to a rewritten object). The original tag name is passed via standard input, and the new tag name is expected on standard output."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:163
+#: en/git-filter-branch.txt:176
#, priority:100
msgid "The original tags are not deleted, but can be overwritten; use \"--tag-name-filter cat\" to simply update the tags. In this case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:174
+#: en/git-filter-branch.txt:187
#, priority:100
msgid "Nearly proper rewriting of tag objects is supported. If the tag has a message attached, a new tag object will be created with the same message, author, and timestamp. If the tag has a signature attached, the signature will be stripped. It is by definition impossible to preserve signatures. The reason this is \"nearly\" proper, is because ideally if the tag did not change (points to the same object, has the same name, etc.) it should retain any signature. That is not the case, signatures will always be removed, buyer beware. There is also no support for changing the author or timestamp (or the tag message for that matter). Tags which point to other tags will be rewritten to point to the underlying commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:175
+#: en/git-filter-branch.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--prune-empty"
msgstr "--prune-empty"
#. type: Plain text
-#: en/git-filter-branch.txt:182
+#: en/git-filter-branch.txt:195
#, priority:100
msgid "Some filters will generate empty commits that leave the tree untouched. This option instructs git-filter-branch to remove such commits if they have exactly one or zero non-pruned parents; merge commits will therefore remain intact. This option cannot be used together with `--commit-filter`, though the same effect can be achieved by using the provided `git_commit_non_empty_tree` function in a commit filter."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:183
+#: en/git-filter-branch.txt:196
#, no-wrap, priority:100
msgid "--original <namespace>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:186
+#: en/git-filter-branch.txt:199
#, priority:100
msgid "Use this option to set the namespace where the original commits will be stored. The default value is 'refs/original'."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:187
+#: en/git-filter-branch.txt:200
#, no-wrap, priority:100
msgid "-d <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:194
+#: en/git-filter-branch.txt:207
#, priority:100
msgid "Use this option to set the path to the temporary directory used for rewriting. When applying a tree filter, the command needs to temporarily check out the tree to some directory, which may consume considerable space in case of large projects. By default it does this in the `.git-rewrite/` directory but you can override that choice by this parameter."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:200
+#: en/git-filter-branch.txt:213
#, priority:100
msgid "'git filter-branch' refuses to start with an existing temporary directory or when there are already refs starting with 'refs/original/', unless forced."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:201
+#: en/git-filter-branch.txt:214
#, no-wrap, priority:100
msgid "--state-branch <branch>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:206
+#: en/git-filter-branch.txt:219
#, priority:100
msgid "This option will cause the mapping from old to new objects to be loaded from named branch upon startup and saved as a new commit to that branch upon exit, enabling incremental of large trees. If '<branch>' does not exist it will be created."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:207
+#: en/git-filter-branch.txt:220
#, ignore-ellipsis, no-wrap, priority:100
msgid "<rev-list options>..."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:212
+#: en/git-filter-branch.txt:225
#, priority:100
msgid "Arguments for 'git rev-list'. All positive refs included by these options are rewritten. You may also specify options such as `--all`, but you must use `--` to separate them from the 'git filter-branch' options. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:216
+#: en/git-filter-branch.txt:229
#, no-wrap, priority:100
msgid "Remap to ancestor"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:223
+#: en/git-filter-branch.txt:236
#, priority:100
msgid "By using linkgit:git-rev-list[1] arguments, e.g., path limiters, you can limit the set of revisions which get rewritten. However, positive refs on the command line are distinguished: we don't let them be excluded by such limiters. For this purpose, they are instead rewritten to point at the nearest ancestor that was not excluded."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:231
+#: en/git-filter-branch.txt:244
#, priority:100
msgid "On success, the exit status is `0`. If the filter can't find any commits to rewrite, the exit status is `2`. On any other error, the exit status may be any other non-zero value."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:238
+#: en/git-filter-branch.txt:251
#, priority:100
msgid "Suppose you want to remove a file (containing confidential information or copyright violation) from all commits:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:241
+#: en/git-filter-branch.txt:254
#, no-wrap, priority:100
msgid "git filter-branch --tree-filter 'rm filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:246
+#: en/git-filter-branch.txt:259
#, priority:100
msgid "However, if the file is absent from the tree of some commit, a simple `rm filename` will fail for that tree and commit. Thus you may instead want to use `rm -f filename` as the script."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:252
+#: en/git-filter-branch.txt:265
#, priority:100
msgid "Using `--index-filter` with 'git rm' yields a significantly faster version. Like with using `rm filename`, `git rm --cached filename` will fail if the file is absent from the tree of a commit. If you want to \"completely forget\" a file, it does not matter when it entered history, so we also add `--ignore-unmatch`:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:255
+#: en/git-filter-branch.txt:268
#, no-wrap, priority:100
msgid "git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:258
+#: en/git-filter-branch.txt:271
#, priority:100
msgid "Now, you will get the rewritten history saved in HEAD."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:261
+#: en/git-filter-branch.txt:274
#, priority:100
msgid "To rewrite the repository to look as if `foodir/` had been its project root, and discard all other history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:264
+#: en/git-filter-branch.txt:277
#, no-wrap, priority:100
msgid "git filter-branch --subdirectory-filter foodir -- --all\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:269
+#: en/git-filter-branch.txt:282
#, priority:100
msgid "Thus you can, e.g., turn a library subdirectory into a repository of its own. Note the `--` that separates 'filter-branch' options from revision options, and the `--all` to rewrite all branches and tags."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:273
+#: en/git-filter-branch.txt:286
#, priority:100
msgid "To set a commit (which typically is at the tip of another history) to be the parent of the current initial commit, in order to paste the other history behind the current history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:276
+#: en/git-filter-branch.txt:289
#, no-wrap, priority:100
msgid "git filter-branch --parent-filter 'sed \"s/^\\$/-p <graft-id>/\"' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:282
+#: en/git-filter-branch.txt:295
#, priority:100
msgid "(if the parent string is empty - which happens when we are dealing with the initial commit - add graftcommit as a parent). Note that this assumes history with a single root (that is, no merge without common ancestors happened). If this is not the case, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:286
+#: en/git-filter-branch.txt:299
#, no-wrap, priority:100
msgid ""
"git filter-branch --parent-filter \\\n"
@@ -23170,13 +23247,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:289
+#: en/git-filter-branch.txt:302
#, priority:100
msgid "or even simpler:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:293
+#: en/git-filter-branch.txt:306
#, no-wrap, priority:100
msgid ""
"git replace --graft $commit-id $graft-id\n"
@@ -23184,13 +23261,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:296
+#: en/git-filter-branch.txt:309
#, priority:100
msgid "To remove commits authored by \"Darl McBribe\" from the history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:305
+#: en/git-filter-branch.txt:318
#, no-wrap, priority:100
msgid ""
"git filter-branch --commit-filter '\n"
@@ -23203,13 +23280,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:308
+#: en/git-filter-branch.txt:321
#, priority:100
msgid "The function 'skip_commit' is defined as follows:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:320
+#: en/git-filter-branch.txt:333
#, no-wrap, priority:100
msgid ""
"skip_commit()\n"
@@ -23225,13 +23302,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:327
+#: en/git-filter-branch.txt:340
#, priority:100
msgid "The shift magic first throws away the tree id and then the -p parameters. Note that this handles merges properly! In case Darl committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 as their parents instead of the merge commit."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:332
+#: en/git-filter-branch.txt:345
#, no-wrap, priority:100
msgid ""
"*NOTE* the changes introduced by the commits, and which are not reverted\n"
@@ -23241,13 +23318,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:336
+#: en/git-filter-branch.txt:349
#, priority:100
msgid "You can rewrite the commit log messages using `--msg-filter`. For example, 'git svn-id' strings in a repository created by 'git svn' can be removed this way:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:341
+#: en/git-filter-branch.txt:354
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23256,13 +23333,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:345
+#: en/git-filter-branch.txt:358
#, priority:100
msgid "If you need to add 'Acked-by' lines to, say, the last 10 commits (none of which is a merge), use this command:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:351
+#: en/git-filter-branch.txt:364
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23272,13 +23349,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:357
+#: en/git-filter-branch.txt:370
#, priority:100
msgid "The `--env-filter` option can be used to modify committer and/or author identity. For example, if you found out that your commits have the wrong identity due to a misconfigured user.email, you can make a correction, before publishing the project, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:369
+#: en/git-filter-branch.txt:382
#, no-wrap, priority:100
msgid ""
"git filter-branch --env-filter '\n"
@@ -23294,19 +23371,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:375
+#: en/git-filter-branch.txt:388
#, priority:100
msgid "To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will point to the top-most revision that a 'git rev-list' of this range will print."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:377
+#: en/git-filter-branch.txt:390
#, priority:100
msgid "Consider this history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:382
+#: en/git-filter-branch.txt:395
#, no-wrap, priority:100
msgid ""
" D--E--F--G--H\n"
@@ -23315,25 +23392,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:385
+#: en/git-filter-branch.txt:398
#, priority:100
msgid "To rewrite only commits D,E,F,G,H, but leave A, B and C alone, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:388
+#: en/git-filter-branch.txt:401
#, ignore-ellipsis, no-wrap, priority:100
msgid "git filter-branch ... C..H\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:391
+#: en/git-filter-branch.txt:404
#, priority:100
msgid "To rewrite commits E,F,G,H, use one of these:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:395
+#: en/git-filter-branch.txt:408
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"git filter-branch ... C..H --not D\n"
@@ -23341,13 +23418,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:398
+#: en/git-filter-branch.txt:411
#, priority:100
msgid "To move the whole tree into a subdirectory, or remove it from there:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:405
+#: en/git-filter-branch.txt:418
#, no-wrap, priority:100
msgid ""
"git filter-branch --index-filter \\\n"
@@ -23358,87 +23435,279 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-filter-branch.txt:410
+#: en/git-filter-branch.txt:423
#, no-wrap, priority:100
msgid "CHECKLIST FOR SHRINKING A REPOSITORY"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:418
+#: en/git-filter-branch.txt:431
#, priority:100
msgid "git-filter-branch can be used to get rid of a subset of files, usually with some combination of `--index-filter` and `--subdirectory-filter`. People expect the resulting repository to be smaller than the original, but you need a few more steps to actually make it smaller, because Git tries hard not to lose your objects until you tell it to. First make sure that:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:422
+#: en/git-filter-branch.txt:435
#, priority:100
msgid "You really removed all variants of a filename, if a blob was moved over its lifetime. `git log --name-only --follow --all -- filename` can help you find renames."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:425
+#: en/git-filter-branch.txt:438
#, priority:100
msgid "You really filtered all refs: use `--tag-name-filter cat -- --all` when calling git-filter-branch."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:428
+#: en/git-filter-branch.txt:441
#, priority:100
msgid "Then there are two ways to get a smaller repository. A safer way is to clone, that keeps your original intact."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:432
+#: en/git-filter-branch.txt:445
#, priority:100
msgid "Clone it with `git clone file:///path/to/repo`. The clone will not have the removed objects. See linkgit:git-clone[1]. (Note that cloning with a plain path just hardlinks everything!)"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:437
+#: en/git-filter-branch.txt:450
#, priority:100
msgid "If you really don't want to clone it, for whatever reasons, check the following points instead (in this order). This is a very destructive approach, so *make a backup* or go back to cloning it. You have been warned."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:441
+#: en/git-filter-branch.txt:454
#, priority:100
msgid "Remove the original refs backed up by git-filter-branch: say `git for-each-ref --format=\"%(refname)\" refs/original/ | xargs -n 1 git update-ref -d`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:443
+#: en/git-filter-branch.txt:456
#, priority:100
msgid "Expire all reflogs with `git reflog expire --expire=now --all`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:447
+#: en/git-filter-branch.txt:460
#, priority:100
msgid "Garbage collect all unreferenced objects with `git gc --prune=now` (or if your git-gc is not new enough to support arguments to `--prune`, use `git repack -ad; git prune` instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:459
+#: en/git-filter-branch.txt:467
#, priority:100
-msgid "git-filter-branch allows you to make complex shell-scripted rewrites of your Git history, but you probably don't need this flexibility if you're simply _removing unwanted data_ like large files or passwords. For those operations you may want to consider http://rtyley.github.io/bfg-repo-cleaner/[The BFG Repo-Cleaner], a JVM-based alternative to git-filter-branch, typically at least 10-50x faster for those use-cases, and with quite different characteristics:"
+msgid "The performance of git-filter-branch is glacially slow; its design makes it impossible for a backward-compatible implementation to ever be fast:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:467
+#: en/git-filter-branch.txt:473
#, priority:100
-msgid "Any particular version of a file is cleaned exactly _once_. The BFG, unlike git-filter-branch, does not give you the opportunity to handle a file differently based on where or when it was committed within your history. This constraint gives the core performance benefit of The BFG, and is well-suited to the task of cleansing bad data - you don't care _where_ the bad data is, you just want it _gone_."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:473
+#: en/git-filter-branch.txt:476
+#, priority:100
+msgid "If you try and cheat and try to make git-filter-branch only work on files modified in a commit, then two things happen"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:482
+#, priority:100
+msgid "you run into problems with deletions whenever the user is simply trying to rename files (because attempting to delete files that don't exist looks like a no-op; it takes some chicanery to remap deletes across file renames when the renames happen via arbitrary user-provided shell)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:488
+#, priority:100
+msgid "even if you succeed at the map-deletes-for-renames chicanery, you still technically violate backward compatibility because users are allowed to filter files in ways that depend upon topology of commits instead of filtering solely based on file contents or names (though this has not been observed in the wild)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:494
+#, priority:100
+msgid "Even if you don't need to edit files but only want to e.g. rename or remove some and thus can avoid checking out each file (i.e. you can use --index-filter), you still are passing shell snippets for your filters. This means that for every commit, you have to have a prepared git repo where those filters can be run. That's a significant setup."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:505
+#, priority:100
+msgid "Further, several additional files are created or updated per commit by git-filter-branch. Some of these are for supporting the convenience functions provided by git-filter-branch (such as map()), while others are for keeping track of internal state (but could have also been accessed by user filters; one of git-filter-branch's regression tests does so). This essentially amounts to using the filesystem as an IPC mechanism between git-filter-branch and the user-provided filters. Disks tend to be a slow IPC mechanism, and writing these files also effectively represents a forced synchronization point between separate processes that we hit with every commit."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:511
+#, priority:100
+msgid "The user-provided shell commands will likely involve a pipeline of commands, resulting in the creation of many processes per commit. Creating and running another process takes a widely varying amount of time between operating systems, but on any platform it is very slow relative to invoking a function."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:517
+#, priority:100
+msgid "git-filter-branch itself is written in shell, which is kind of slow. This is the one performance issue that could be backward-compatibly fixed, but compared to the above problems that are intrinsic to the design of git-filter-branch, the language of the tool itself is a relatively minor issue."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:528
+#, priority:100
+msgid "Side note: Unfortunately, people tend to fixate on the written-in-shell aspect and periodically ask if git-filter-branch could be rewritten in another language to fix the performance issues. Not only does that ignore the bigger intrinsic problems with the design, it'd help less than you'd expect: if git-filter-branch itself were not shell, then the convenience functions (map(), skip_commit(), etc) and the `--setup` argument could no longer be executed once at the beginning of the program but would instead need to be prepended to every user filter (and thus re-executed with every commit)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:539
+#, priority:100
+msgid "The https://github.com/newren/git-filter-repo/[git filter-repo] tool is an alternative to git-filter-branch which does not suffer from these performance problems or the safety problems (mentioned below). For those with existing tooling which relies upon git-filter-branch, 'git repo-filter' also provides https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], a drop-in git-filter-branch replacement (with a few caveats). While filter-lamely suffers from all the same safety issues as git-filter-branch, it at least ameloriates the performance issues a little."
+msgstr ""
+
+#. type: Title -
+#: en/git-filter-branch.txt:542
+#, no-wrap, priority:100
+msgid "SAFETY"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:547
+#, priority:100
+msgid "git-filter-branch is riddled with gotchas resulting in various ways to easily corrupt repos or end up with a mess worse than what you started with:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:560
+#, priority:100
+msgid "Someone can have a set of \"working and tested filters\" which they document or provide to a coworker, who then runs them on a different OS where the same commands are not working/tested (some examples in the git-filter-branch manpage are also affected by this). BSD vs. GNU userland differences can really bite. If lucky, error messages are spewed. But just as likely, the commands either don't do the filtering requested, or silently corrupt by making some unwanted change. The unwanted change may only affect a few commits, so it's not necessarily obvious either. (The fact that problems won't necessarily be obvious means they are likely to go unnoticed until the rewritten history is in use for quite a while, at which point it's really hard to justify another flag-day for another rewrite.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:570
+#, priority:100
+msgid "Filenames with spaces are often mishandled by shell snippets since they cause problems for shell pipelines. Not everyone is familiar with find -print0, xargs -0, git-ls-files -z, etc. Even people who are familiar with these may assume such flags are not relevant because someone else renamed any such files in their repo back before the person doing the filtering joined the project. And often, even those familiar with handling arguments with spaces may not do so just because they aren't in the mindset of thinking about everything that could possibly go wrong."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:580
+#, priority:100
+msgid "Non-ascii filenames can be silently removed despite being in a desired directory. Keeping only wanted paths is often done using pipelines like `git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`. ls-files will only quote filenames if needed, so folks may not notice that one of the files didn't match the regex (at least not until it's much too late). Yes, someone who knows about core.quotePath can avoid this (unless they have other special characters like \\t, \\n, or \"), and people who use ls-files -z with something other than grep can avoid this, but that doesn't mean they will."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:586
+#, priority:100
+msgid "Similarly, when moving files around, one can find that filenames with non-ascii or special characters end up in a different directory, one that includes a double quote character. (This is technically the same issue as above with quoting, but perhaps an interesting different way that it can and has manifested as a problem.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:594
+#, priority:100
+msgid "It's far too easy to accidentally mix up old and new history. It's still possible with any tool, but git-filter-branch almost invites it. If lucky, the only downside is users getting frustrated that they don't know how to shrink their repo and remove the old stuff. If unlucky, they merge old and new history and end up with multiple \"copies\" of each commit, some of which have unwanted or sensitive files and others which don't. This comes about in multiple different ways:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:597
+#, priority:100
+msgid "the default to only doing a partial history rewrite ('--all' is not the default and few examples show it)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:599
+#, priority:100
+msgid "the fact that there's no automatic post-run cleanup"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:602
+#, priority:100
+msgid "the fact that --tag-name-filter (when used to rename tags) doesn't remove the old tags but just adds new ones with the new name"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:611
+#, priority:100
+msgid "the fact that little educational information is provided to inform users of the ramifications of a rewrite and how to avoid mixing old and new history. For example, this man page discusses how users need to understand that they need to rebase their changes for all their branches on top of new history (or delete and reclone), but that's only one of multiple concerns to consider. See the \"DISCUSSION\" section of the git filter-repo manual page for more details."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:614
+#, priority:100
+msgid "Annotated tags can be accidentally converted to lightweight tags, due to either of two issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:619
+#, priority:100
+msgid "Someone can do a history rewrite, realize they messed up, restore from the backups in refs/original/, and then redo their git-filter-branch command. (The backup in refs/original/ is not a real backup; it dereferences tags first.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:624
+#, priority:100
+msgid "Running git-filter-branch with either --tags or --all in your <rev-list options>. In order to retain annotated tags as annotated, you must use --tag-name-filter (and must not have restored from refs/original/ in a previously botched rewrite)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:629
#, priority:100
-msgid "By default The BFG takes full advantage of multi-core machines, cleansing commit file-trees in parallel. git-filter-branch cleans commits sequentially (i.e. in a single-threaded manner), though it _is_ possible to write filters that include their own parallelism, in the scripts executed against each commit."
+msgid "Any commit messages that specify an encoding will become corrupted by the rewrite; git-filter-branch ignores the encoding, takes the original bytes, and feeds it to commit-tree without telling it the proper encoding. (This happens whether or not --msg-filter is used.)"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:478
+#: en/git-filter-branch.txt:633
#, priority:100
-msgid "The http://rtyley.github.io/bfg-repo-cleaner/#examples[command options] are much more restrictive than git-filter branch, and dedicated just to the tasks of removing unwanted data- e.g: `--strip-blobs-bigger-than 1M`."
+msgid "Commit messages (even if they are all UTF-8) by default become corrupted due to not being updated -- any references to other commit hashes in commit messages will now refer to no-longer-extant commits."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:644
+#, priority:100
+msgid "There are no facilities for helping users find what unwanted crud they should delete, which means they are much more likely to have incomplete or partial cleanups that sometimes result in confusion and people wasting time trying to understand. (For example, folks tend to just look for big files to delete instead of big directories or extensions, and once they do so, then sometime later folks using the new repository who are going through history will notice a build artifact directory that has some files but not others, or a cache of dependencies (node_modules or similar) which couldn't have ever been functional since it's missing some files.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:647
+#, priority:100
+msgid "If --prune-empty isn't specified, then the filtering process can create hoards of confusing empty commits"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:651
+#, priority:100
+msgid "If --prune-empty is specified, then intentionally placed empty commits from before the filtering operation are also pruned instead of just pruning commits that became empty due to filtering rules."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:654
+#, ignore-ellipsis, priority:100
+msgid "If --prune empty is specified, sometimes empty commits are missed and left around anyway (a somewhat rare bug, but it happens...)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:658
+#, priority:100
+msgid "A minor issue, but users who have a goal to update all names and emails in a repository may be led to --env-filter which will only update authors and committers, missing taggers."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:664
+#, priority:100
+msgid "If the user provides a --tag-name-filter that maps multiple tags to the same name, no warning or error is provided; git-filter-branch simply overwrites each tag in some undocumented pre-defined order resulting in only one tag at the end. (A git-filter-branch regression test requires this surprising behavior.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:667
+#, priority:100
+msgid "Also, the poor performance of git-filter-branch often leads to safety issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:683
+#, priority:100
+msgid "Coming up with the correct shell snippet to do the filtering you want is sometimes difficult unless you're just doing a trivial modification such as deleting a couple files. Unfortunately, people often learn if the snippet is right or wrong by trying it out, but the rightness or wrongness can vary depending on special circumstances (spaces in filenames, non-ascii filenames, funny author names or emails, invalid timezones, presence of grafts or replace objects, etc.), meaning they may have to wait a long time, hit an error, then restart. The performance of git-filter-branch is so bad that this cycle is painful, reducing the time available to carefully re-check (to say nothing about what it does to the patience of the person doing the rewrite even if they do technically have more time available). This problem is extra compounded because errors from broken filters may not be shown for a long time and/or get lost in a sea of output. Even worse, broken filters often just result in silent incorrect rewrites."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:691
+#, priority:100
+msgid "To top it all off, even when users finally find working commands, they naturally want to share them. But they may be unaware that their repo didn't have some special cases that someone else's does. So, when someone else with a different repository runs the same commands, they get hit by the problems above. Or, the user just runs commands that really were vetted for special cases, but they run it on a different OS where it doesn't work, as noted above."
msgstr ""
#. type: Title =
@@ -23474,7 +23743,7 @@ msgid "This command is intended mostly for internal use by scripts automatically
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:64
+#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:68
#, no-wrap, priority:240
msgid "--log[=<n>]"
msgstr ""
@@ -23486,7 +23755,7 @@ msgid "In addition to branch names, populate the log message with one-line descr
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:65
+#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:69
#, ignore-same, no-wrap, priority:240
msgid "--no-log"
msgstr "--no-log"
@@ -24156,9 +24425,9 @@ msgid ""
"\t\t [--signature-file=<file>]\n"
"\t\t [-n | --numbered | -N | --no-numbered]\n"
"\t\t [--start-number <n>] [--numbered-files]\n"
-"\t\t [--in-reply-to=Message-Id] [--suffix=.<sfx>]\n"
+"\t\t [--in-reply-to=<message id>] [--suffix=.<sfx>]\n"
"\t\t [--ignore-if-in-upstream]\n"
-"\t\t [--rfc] [--subject-prefix=Subject-Prefix]\n"
+"\t\t [--rfc] [--subject-prefix=<subject prefix>]\n"
"\t\t [(--reroll-count|-v) <n>]\n"
"\t\t [--to=<email>] [--cc=<email>]\n"
"\t\t [--[no-]cover-letter] [--quiet]\n"
@@ -24207,523 +24476,524 @@ msgid "By default, each output file is numbered sequentially from 1, and uses th
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:70
+#: en/git-format-patch.txt:71
#, priority:100
-msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`."
+msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`. All directory components will be created."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:74
+#: en/git-format-patch.txt:75
#, priority:100
msgid "By default, the subject of a single patch is \"[PATCH] \" followed by the concatenation of lines from the commit message up to the first blank line (see the DISCUSSION section of linkgit:git-commit[1])."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:78
+#: en/git-format-patch.txt:79
#, priority:100
msgid "When multiple patches are output, the subject prefix will instead be \"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. To omit patch numbers from the subject, use `-N`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:83
+#: en/git-format-patch.txt:84
#, priority:100
msgid "If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a `Message-Id` header to reference."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:89
+#: en/git-format-patch.txt:90
#, no-wrap, priority:100
msgid "-<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:91
+#: en/git-format-patch.txt:92
#, priority:100
msgid "Prepare patches from the topmost <n> commits."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:92
+#: en/git-format-patch.txt:93
#, no-wrap, priority:100
msgid "-o <dir>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:93
+#: en/git-format-patch.txt:94
#, no-wrap, priority:100
msgid "--output-directory <dir>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:96
+#: en/git-format-patch.txt:97
#, priority:100
msgid "Use <dir> to store the resulting files, instead of the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:98 en/git-shortlog.txt:30
+#: en/git-format-patch.txt:99 en/git-shortlog.txt:30
#, ignore-same, no-wrap, priority:260
msgid "--numbered"
msgstr "--numbered"
#. type: Plain text
-#: en/git-format-patch.txt:100
+#: en/git-format-patch.txt:101
#, priority:100
msgid "Name output in '[PATCH n/m]' format, even with a single patch."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:102
+#: en/git-format-patch.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-numbered"
msgstr "--no-numbered"
#. type: Plain text
-#: en/git-format-patch.txt:104
+#: en/git-format-patch.txt:105
#, priority:100
msgid "Name output in '[PATCH]' format."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:105
+#: en/git-format-patch.txt:106
#, no-wrap, priority:100
msgid "--start-number <n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:107
+#: en/git-format-patch.txt:108
#, priority:100
msgid "Start numbering the patches at <n> instead of 1."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:108
+#: en/git-format-patch.txt:109
#, ignore-same, no-wrap, priority:100
msgid "--numbered-files"
msgstr "--numbered-files"
#. type: Plain text
-#: en/git-format-patch.txt:111
+#: en/git-format-patch.txt:112
#, priority:100
msgid "Output file names will be a simple number sequence without the default first line of the commit appended."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:113
+#: en/git-format-patch.txt:114
#, ignore-same, no-wrap, priority:100
msgid "--keep-subject"
msgstr "--keep-subject"
#. type: Plain text
-#: en/git-format-patch.txt:116
+#: en/git-format-patch.txt:117
#, priority:100
msgid "Do not strip/add '[PATCH]' from the first line of the commit log message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:122
+#: en/git-format-patch.txt:123
#, priority:100
msgid "Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:123 en/git-pack-objects.txt:59
+#: en/git-format-patch.txt:124 en/git-pack-objects.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--stdout"
msgstr "--stdout"
#. type: Plain text
-#: en/git-format-patch.txt:126
+#: en/git-format-patch.txt:127
#, priority:100
msgid "Print all commits to the standard output in mbox format, instead of creating a file for each one."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:127
+#: en/git-format-patch.txt:128
#, no-wrap, priority:100
msgid "--attach[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:131
+#: en/git-format-patch.txt:132
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: attachment`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:132
+#: en/git-format-patch.txt:133
#, ignore-same, no-wrap, priority:100
msgid "--no-attach"
msgstr "--no-attach"
#. type: Plain text
-#: en/git-format-patch.txt:135
+#: en/git-format-patch.txt:136
#, priority:100
msgid "Disable the creation of an attachment, overriding the configuration setting."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:136
+#: en/git-format-patch.txt:137
#, no-wrap, priority:100
msgid "--inline[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:140
+#: en/git-format-patch.txt:141
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: inline`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:141
+#: en/git-format-patch.txt:142
#, no-wrap, priority:100
msgid "--thread[=<style>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:142
+#: en/git-format-patch.txt:143
#, ignore-same, no-wrap, priority:100
msgid "--no-thread"
msgstr "--no-thread"
#. type: Plain text
-#: en/git-format-patch.txt:147
+#: en/git-format-patch.txt:148
#, priority:100
msgid "Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the first. Also controls generation of the `Message-Id` header to reference."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:153
+#: en/git-format-patch.txt:154
#, priority:100
msgid "The optional <style> argument can be either `shallow` or `deep`. 'shallow' threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order. 'deep' threading makes every mail a reply to the previous one."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:157
+#: en/git-format-patch.txt:158
#, priority:100
msgid "The default is `--no-thread`, unless the `format.thread` configuration is set. If `--thread` is specified without a style, it defaults to the style specified by `format.thread` if any, or else `shallow`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:161
+#: en/git-format-patch.txt:162
#, priority:100
msgid "Beware that the default for 'git send-email' is to thread emails itself. If you want `git format-patch` to take care of threading, you will want to ensure that threading is disabled for `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:162
-#, no-wrap, priority:100
-msgid "--in-reply-to=Message-Id"
-msgstr ""
+#: en/git-format-patch.txt:163
+#, fuzzy, no-wrap, priority:100
+#| msgid "--no-message-id"
+msgid "--in-reply-to=<message id>"
+msgstr "--no-message-id"
#. type: Plain text
-#: en/git-format-patch.txt:166
+#: en/git-format-patch.txt:167
#, priority:100
-msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given Message-Id, which avoids breaking threads to provide a new patch series."
+msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given <message id>, which avoids breaking threads to provide a new patch series."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:167
+#: en/git-format-patch.txt:168
#, ignore-same, no-wrap, priority:100
msgid "--ignore-if-in-upstream"
msgstr "--ignore-if-in-upstream"
#. type: Plain text
-#: en/git-format-patch.txt:173
+#: en/git-format-patch.txt:174
#, priority:100
msgid "Do not include a patch that matches a commit in <until>..<since>. This will examine all patches reachable from <since> but not from <until> and compare them with the patches being generated, and any patch that matches is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:174
+#: en/git-format-patch.txt:175
#, no-wrap, priority:100
-msgid "--subject-prefix=<Subject-Prefix>"
+msgid "--subject-prefix=<subject prefix>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:179
+#: en/git-format-patch.txt:180
#, priority:100
-msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<Subject-Prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
+msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<subject prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:180
+#: en/git-format-patch.txt:181
#, ignore-same, no-wrap, priority:100
msgid "--rfc"
msgstr "--rfc"
#. type: Plain text
-#: en/git-format-patch.txt:184
+#: en/git-format-patch.txt:185
#, priority:100
msgid "Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For Comments\"; use this when sending an experimental patch for discussion rather than application."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:185
+#: en/git-format-patch.txt:186
#, no-wrap, priority:100
msgid "-v <n>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:186
+#: en/git-format-patch.txt:187
#, no-wrap, priority:100
msgid "--reroll-count=<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:193
+#: en/git-format-patch.txt:194
#, priority:100
msgid "Mark the series as the <n>-th iteration of the topic. The output filenames have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default, but configurable via the `--subject-prefix` option) has ` v<n>` appended to it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:194
+#: en/git-format-patch.txt:195
#, no-wrap, priority:100
msgid "--to=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:199
+#: en/git-format-patch.txt:200
#, priority:100
msgid "Add a `To:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-to` discards all `To:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:200
+#: en/git-format-patch.txt:201
#, no-wrap, priority:100
msgid "--cc=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:205
+#: en/git-format-patch.txt:206
#, priority:100
msgid "Add a `Cc:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-cc` discards all `Cc:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:206
+#: en/git-format-patch.txt:207
#, ignore-same, no-wrap, priority:100
msgid "--from"
msgstr "--from"
#. type: Labeled list
-#: en/git-format-patch.txt:207
+#: en/git-format-patch.txt:208
#, no-wrap, priority:100
msgid "--from=<ident>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:213
+#: en/git-format-patch.txt:214
#, priority:100
msgid "Use `ident` in the `From:` header of each commit email. If the author ident of the commit is not textually identical to the provided `ident`, place a `From:` header in the body of the message with the original author. If no `ident` is given, use the committer ident."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:220
+#: en/git-format-patch.txt:221
#, priority:100
msgid "Note that this option is only useful if you are actually sending the emails and want to identify yourself as the sender, but retain the original author (and `git am` will correctly pick up the in-body header). Note also that `git send-email` already handles this transformation for you, and this option should not be used if you are feeding the result to `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:221
+#: en/git-format-patch.txt:222
#, no-wrap, priority:100
msgid "--add-header=<header>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:228
+#: en/git-format-patch.txt:229
#, priority:100
msgid "Add an arbitrary header to the email headers. This is in addition to any configured headers, and may be used multiple times. For example, `--add-header=\"Organization: git-foo\"`. The negated form `--no-add-header` discards *all* (`To:`, `Cc:`, and custom) headers added so far from config or command line."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:229
+#: en/git-format-patch.txt:230
#, ignore-same, no-wrap, priority:100
msgid "--[no-]cover-letter"
msgstr "--[no-]cover-letter"
#. type: Plain text
-#: en/git-format-patch.txt:233
+#: en/git-format-patch.txt:234
#, priority:100
msgid "In addition to the patches, generate a cover letter file containing the branch description, shortlog and the overall diffstat. You can fill in a description in the file before sending it out."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:234
+#: en/git-format-patch.txt:235
#, no-wrap, priority:100
msgid "--interdiff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:242
+#: en/git-format-patch.txt:243
#, priority:100
msgid "As a reviewer aid, insert an interdiff into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` is a single revision naming the tip of the previous series which shares a common base with the series being formatted (for example `git format-patch --cover-letter --interdiff=feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:243
+#: en/git-format-patch.txt:244
#, no-wrap, priority:100
msgid "--range-diff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:254
+#: en/git-format-patch.txt:255
#, priority:100
msgid "As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1]) into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` can be a single revision naming the tip of the previous series if it shares a common base with the series being formatted (for example `git format-patch --cover-letter --range-diff=feature/v1 -3 feature/v2`), or a revision range if the two versions of the series are disjoint (for example `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:259
+#: en/git-format-patch.txt:260
#, priority:100
msgid "Note that diff options passed to the command affect how the primary product of `format-patch` is generated, and they are not passed to the underlying `range-diff` machinery used to generate the cover-letter material (this may change in the future)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:260
+#: en/git-format-patch.txt:261
#, no-wrap, priority:100
msgid "--creation-factor=<percent>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:265
+#: en/git-format-patch.txt:266
#, priority:100
msgid "Used with `--range-diff`, tweak the heuristic which matches up commits between the previous and current series of patches by adjusting the creation/deletion cost fudge factor. See linkgit:git-range-diff[1]) for details."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:266
+#: en/git-format-patch.txt:267
#, no-wrap, priority:100
msgid "--notes[=<ref>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:267 en/pretty-options.txt:81
+#: en/git-format-patch.txt:268 en/pretty-options.txt:81
#, ignore-same, no-wrap, priority:260
msgid "--no-notes"
msgstr "--no-notes"
#. type: Plain text
-#: en/git-format-patch.txt:270
+#: en/git-format-patch.txt:271
#, priority:100
msgid "Append the notes (see linkgit:git-notes[1]) for the commit after the three-dash line."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:278
+#: en/git-format-patch.txt:279
#, priority:100
msgid "The expected use case of this is to write supporting explanation for the commit that does not belong to the commit log message proper, and include it with the patch submission. While one can simply write these explanations after `format-patch` has run but before sending, keeping them as Git notes allows them to be maintained between versions of the patch series (but see the discussion of the `notes.rewrite` configuration options in linkgit:git-notes[1] to use this workflow)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:281
+#: en/git-format-patch.txt:282
#, priority:100
msgid "The default is `--no-notes`, unless the `format.notes` configuration is set."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:282
+#: en/git-format-patch.txt:283
#, no-wrap, priority:100
msgid "--[no-]signature=<signature>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:287
+#: en/git-format-patch.txt:288
#, priority:100
msgid "Add a signature to each message produced. Per RFC 3676 the signature is separated from the body by a line with '-- ' on it. If the signature option is omitted the signature defaults to the Git version number."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:288
+#: en/git-format-patch.txt:289
#, no-wrap, priority:100
msgid "--signature-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:290
+#: en/git-format-patch.txt:291
#, priority:100
msgid "Works just like --signature except the signature is read from a file."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:291
+#: en/git-format-patch.txt:292
#, no-wrap, priority:100
msgid "--suffix=.<sfx>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:296
+#: en/git-format-patch.txt:297
#, priority:100
msgid "Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is `--suffix=.txt`. Leaving this empty will remove the `.patch` suffix."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:299
+#: en/git-format-patch.txt:300
#, priority:100
msgid "Note that the leading character does not have to be a dot; for example, you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:303
+#: en/git-format-patch.txt:304
#, priority:100
msgid "Do not print the names of the generated files to standard output."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:304
+#: en/git-format-patch.txt:305
#, ignore-same, no-wrap, priority:100
msgid "--no-binary"
msgstr "--no-binary"
#. type: Plain text
-#: en/git-format-patch.txt:309
+#: en/git-format-patch.txt:310
#, priority:100
msgid "Do not output contents of changes in binary files, instead display a notice that those files changed. Patches generated using this option cannot be applied properly, but they are still useful for code review."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:310
+#: en/git-format-patch.txt:311
#, ignore-same, no-wrap, priority:100
msgid "--zero-commit"
msgstr "--zero-commit"
#. type: Plain text
-#: en/git-format-patch.txt:313
+#: en/git-format-patch.txt:314
#, priority:100
msgid "Output an all-zero hash in each patch's From header instead of the hash of the commit."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:314
+#: en/git-format-patch.txt:315
#, no-wrap, priority:100
msgid "--base=<commit>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:318
+#: en/git-format-patch.txt:320
#, priority:100
-msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details."
+msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details. If <commit> is \"auto\", a base commit is automatically chosen."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:325
+#: en/git-format-patch.txt:327
#, priority:100
msgid "Treat the revision argument as a <revision range>, even if it is just a single commit (that would normally be treated as a <since>). Note that root commits included in the specified range are always formatted as creation patches, independently of this flag."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:328
+#: en/git-format-patch.txt:330
#, priority:100
msgid "Show progress reports on stderr as patches are generated."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:335
+#: en/git-format-patch.txt:338
#, priority:100
-msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To\" or \"Cc:\" headers, configure attachments, and sign off patches with configuration variables."
+msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To:\" or \"Cc:\" headers, configure attachments, change the patch output directory, and sign off patches with configuration variables."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:347
+#: en/git-format-patch.txt:351
#, no-wrap, priority:100
msgid ""
"[format]\n"
@@ -24735,17 +25005,18 @@ msgid ""
"\tcc = <email>\n"
"\tattach [ = mime-boundary-string ]\n"
"\tsignOff = true\n"
-"\tcoverletter = auto\n"
+"\toutputDirectory = <directory>\n"
+"\tcoverLetter = auto\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:356
+#: en/git-format-patch.txt:360
#, priority:100
msgid "The patch produced by 'git format-patch' is in UNIX mailbox format, with a fixed \"magic\" time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:366
+#: en/git-format-patch.txt:370
#, no-wrap, priority:100
msgid ""
"From 8f72bad1baf19a53459661343e21d6491c3908d3 Mon Sep 17 00:00:00 2001\n"
@@ -24759,7 +25030,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:369
+#: en/git-format-patch.txt:373
#, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -24767,7 +25038,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:372
+#: en/git-format-patch.txt:376
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"Do the same for ia64 so we can have sleek & trim looking\n"
@@ -24775,19 +25046,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:380
+#: en/git-format-patch.txt:384
#, ignore-ellipsis, priority:100
msgid "Typically it will be placed in a MUA's drafts folder, edited to add timely commentary that should not go in the changelog after the three dashes, and then sent as a message whose body, in our example, starts with \"arch/arm config files were...\". On the receiving end, readers can save interesting patches in a UNIX mailbox and apply them with linkgit:git-am[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:386
+#: en/git-format-patch.txt:390
#, priority:100
msgid "When a patch is part of an ongoing discussion, the patch generated by 'git format-patch' can be tweaked to take advantage of the 'git am --scissors' feature. After your response to the discussion comes a line that consists solely of \"`-- >8 --`\" (scissors and perforation), followed by the patch with unnecessary header fields removed:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:390
+#: en/git-format-patch.txt:394
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"...\n"
@@ -24795,21 +25066,21 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:392
+#: en/git-format-patch.txt:396
#, no-wrap, priority:100
msgid "Makes sense to me. How about this patch?\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:395
+#: en/git-format-patch.txt:399
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-Knig diet\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:398
+#: en/git-format-patch.txt:402
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -24817,61 +25088,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:406
+#: en/git-format-patch.txt:410
#, priority:100
msgid "When sending a patch this way, most often you are sending your own patch, so in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit `From:` and `Date:` lines from the patch file. The patch title is likely to be different from the subject of the discussion the patch is in response to, so it is likely that you would want to keep the Subject: line, like the example above."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:408
+#: en/git-format-patch.txt:412
#, no-wrap, priority:100
msgid "Checking for patch corruption"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:411
+#: en/git-format-patch.txt:415
#, priority:100
msgid "Many mailers if not set up properly will corrupt whitespace. Here are two common types of corruption:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:413
+#: en/git-format-patch.txt:417
#, priority:100
msgid "Empty context lines that do not have _any_ whitespace."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:416
+#: en/git-format-patch.txt:420
#, priority:100
msgid "Non-empty context lines that have one extra whitespace at the beginning."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:418
+#: en/git-format-patch.txt:422
#, priority:100
msgid "One way to test if your MUA is set up correctly is:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:422
+#: en/git-format-patch.txt:426
#, priority:100
msgid "Send the patch to yourself, exactly the way you would, except with To: and Cc: lines that do not contain the list and maintainer address."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:425
+#: en/git-format-patch.txt:429
#, priority:100
msgid "Save that patch to a file in UNIX mailbox format. Call it a.patch, say."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:427
+#: en/git-format-patch.txt:431
#, priority:100
msgid "Apply it:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:432
+#: en/git-format-patch.txt:436
#, no-wrap, priority:100
msgid ""
"$ git fetch <project> master:test-apply\n"
@@ -24881,175 +25152,175 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:434
+#: en/git-format-patch.txt:438
#, priority:100
msgid "If it does not apply correctly, there can be various reasons."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:439
+#: en/git-format-patch.txt:443
#, priority:100
msgid "The patch itself does not apply cleanly. That is _bad_ but does not have much to do with your MUA. You might want to rebase the patch with linkgit:git-rebase[1] before regenerating it in this case."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:444
+#: en/git-format-patch.txt:448
#, priority:100
msgid "The MUA corrupted your patch; \"am\" would complain that the patch does not apply. Look in the .git/rebase-apply/ subdirectory and see what 'patch' file contains and check for the common corruption patterns mentioned above."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:452
+#: en/git-format-patch.txt:456
#, priority:100
msgid "While at it, check the 'info' and 'final-commit' files as well. If what is in 'final-commit' is not exactly what you would want to see in the commit log message, it is very likely that the receiver would end up hand editing the log message when applying your patch. Things like \"Hi, this is my first patch.\\n\" in the patch e-mail should come after the three-dash line that signals the end of the commit message."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:454
+#: en/git-format-patch.txt:458
#, no-wrap, priority:100
msgid "MUA-SPECIFIC HINTS"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:457
+#: en/git-format-patch.txt:461
#, priority:100
msgid "Here are some hints on how to successfully submit patches inline using various mailers."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:459
+#: en/git-format-patch.txt:463
#, no-wrap, priority:100
msgid "GMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:465
+#: en/git-format-patch.txt:469
#, priority:100
msgid "GMail does not have any way to turn off line wrapping in the web interface, so it will mangle any emails that you send. You can however use \"git send-email\" and send your patches through the GMail SMTP server, or use any IMAP email client to connect to the google IMAP server and forward the emails through that."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:468
+#: en/git-format-patch.txt:472
#, priority:100
msgid "For hints on using 'git send-email' to send your patches through the GMail SMTP server, see the EXAMPLE section of linkgit:git-send-email[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:471
+#: en/git-format-patch.txt:475
#, priority:100
msgid "For hints on submission using the IMAP interface, see the EXAMPLE section of linkgit:git-imap-send[1]."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:473
+#: en/git-format-patch.txt:477
#, no-wrap, priority:100
msgid "Thunderbird"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:477
+#: en/git-format-patch.txt:481
#, priority:100
msgid "By default, Thunderbird will both wrap emails as well as flag them as being 'format=flowed', both of which will make the resulting email unusable by Git."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:481
+#: en/git-format-patch.txt:485
#, priority:100
msgid "There are three different approaches: use an add-on to turn off line wraps, configure Thunderbird to not mangle patches, or use an external editor to keep Thunderbird from mangling the patches."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:483
+#: en/git-format-patch.txt:487
#, no-wrap, priority:100
msgid "Approach #1 (add-on)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:491
+#: en/git-format-patch.txt:495
#, priority:100
msgid "Install the Toggle Word Wrap add-on that is available from https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you can tick off. Now you can compose the message as you otherwise do (cut + paste, 'git format-patch' | 'git imap-send', etc), but you have to insert line breaks manually in any text that you type."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:493
+#: en/git-format-patch.txt:497
#, no-wrap, priority:100
msgid "Approach #2 (configuration)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:495
+#: en/git-format-patch.txt:499
#, priority:100
msgid "Three steps:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:499
+#: en/git-format-patch.txt:503
#, ignore-ellipsis, priority:100
msgid "Configure your mail server composition as plain text: Edit...Account Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:501
+#: en/git-format-patch.txt:505
#, priority:100
msgid "Configure your general composition window to not wrap."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:504
+#: en/git-format-patch.txt:508
#, priority:100
msgid "In Thunderbird 2: Edit..Preferences..Composition, wrap plain text messages at 0"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:510
+#: en/git-format-patch.txt:514
#, priority:100
msgid "In Thunderbird 3: Edit..Preferences..Advanced..Config Editor. Search for \"mail.wrap_long_lines\". Toggle it to make sure it is set to `false`. Also, search for \"mailnews.wraplength\" and set the value to 0."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:515
+#: en/git-format-patch.txt:519
#, priority:100
msgid "Disable the use of format=flowed: Edit..Preferences..Advanced..Config Editor. Search for \"mailnews.send_plaintext_flowed\". Toggle it to make sure it is set to `false`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:519
+#: en/git-format-patch.txt:523
#, priority:100
msgid "After that is done, you should be able to compose email as you otherwise would (cut + paste, 'git format-patch' | 'git imap-send', etc), and the patches will not be mangled."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:521
+#: en/git-format-patch.txt:525
#, no-wrap, priority:100
msgid "Approach #3 (external editor)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:526
+#: en/git-format-patch.txt:530
#, priority:100
msgid "The following Thunderbird extensions are needed: AboutConfig from http://aboutconfig.mozdev.org/ and External Editor from http://globs.org/articles.php?lng=en&pg=8"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:528
+#: en/git-format-patch.txt:532
#, priority:100
msgid "Prepare the patch as a text file using your method of choice."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:533
+#: en/git-format-patch.txt:537
#, priority:100
msgid "Before opening a compose window, use Edit->Account Settings to uncheck the \"Compose messages in HTML format\" setting in the \"Composition & Addressing\" panel of the account to be used to send the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:537
+#: en/git-format-patch.txt:541
#, priority:100
msgid "In the main Thunderbird window, 'before' you open the compose window for the patch, use Tools->about:config to set the following to the indicated values:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:541
+#: en/git-format-patch.txt:545
#, no-wrap, priority:100
msgid ""
"\tmailnews.send_plaintext_flowed => false\n"
@@ -25057,25 +25328,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:544
+#: en/git-format-patch.txt:548
#, priority:100
msgid "Open a compose window and click the external editor icon."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:547
+#: en/git-format-patch.txt:551
#, priority:100
msgid "In the external editor window, read in the patch file and exit the editor normally."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:550
+#: en/git-format-patch.txt:554
#, priority:100
msgid "Side note: it may be possible to do step 2 with about:config and the following settings but no one's tried yet."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:555
+#: en/git-format-patch.txt:559
#, no-wrap, priority:100
msgid ""
"\tmail.html_compose => false\n"
@@ -25084,91 +25355,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:560
+#: en/git-format-patch.txt:564
#, priority:100
msgid "There is a script in contrib/thunderbird-patch-inline which can help you include patches with Thunderbird in an easy way. To use it, do the steps above and then use the script as the external editor."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:562
+#: en/git-format-patch.txt:566
#, no-wrap, priority:100
msgid "KMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:564
+#: en/git-format-patch.txt:568
#, priority:100
msgid "This should help you to submit patches inline using KMail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:566
+#: en/git-format-patch.txt:570
#, priority:100
msgid "Prepare the patch as a text file."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:568
+#: en/git-format-patch.txt:572
#, priority:100
msgid "Click on New Mail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:571
+#: en/git-format-patch.txt:575
#, priority:100
msgid "Go under \"Options\" in the Composer window and be sure that \"Word wrap\" is not set."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:573
+#: en/git-format-patch.txt:577
#, ignore-ellipsis, priority:100
msgid "Use Message -> Insert file... and insert the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:576
+#: en/git-format-patch.txt:580
#, priority:100
msgid "Back in the compose window: add whatever other text you wish to the message, complete the addressing and subject fields, and press send."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:578
+#: en/git-format-patch.txt:582
#, no-wrap, priority:100
msgid "BASE TREE INFORMATION"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:587
+#: en/git-format-patch.txt:591
#, priority:100
msgid "The base tree information block is used for maintainers or third party testers to know the exact state the patch series applies to. It consists of the 'base commit', which is a well-known commit that is part of the stable part of the project history everybody else works off of, and zero or more 'prerequisite patches', which are well-known patches in flight that is not yet part of the 'base commit' that need to be applied on top of 'base commit' in topological order before the patches can be applied."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:593
+#: en/git-format-patch.txt:597
#, priority:100
msgid "The 'base commit' is shown as \"base-commit: \" followed by the 40-hex of the commit object name. A 'prerequisite patch' is shown as \"prerequisite-patch-id: \" followed by the 40-hex 'patch id', which can be obtained by passing the patch through the `git patch-id --stable` command."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:597
+#: en/git-format-patch.txt:601
#, priority:100
msgid "Imagine that on top of the public commit P, you applied well-known patches X, Y and Z from somebody else, and then built your three-patch series A, B, C, the history would be like:"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:600
+#: en/git-format-patch.txt:604
#, no-wrap, priority:100
msgid "---P---X---Y---Z---A---B---C\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:607
+#: en/git-format-patch.txt:611
#, priority:100
msgid "With `git format-patch --base=P -3 C` (or variants thereof, e.g. with `--cover-letter` or using `Z..C` instead of `-3 C` to specify the range), the base tree information block is shown at the end of the first message the command outputs (either the first patch, or the cover letter), like this:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:613
+#: en/git-format-patch.txt:617
#, no-wrap, priority:100
msgid ""
"base-commit: P\n"
@@ -25178,13 +25449,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:616
+#: en/git-format-patch.txt:620
#, priority:100
msgid "For non-linear topology, such as"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:621
+#: en/git-format-patch.txt:625
#, no-wrap, priority:100
msgid ""
"---P---X---A---M---C\n"
@@ -25193,91 +25464,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:626
+#: en/git-format-patch.txt:630
#, priority:100
msgid "You can also use `git format-patch --base=P -3 C` to generate patches for A, B and C, and the identifiers for P, X, Y, Z are appended at the end of the first message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:632
+#: en/git-format-patch.txt:636
#, priority:100
msgid "If set `--base=auto` in cmdline, it will track base commit automatically, the base commit will be the merge base of tip commit of the remote-tracking branch and revision-range specified in cmdline. For a local branch, you need to track a remote branch by `git branch --set-upstream-to` before using this option."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:638
+#: en/git-format-patch.txt:642
#, priority:100
msgid "Extract commits between revisions R1 and R2, and apply them on top of the current branch using 'git am' to cherry-pick them:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:641
+#: en/git-format-patch.txt:645
#, no-wrap, priority:100
msgid "$ git format-patch -k --stdout R1..R2 | git am -3 -k\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:645
+#: en/git-format-patch.txt:649
#, priority:100
msgid "Extract all commits which are in the current branch but not in the origin branch:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:648
+#: en/git-format-patch.txt:652
#, no-wrap, priority:100
msgid "$ git format-patch origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:651
+#: en/git-format-patch.txt:655
#, priority:100
msgid "For each commit a separate file is created in the current directory."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:654
+#: en/git-format-patch.txt:658
#, priority:100
msgid "Extract all commits that lead to 'origin' since the inception of the project:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:657
+#: en/git-format-patch.txt:661
#, no-wrap, priority:100
msgid "$ git format-patch --root origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:660
+#: en/git-format-patch.txt:664
#, priority:100
msgid "The same as the previous one:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:663
+#: en/git-format-patch.txt:667
#, no-wrap, priority:100
msgid "$ git format-patch -M -B origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:670
+#: en/git-format-patch.txt:674
#, priority:100
msgid "Additionally, it detects and handles renames and complete rewrites intelligently to produce a renaming patch. A renaming patch reduces the amount of text output, and generally makes it easier to review. Note that non-Git \"patch\" programs won't understand renaming patches, so use it only when you know the recipient uses Git to apply your patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:673
+#: en/git-format-patch.txt:677
#, priority:100
msgid "Extract three topmost commits from the current branch and format them as e-mailable patches:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:676
+#: en/git-format-patch.txt:680
#, no-wrap, priority:100
msgid "$ git format-patch -3\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:681
+#: en/git-format-patch.txt:685
#, ignore-same, priority:100
msgid "linkgit:git-am[1], linkgit:git-send-email[1]"
msgstr "linkgit:git-am[1], linkgit:git-send-email[1]"
@@ -25773,43 +26044,43 @@ msgid "The below documentation is the same as what's found in linkgit:git-config
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:127
+#: en/git-gc.txt:126
#, priority:100
-msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, refs saved by 'git filter-branch' in refs/original/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
+msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, notes saved by 'git notes' under refs/notes/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:134
+#: en/git-gc.txt:133
#, priority:100
msgid "On the other hand, when 'git gc' runs concurrently with another process, there is a risk of it deleting an object that the other process is using but hasn't created a reference to. This may just cause the other process to fail or may corrupt the repository if the other process later adds a reference to the deleted object. Git has two features that significantly mitigate this problem:"
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:137
+#: en/git-gc.txt:136
#, priority:100
msgid "Any object with modification time newer than the `--prune` date is kept, along with everything reachable from it."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:141
+#: en/git-gc.txt:140
#, priority:100
msgid "Most operations that add an object to the database update the modification time of the object if it is already present so that #1 applies."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:145
+#: en/git-gc.txt:144
#, priority:100
msgid "However, these features fall short of a complete solution, so users who run commands concurrently have to live with some risk of corruption (which seems to be low in practice)."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:151
+#: en/git-gc.txt:150
#, priority:100
msgid "The 'git gc --auto' command will run the 'pre-auto-gc' hook. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:159
+#: en/git-gc.txt:158
#, ignore-same, priority:100
msgid "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
msgstr "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
@@ -26075,7 +26346,7 @@ msgid "For each <pathspec> given on command line, descend at most <depth> levels
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:399
+#: en/git-grep.txt:128 en/git-submodule.txt:400
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
@@ -26291,7 +26562,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:951
+#: en/git-grep.txt:217 en/rev-list-options.txt:967
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -26441,127 +26712,151 @@ msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:280
+#: en/git-grep.txt:277
+#, priority:100
+msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:282
+#, priority:100
+msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:287
+#, priority:100
+msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:291
+#, priority:100
+msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:297
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:281
+#: en/git-grep.txt:298
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:282
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:283 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:284
+#: en/git-grep.txt:301
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:289
+#: en/git-grep.txt:306
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:290 en/rev-list-options.txt:65
+#: en/git-grep.txt:307 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:294
+#: en/git-grep.txt:311
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:299
+#: en/git-grep.txt:316
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:300
+#: en/git-grep.txt:317
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:303
+#: en/git-grep.txt:320
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:307
+#: en/git-grep.txt:324
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:328
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:318
+#: en/git-grep.txt:335
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:321
+#: en/git-grep.txt:338
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:322
+#: en/git-grep.txt:339
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:325
+#: en/git-grep.txt:342
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:326
+#: en/git-grep.txt:343
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:329
+#: en/git-grep.txt:346
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:330
+#: en/git-grep.txt:347
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:332
+#: en/git-grep.txt:349
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
@@ -26779,25 +27074,13 @@ msgstr ""
#. type: Plain text
#: en/git-gui.txt:116
#, priority:100
-msgid "A 'git gui' development repository can be obtained from:"
+msgid "The official repository of the 'git gui' project can be found at:"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:118
#, no-wrap, priority:100
-msgid " git clone git://repo.or.cz/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:122
-#, no-wrap, priority:100
-msgid " git clone http://repo.or.cz/r/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:124
-#, priority:100
-msgid "or browsed online at http://repo.or.cz/w/git-gui.git/[]."
+msgid " https://github.com/prati0100/git-gui.git/\n"
msgstr ""
#. type: Title =
@@ -30409,29 +30692,29 @@ msgstr ""
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
-#. type: Plain text
-#: en/git-ls-remote.txt:110
+#. type: delimited block -
+#: en/git-ls-remote.txt:111
#, no-wrap, priority:100
msgid ""
-"\t$ git ls-remote --tags ./.\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"\t$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
-"\t5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"\tc781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
-"\t$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
-"\t$ git ls-remote --tags korg v\\*\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"$ git ls-remote --tags ./.\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
+"$ git ls-remote --tags korg v\\*\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:114
+#: en/git-ls-remote.txt:116
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -30939,7 +31222,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:358
+#: en/git-merge-base.txt:60 en/git-rebase.txt:376
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -30968,235 +31251,235 @@ msgstr ""
msgid "For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:86
+#. type: delimited block .
+#: en/git-merge-base.txt:87
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---B\n"
-"\t /\n"
-"\t---o---1---o---o---o---A\n"
+"\t o---o---o---B\n"
+"\t/\n"
+"---o---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:88
+#: en/git-merge-base.txt:90
#, priority:100
msgid "the merge base between 'A' and 'B' is '1'."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:92
+#: en/git-merge-base.txt:94
#, priority:100
msgid "Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the merge base between 'A' and a hypothetical commit 'M', which is a merge between 'B' and 'C'. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:98
+#. type: delimited block .
+#: en/git-merge-base.txt:101
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---C\n"
-"\t /\n"
-"\t / o---o---o---B\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---C\n"
+" /\n"
+" / o---o---o---B\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:101
+#: en/git-merge-base.txt:105
#, priority:100
msgid "the result of `git merge-base A B C` is '1'. This is because the equivalent topology with a merge commit 'M' between 'B' and 'C' is:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:108
+#. type: delimited block .
+#: en/git-merge-base.txt:113
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---o\n"
-"\t / \\\n"
-"\t / o---o---o---o---M\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---o\n"
+" / \\\n"
+" / o---o---o---o---M\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:112
+#: en/git-merge-base.txt:118
#, priority:100
msgid "and the result of `git merge-base A M` is '1'. Commit '2' is also a common ancestor between 'A' and 'M', but '1' is a better common ancestor, because '2' is an ancestor of '1'. Hence, '2' is not a merge base."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:115
+#: en/git-merge-base.txt:121
#, priority:100
msgid "The result of `git merge-base --octopus A B C` is '2', because '2' is the best common ancestor of all commits."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:118
+#: en/git-merge-base.txt:124
#, priority:100
msgid "When the history involves criss-cross merges, there can be more than one 'best' common ancestor for two commits. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:124
+#. type: delimited block .
+#: en/git-merge-base.txt:131
#, no-wrap, priority:100
msgid ""
-"\t---1---o---A\n"
-"\t \\ /\n"
-"\t X\n"
-"\t / \\\n"
-"\t---2---o---o---B\n"
+"---1---o---A\n"
+" \\ /\n"
+" X\n"
+" / \\\n"
+"---2---o---o---B\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:128
+#: en/git-merge-base.txt:136
#, priority:100
msgid "both '1' and '2' are merge-bases of A and B. Neither one is better than the other (both are 'best' merge bases). When the `--all` option is not given, it is unspecified which best one is output."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:133
+#: en/git-merge-base.txt:141
#, priority:100
msgid "A common idiom to check \"fast-forward-ness\" between two commits A and B is (or at least used to be) to compute the merge base between A and B, and check if it is the same as A, in which case, A is an ancestor of B. You will see this idiom used often in older scripts."
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:139
+#. type: delimited block .
+#: en/git-merge-base.txt:148
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tA=$(git rev-parse --verify A)\n"
-"\tif test \"$A\" = \"$(git merge-base A B)\"\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"A=$(git rev-parse --verify A)\n"
+"if test \"$A\" = \"$(git merge-base A B)\"\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:141
+#: en/git-merge-base.txt:151
#, priority:100
msgid "In modern git, you can say this in a more direct way:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:146
+#. type: delimited block .
+#: en/git-merge-base.txt:157
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tif git merge-base --is-ancestor A B\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"if git merge-base --is-ancestor A B\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:148
+#: en/git-merge-base.txt:160
#, priority:100
msgid "instead."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:150
+#: en/git-merge-base.txt:162
#, no-wrap, priority:100
msgid "Discussion on fork-point mode"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:156
+#: en/git-merge-base.txt:168
#, priority:100
msgid "After working on the `topic` branch created with `git switch -c topic origin/master`, the history of remote-tracking branch `origin/master` may have been rewound and rebuilt, leading to a history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:164
+#. type: delimited block .
+#: en/git-merge-base.txt:177
#, no-wrap, priority:100
msgid ""
-"\t o---B2\n"
-"\t /\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t \\\n"
-"\t B0\n"
-"\t \\\n"
-"\t D0---D1---D (topic)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\\n"
+"\t B0\n"
+"\t \\\n"
+"\t D0---D1---D (topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:170
+#: en/git-merge-base.txt:184
#, priority:100
msgid "where `origin/master` used to point at commits B0, B1, B2 and now it points at B, and your `topic` branch was started on top of it back when `origin/master` was at B0, and you built three commits, D0, D1, and D, on top of it. Imagine that you now want to rebase the work you did on the topic on top of the updated origin/master."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:176
+#: en/git-merge-base.txt:190
#, priority:100
msgid "In such a case, `git merge-base origin/master topic` would return the parent of B0 in the above picture, but B0^..D is *not* the range of commits you would want to replay on top of B (it includes B0, which is not what you wrote; it is a commit the other side discarded when it moved its tip from B0 to B1)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:184
+#: en/git-merge-base.txt:198
#, priority:100
msgid "`git merge-base --fork-point origin/master topic` is designed to help in such a case. It takes not only B but also B0, B1, and B2 (i.e. old tips of the remote-tracking branches your repository's reflog knows about) into account to see on which commit your topic branch was built and finds B0, allowing you to replay only the commits on your topic, excluding the commits the other side later discarded."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:186
+#: en/git-merge-base.txt:200
#, priority:100
msgid "Hence"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:188
+#: en/git-merge-base.txt:202
#, no-wrap, priority:100
msgid " $ fork_point=$(git merge-base --fork-point origin/master topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:190
+#: en/git-merge-base.txt:204
#, priority:100
msgid "will find B0, and"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:192
+#: en/git-merge-base.txt:206
#, no-wrap, priority:100
msgid " $ git rebase --onto origin/master $fork_point topic\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:195
+#: en/git-merge-base.txt:209
#, priority:100
msgid "will replay D0, D1 and D on top of B to create a new history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:203
+#. type: delimited block .
+#: en/git-merge-base.txt:218
#, no-wrap, priority:100
msgid ""
-"\t\t\t o---B2\n"
-"\t\t\t/\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t\t\\ \\\n"
-"\t\t B0 D0'--D1'--D' (topic - updated)\n"
-"\t\t \\\n"
-"\t\t D0---D1---D (topic - old)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\ \\\n"
+"\t B0 D0'--D1'--D' (topic - updated)\n"
+"\t \\\n"
+"\t D0---D1---D (topic - old)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:210
+#: en/git-merge-base.txt:226
#, priority:100
msgid "A caveat is that older reflog entries in your repository may be expired by `git gc`. If B0 no longer appears in the reflog of the remote-tracking branch `origin/master`, the `--fork-point` mode obviously cannot find it and fails, avoiding to give a random and useless result (such as the parent of B0, like the same command without the `--fork-point` option gives)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:221
+#: en/git-merge-base.txt:237
#, priority:100
msgid "Also, the remote-tracking branch you use the `--fork-point` mode with must be the one your topic forked from its tip. If you forked from an older commit than the tip, this mode would not find the fork point (imagine in the above sample history B0 did not exist, origin/master started at B1, moved to B2 and then B, and you forked your topic at origin/master^ when origin/master was B1; the shape of the history would be the same as above, without B0, and the parent of B1 is what `git merge-base origin/master topic` correctly finds, but the `--fork-point` mode will not, because it is not one of the commits that used to be at the tip of origin/master)."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:224
+#: en/git-merge-base.txt:240
#, no-wrap, priority:100
msgid "See also"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:228
+#: en/git-merge-base.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
msgstr "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
@@ -31407,31 +31690,31 @@ msgstr ""
msgid "Examples:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:62
+#. type: delimited block -
+#: en/git-merge-index.txt:63
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
-" This is MM from the original tree.\t\t\t# original\n"
-" This is modified MM in the branch A.\t\t\t# merge1\n"
-" This is modified MM in the branch B.\t\t\t# merge2\n"
-" This is modified MM in the branch B.\t\t\t# current contents\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
+"This is MM from the original tree.\t\t# original\n"
+"This is modified MM in the branch A.\t\t# merge1\n"
+"This is modified MM in the branch B.\t\t# merge2\n"
+"This is modified MM in the branch B.\t\t# current contents\n"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:71
+#. type: delimited block -
+#: en/git-merge-index.txt:74
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
-" cat: : No such file or directory\n"
-" This is added AA in the branch A.\n"
-" This is added AA in the branch B.\n"
-" This is added AA in the branch B.\n"
-" fatal: merge program failed\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
+"cat: : No such file or directory\n"
+"This is added AA in the branch A.\n"
+"This is added AA in the branch B.\n"
+"This is added AA in the branch B.\n"
+"fatal: merge program failed\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-index.txt:76
+#: en/git-merge-index.txt:80
#, priority:100
msgid "where the latter example shows how 'git merge-index' will stop trying to merge once anything has returned an error (i.e., `cat` returned an error for the AA file, because it didn't exist in the original, and thus 'git merge-index' didn't even try to merge the MM thing)."
msgstr ""
@@ -31729,7 +32012,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n"
-"\t[-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
+"\t[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
"\t[--[no-]allow-unrelated-histories]\n"
"\t[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]\n"
"'git merge' (--continue | --abort | --quit)\n"
@@ -32810,7 +33093,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:281 en/merge-options.txt:108
+#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -33790,7 +34073,7 @@ msgid "Conflicts can occur when applying a commit to p4. When this happens, the
msgstr ""
#. type: Labeled list
-#: en/git-p4.txt:359 en/git-submodule.txt:270
+#: en/git-p4.txt:359 en/git-submodule.txt:271
#, no-wrap, priority:220
msgid "--branch <branch>"
msgstr ""
@@ -34926,7 +35209,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:263 en/rev-list-options.txt:760
+#: en/git-pack-objects.txt:263 en/rev-list-options.txt:776
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -34938,13 +35221,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:266 en/rev-list-options.txt:767
+#: en/git-pack-objects.txt:266 en/rev-list-options.txt:783
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:269 en/rev-list-options.txt:770
+#: en/git-pack-objects.txt:269 en/rev-list-options.txt:786
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -34956,7 +35239,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:276 en/rev-list-options.txt:777
+#: en/git-pack-objects.txt:276 en/rev-list-options.txt:793
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -34968,7 +35251,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:281 en/rev-list-options.txt:785
+#: en/git-pack-objects.txt:281 en/rev-list-options.txt:801
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -35727,13 +36010,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:502
+#: en/git-pull.txt:136 en/git-rebase.txt:524
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:503
+#: en/git-pull.txt:137 en/git-rebase.txt:525
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -37526,8 +37809,8 @@ msgstr ""
#: en/git-rebase.txt:16
#, no-wrap, priority:100
msgid ""
-"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
-"\t[<upstream> [<branch>]]\n"
+"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>]\n"
+"\t[--onto <newbase> | --keep-base] [<upstream> [<branch>]]\n"
"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
"\t--root [<branch>]\n"
"'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch)\n"
@@ -37846,512 +38129,542 @@ msgstr ""
msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:220
+#, ignore-same, no-wrap, priority:100
+msgid "--keep-base"
+msgstr "--keep-base"
+
#. type: Plain text
-#: en/git-rebase.txt:224
+#: en/git-rebase.txt:225
+#, ignore-ellipsis, priority:100
+msgid "Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running 'git rebase --keep-base <upstream> <branch>' is equivalent to running 'git rebase --onto <upstream>... <upstream>'."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:230
+#, priority:100
+msgid "This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:235
+#, priority:100
+msgid "Although both this option and --fork-point find the merge base between <upstream> and <branch>, this option uses the merge base as the _starting point_ on which new commits will be created, whereas --fork-point uses the merge base to determine the _set of commits_ which will be rebased."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#, priority:100
+msgid "See also INCOMPATIBLE OPTIONS below."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:242
#, priority:100
msgid "Upstream branch to compare against. May be any valid commit, not just an existing branch name. Defaults to the configured upstream for the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:230
+#: en/git-rebase.txt:248
#, priority:100
msgid "Restart the rebasing process after having resolved a merge conflict."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237
+#: en/git-rebase.txt:255
#, priority:100
msgid "Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:242
+#: en/git-rebase.txt:260
#, priority:100
msgid "Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:243 en/git-rebase.txt:538
+#: en/git-rebase.txt:261 en/git-rebase.txt:560
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:246
+#: en/git-rebase.txt:264
#, priority:100
msgid "Keep the commits that do not change anything from its parents in the result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:248 en/git-rebase.txt:255 en/git-rebase.txt:280 en/git-rebase.txt:293 en/git-rebase.txt:302 en/git-rebase.txt:344 en/git-rebase.txt:379 en/git-rebase.txt:386 en/git-rebase.txt:393 en/git-rebase.txt:405 en/git-rebase.txt:445 en/git-rebase.txt:470 en/git-rebase.txt:482 en/git-rebase.txt:501
-#, priority:100
-msgid "See also INCOMPATIBLE OPTIONS below."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rebase.txt:253
+#: en/git-rebase.txt:271
#, priority:100
msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:258
+#: en/git-rebase.txt:276
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:259 en/git-rebase.txt:539
+#: en/git-rebase.txt:277 en/git-rebase.txt:561
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:261
+#: en/git-rebase.txt:279
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:266
+#: en/git-rebase.txt:284
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:272
+#: en/git-rebase.txt:290
#, priority:100
msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:278
+#: en/git-rebase.txt:296
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:286
+#: en/git-rebase.txt:304
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:291
+#: en/git-rebase.txt:309
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:294
+#: en/git-rebase.txt:312
#, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:295
+#: en/git-rebase.txt:313
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:300
+#: en/git-rebase.txt:318
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:317
+#: en/git-rebase.txt:335
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:321
+#: en/git-rebase.txt:339
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:325
+#: en/git-rebase.txt:343
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:329
+#: en/git-rebase.txt:347
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:332
+#: en/git-rebase.txt:350
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:333 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:336
+#: en/git-rebase.txt:354
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:345 en/merge-options.txt:47
+#: en/git-rebase.txt:363 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:346
+#: en/git-rebase.txt:364
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:351
+#: en/git-rebase.txt:369
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:357
+#: en/git-rebase.txt:375
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:359
+#: en/git-rebase.txt:377
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:363
+#: en/git-rebase.txt:381
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:387
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:372
+#: en/git-rebase.txt:390
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:394
+#, priority:100
+msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:399
#, priority:100
msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:384
+#: en/git-rebase.txt:406
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:391
+#: en/git-rebase.txt:413
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:421
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:403
+#: en/git-rebase.txt:425
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:407
+#: en/git-rebase.txt:429
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:415
+#: en/git-rebase.txt:437
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:422
+#: en/git-rebase.txt:444
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:426
+#: en/git-rebase.txt:448
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges`, but in contrast to that option works well in interactive rebases: commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:430
+#: en/git-rebase.txt:452
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:432
+#: en/git-rebase.txt:454
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:434 en/git-rebase.txt:535 en/git-svn.txt:680
+#: en/git-rebase.txt:456 en/git-rebase.txt:557 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:439
+#: en/git-rebase.txt:461
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:443
+#: en/git-rebase.txt:465
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:446
+#: en/git-rebase.txt:468
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:447
+#: en/git-rebase.txt:469
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:474
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:455
+#: en/git-rebase.txt:477
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:457
+#: en/git-rebase.txt:479
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:459
+#: en/git-rebase.txt:481
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:483
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:487
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:490
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:480
+#: en/git-rebase.txt:502
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:505
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:484
+#: en/git-rebase.txt:506
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:495
+#: en/git-rebase.txt:517
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:499
+#: en/git-rebase.txt:521
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:509
+#: en/git-rebase.txt:531
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:510
+#: en/git-rebase.txt:532
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:511
+#: en/git-rebase.txt:533
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:514
+#: en/git-rebase.txt:536
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:516
+#: en/git-rebase.txt:538
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:519
+#: en/git-rebase.txt:541
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:523
+#: en/git-rebase.txt:545
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:527
+#: en/git-rebase.txt:549
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:530
+#: en/git-rebase.txt:552
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:553
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:555
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Plain text
-#: en/git-rebase.txt:534
+#: en/git-rebase.txt:556
#, ignore-same, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:537
+#: en/git-rebase.txt:559
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:540
+#: en/git-rebase.txt:562
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:542
+#: en/git-rebase.txt:564
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:544
+#: en/git-rebase.txt:566
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:567
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:546
+#: en/git-rebase.txt:568
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:547
+#: en/git-rebase.txt:569
#, priority:100
-msgid "--rebase-merges and --strategy"
+msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:548
+#: en/git-rebase.txt:570
#, priority:100
-msgid "--rebase-merges and --strategy-option"
+msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:550
+#: en/git-rebase.txt:572
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:575
#, no-wrap, priority:100
msgid "There are some subtle differences how the backends behave.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:556
+#: en/git-rebase.txt:578
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38359,7 +38672,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:561
+#: en/git-rebase.txt:583
#, no-wrap, priority:100
msgid ""
"The am backend drops any \"empty\" commits, regardless of whether the\n"
@@ -38369,7 +38682,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:588
#, no-wrap, priority:100
msgid ""
"The interactive backend drops commits by default that\n"
@@ -38379,7 +38692,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:591
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38387,7 +38700,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:573
+#: en/git-rebase.txt:595
#, no-wrap, priority:100
msgid ""
"Directory rename heuristics are enabled in the merge and interactive\n"
@@ -38396,145 +38709,145 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:597
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:577
+#: en/git-rebase.txt:599
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:582
+#: en/git-rebase.txt:604
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:587
+#: en/git-rebase.txt:609
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:589
+#: en/git-rebase.txt:611
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:596
+#: en/git-rebase.txt:618
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:598
+#: en/git-rebase.txt:620
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:600
+#: en/git-rebase.txt:622
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:601
+#: en/git-rebase.txt:623
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:602
+#: en/git-rebase.txt:624
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:603
+#: en/git-rebase.txt:625
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:605
+#: en/git-rebase.txt:627
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:607
+#: en/git-rebase.txt:629
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:631
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:610
+#: en/git-rebase.txt:632
#, priority:100
msgid "commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:612
+#: en/git-rebase.txt:634
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:614
+#: en/git-rebase.txt:636
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:615
+#: en/git-rebase.txt:637
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:616
+#: en/git-rebase.txt:638
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:644
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:646
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:626
+#: en/git-rebase.txt:648
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:653
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:658
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -38543,73 +38856,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:641
+#: en/git-rebase.txt:663
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:668
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:649
+#: en/git-rebase.txt:671
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:652
+#: en/git-rebase.txt:674
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:655
+#: en/git-rebase.txt:677
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:685
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:667
+#: en/git-rebase.txt:689
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:693
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:696
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:699
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:680
+#: en/git-rebase.txt:702
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:687
+#: en/git-rebase.txt:709
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -38620,25 +38933,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:691
+#: en/git-rebase.txt:713
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:694
+#: en/git-rebase.txt:716
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:701
+#: en/git-rebase.txt:723
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:710
+#: en/git-rebase.txt:732
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -38651,31 +38964,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:715
+#: en/git-rebase.txt:737
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:720
+#: en/git-rebase.txt:742
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:745
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:727
+#: en/git-rebase.txt:749
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:759
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -38689,85 +39002,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:740
+#: en/git-rebase.txt:762
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:746
+#: en/git-rebase.txt:768
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:750
+#: en/git-rebase.txt:772
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:752
+#: en/git-rebase.txt:774
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:756
+#: en/git-rebase.txt:778
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:760
+#: en/git-rebase.txt:782
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:763
+#: en/git-rebase.txt:785
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:765
+#: en/git-rebase.txt:787
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:767
+#: en/git-rebase.txt:789
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:794
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:775
+#: en/git-rebase.txt:797
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:804
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:809
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:816
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38778,13 +39091,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:819
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:826
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38795,13 +39108,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:808
+#: en/git-rebase.txt:830
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:815
+#: en/git-rebase.txt:837
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38812,73 +39125,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:822
+#: en/git-rebase.txt:844
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:824
+#: en/git-rebase.txt:846
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:825
+#: en/git-rebase.txt:847
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:829
+#: en/git-rebase.txt:851
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:836
+#: en/git-rebase.txt:859
#, priority:100
-msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or `filter-branch`."
+msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:839
+#: en/git-rebase.txt:862
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:867
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:848
+#: en/git-rebase.txt:871
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:850
+#: en/git-rebase.txt:873
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:875
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:858
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38889,19 +39202,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:885
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:866
+#: en/git-rebase.txt:889
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:894
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -38911,67 +39224,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:876
+#: en/git-rebase.txt:899
#, priority:100
-msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge-base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
+msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:880
+#: en/git-rebase.txt:903
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:883
+#: en/git-rebase.txt:906
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:886
+#: en/git-rebase.txt:909
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:888
+#: en/git-rebase.txt:911
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:893
+#: en/git-rebase.txt:916
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:895
+#: en/git-rebase.txt:918
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:926
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:907
+#: en/git-rebase.txt:930
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:912
+#: en/git-rebase.txt:935
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:922
+#: en/git-rebase.txt:945
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -38985,25 +39298,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:929
+#: en/git-rebase.txt:952
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:932
+#: en/git-rebase.txt:955
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:935 en/git-rebase.txt:1012
+#: en/git-rebase.txt:958 en/git-rebase.txt:1035
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:941
+#: en/git-rebase.txt:964
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39014,7 +39327,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:946
+#: en/git-rebase.txt:969
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39024,7 +39337,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:950
+#: en/git-rebase.txt:973
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39033,55 +39346,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:954
+#: en/git-rebase.txt:977
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:962
+#: en/git-rebase.txt:985
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:992
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:975
+#: en/git-rebase.txt:998
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:978
+#: en/git-rebase.txt:1001
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1008
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:989
+#: en/git-rebase.txt:1012
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:996
+#: en/git-rebase.txt:1019
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1003
+#: en/git-rebase.txt:1026
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39092,13 +39405,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1009
+#: en/git-rebase.txt:1032
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1015
+#: en/git-rebase.txt:1038
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39106,7 +39419,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1022
+#: en/git-rebase.txt:1045
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39118,7 +39431,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1049
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39127,37 +39440,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1035
+#: en/git-rebase.txt:1058
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1037
+#: en/git-rebase.txt:1060
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1039
+#: en/git-rebase.txt:1062
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1043
+#: en/git-rebase.txt:1066
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1068
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1072
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -39465,117 +39778,118 @@ msgstr ""
msgid "Using this hook, it is easy to generate mails describing the updates to the repository. This example script sends one mail message per ref listing the commits pushed to the repository, and logs the push certificates of signed pushes with good signatures to a logger service:"
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:191
+#. type: delimited block -
+#: en/git-receive-pack.txt:192
#, no-wrap, priority:100
msgid ""
-"\t#!/bin/sh\n"
-"\t# mail out commit update information.\n"
-"\twhile read oval nval ref\n"
-"\tdo\n"
-"\t\tif expr \"$oval\" : '0*$' >/dev/null\n"
-"\t\tthen\n"
-"\t\t\techo \"Created a new ref, with the following commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\"\n"
-"\t\telse\n"
-"\t\t\techo \"New commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
-"\t\tfi |\n"
-"\t\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
-"\tdone\n"
-"\t# log signed push certificate, if any\n"
-"\tif test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"#!/bin/sh\n"
+"# mail out commit update information.\n"
+"while read oval nval ref\n"
+"do\n"
+"\tif expr \"$oval\" : '0*$' >/dev/null\n"
"\tthen\n"
-"\t\t(\n"
-"\t\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
-"\t\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
-"\t\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
-"\tfi\n"
-"\texit 0\n"
+"\t\techo \"Created a new ref, with the following commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\"\n"
+"\telse\n"
+"\t\techo \"New commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
+"\tfi |\n"
+"\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
+"done\n"
+"# log signed push certificate, if any\n"
+"if test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"then\n"
+"\t(\n"
+"\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
+"\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
+"\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
+"fi\n"
+"exit 0\n"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:194
+#: en/git-receive-pack.txt:196
#, priority:100
msgid "The exit code from this hook invocation is ignored, however a non-zero exit code will generate an error message."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:200
+#: en/git-receive-pack.txt:202
#, priority:100
msgid "Note that it is possible for refname to not have sha1-new when this hook runs. This can easily occur if another user modifies the ref after it was updated by 'git-receive-pack', but before the hook was able to evaluate it. It is recommended that hooks rely on sha1-new rather than the current value of refname."
msgstr ""
#. type: Title -
-#: en/git-receive-pack.txt:202
+#: en/git-receive-pack.txt:204
#, no-wrap, priority:100
msgid "POST-UPDATE HOOK"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:207
+#: en/git-receive-pack.txt:209
#, priority:100
msgid "After all other processing, if at least one ref was updated, and if $GIT_DIR/hooks/post-update file exists and is executable, then post-update will be called with the list of refs that have been updated. This can be used to implement any repository wide cleanup tasks."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:211
+#: en/git-receive-pack.txt:213
#, priority:100
msgid "The exit code from this hook invocation is ignored; the only thing left for 'git-receive-pack' to do at that point is to exit itself anyway."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:214
+#: en/git-receive-pack.txt:216
#, priority:100
msgid "This hook can be used, for example, to run `git update-server-info` if the repository is packed and is served via a dumb transport."
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:217
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/git-receive-pack.txt:220
+#, fuzzy, no-wrap, priority:100
+#| msgid "git-update-server-info(1)"
msgid ""
-"\t#!/bin/sh\n"
-"\texec git update-server-info\n"
-msgstr ""
+"#!/bin/sh\n"
+"exec git update-server-info\n"
+msgstr "git-update-server-info(1)"
#. type: Title -
-#: en/git-receive-pack.txt:220
+#: en/git-receive-pack.txt:224
#, no-wrap, priority:100
msgid "QUARANTINE ENVIRONMENT"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:227
+#: en/git-receive-pack.txt:231
#, priority:100
msgid "When `receive-pack` takes in objects, they are placed into a temporary \"quarantine\" directory within the `$GIT_DIR/objects` directory and migrated into the main object store only after the `pre-receive` hook has completed. If the push fails before then, the temporary directory is removed entirely."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:229
+#: en/git-receive-pack.txt:233
#, priority:100
msgid "This has a few user-visible effects and caveats:"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:235
+#: en/git-receive-pack.txt:239
#, priority:100
msgid "Pushes which fail due to problems with the incoming pack, missing objects, or due to the `pre-receive` hook will not leave any on-disk data. This is usually helpful to prevent repeated failed pushes from filling up your disk, but can make debugging more challenging."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:238
+#: en/git-receive-pack.txt:242
#, priority:100
msgid "Any objects created by the `pre-receive` hook will be created in the quarantine directory (and migrated only if it succeeds)."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:244
+#: en/git-receive-pack.txt:248
#, priority:100
msgid "The `pre-receive` hook MUST NOT update any refs to point to quarantined objects. Other programs accessing the repository will not be able to see the objects (and if the pre-receive hook fails, those refs would become corrupted). For safety, any ref updates from within `pre-receive` are automatically rejected."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:249
+#: en/git-receive-pack.txt:253
#, ignore-same, priority:100
msgid "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
msgstr "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
@@ -40903,7 +41217,7 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:131
#, priority:100
-msgid "linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and linkgit:git-rebase[1], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
+msgid "linkgit:git-hash-object[1], linkgit:git-rebase[1], and https://github.com/newren/git-filter-repo[git-filter-repo], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
msgstr ""
#. type: Plain text
@@ -40926,9 +41240,10 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:158
-#, priority:100
-msgid "linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1]"
-msgstr ""
+#, fuzzy, priority:100
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] https://github.com/newren/git-filter-repo[git-filter-repo]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title =
#: en/git-request-pull.txt:2
@@ -41720,7 +42035,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:228 en/git-stash.txt:229
+#: en/git-reset.txt:228 en/git-stash.txt:230
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -42447,102 +42762,49 @@ msgid "git-rev-list - Lists commit objects in reverse chronological order"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:65
+#: en/git-rev-list.txt:13
#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"'git rev-list' [ --max-count=<number> ]\n"
-"\t [ --skip=<number> ]\n"
-"\t [ --max-age=<timestamp> ]\n"
-"\t [ --min-age=<timestamp> ]\n"
-"\t [ --sparse ]\n"
-"\t [ --merges ]\n"
-"\t [ --no-merges ]\n"
-"\t [ --min-parents=<number> ]\n"
-"\t [ --no-min-parents ]\n"
-"\t [ --max-parents=<number> ]\n"
-"\t [ --no-max-parents ]\n"
-"\t [ --first-parent ]\n"
-"\t [ --remove-empty ]\n"
-"\t [ --full-history ]\n"
-"\t [ --not ]\n"
-"\t [ --all ]\n"
-"\t [ --branches[=<pattern>] ]\n"
-"\t [ --tags[=<pattern>] ]\n"
-"\t [ --remotes[=<pattern>] ]\n"
-"\t [ --glob=<glob-pattern> ]\n"
-"\t [ --ignore-missing ]\n"
-"\t [ --stdin ]\n"
-"\t [ --quiet ]\n"
-"\t [ --topo-order ]\n"
-"\t [ --parents ]\n"
-"\t [ --timestamp ]\n"
-"\t [ --left-right ]\n"
-"\t [ --left-only ]\n"
-"\t [ --right-only ]\n"
-"\t [ --cherry-mark ]\n"
-"\t [ --cherry-pick ]\n"
-"\t [ --encoding=<encoding> ]\n"
-"\t [ --(author|committer|grep)=<pattern> ]\n"
-"\t [ --regexp-ignore-case | -i ]\n"
-"\t [ --extended-regexp | -E ]\n"
-"\t [ --fixed-strings | -F ]\n"
-"\t [ --date=<format>]\n"
-"\t [ [ --objects | --objects-edge | --objects-edge-aggressive ]\n"
-"\t [ --unpacked ]\n"
-"\t [ --object-names | --no-object-names ]\n"
-"\t [ --filter=<filter-spec> [ --filter-print-omitted ] ] ]\n"
-"\t [ --missing=<missing-action> ]\n"
-"\t [ --pretty | --header ]\n"
-"\t [ --bisect ]\n"
-"\t [ --bisect-vars ]\n"
-"\t [ --bisect-all ]\n"
-"\t [ --merge ]\n"
-"\t [ --reverse ]\n"
-"\t [ --walk-reflogs ]\n"
-"\t [ --no-walk ] [ --do-walk ]\n"
-"\t [ --count ]\n"
-"\t [ --use-bitmap-index ]\n"
-"\t <commit>... [ \\-- <paths>... ]\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:73
+msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rev-list.txt:21
#, priority:100
msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:80
+#: en/git-rev-list.txt:28
#, priority:100
msgid "You can think of this as a set operation. Commits given on the command line form a set of commits that are reachable from any of them, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:82
+#: en/git-rev-list.txt:30
#, priority:100
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:85
+#: en/git-rev-list.txt:33
#, no-wrap, priority:100
msgid "\t$ git rev-list foo bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:89
+#: en/git-rev-list.txt:37
#, priority:100
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:93
+#: en/git-rev-list.txt:41
#, priority:100
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:97
+#: en/git-rev-list.txt:45
#, no-wrap, priority:100
msgid ""
"\t$ git rev-list origin..HEAD\n"
@@ -42550,13 +42812,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:102
+#: en/git-rev-list.txt:50
#, ignore-ellipsis, priority:100
msgid "Another special notation is \"'<commit1>'...'<commit2>'\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:106
+#: en/git-rev-list.txt:54
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git rev-list A B --not $(git merge-base --all A B)\n"
@@ -42564,7 +42826,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:113
+#: en/git-rev-list.txt:61
#, priority:100
msgid "'rev-list' is a very essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For this reason, it has a lot of different options that enables it to be used by commands as different as 'git bisect' and 'git repack'."
msgstr ""
@@ -44686,31 +44948,31 @@ msgstr ""
msgid "To use 'git send-email' to send your patches through the GMail SMTP server, edit ~/.gitconfig to specify your account settings:"
msgstr ""
-#. type: Plain text
-#: en/git-send-email.txt:494
+#. type: delimited block -
+#: en/git-send-email.txt:495
#, no-wrap, priority:100
msgid ""
-"\t[sendemail]\n"
-"\t\tsmtpEncryption = tls\n"
-"\t\tsmtpServer = smtp.gmail.com\n"
-"\t\tsmtpUser = yourname@gmail.com\n"
-"\t\tsmtpServerPort = 587\n"
+"[sendemail]\n"
+"\tsmtpEncryption = tls\n"
+"\tsmtpServer = smtp.gmail.com\n"
+"\tsmtpUser = yourname@gmail.com\n"
+"\tsmtpServerPort = 587\n"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:498
+#: en/git-send-email.txt:500
#, priority:100
msgid "If you have multifactor authentication setup on your gmail account, you will need to generate an app-specific password for use with 'git send-email'. Visit https://security.google.com/settings/security/apppasswords to create it."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:501
+#: en/git-send-email.txt:503
#, priority:100
msgid "Once your commits are ready to be sent to the mailing list, run the following commands:"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:505
+#: en/git-send-email.txt:507
#, no-wrap, priority:100
msgid ""
"\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -44719,19 +44981,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:510
+#: en/git-send-email.txt:512
#, priority:100
msgid "The first time you run it, you will be prompted for your credentials. Enter the app-specific or your regular password as appropriate. If you have credential helper configured (see linkgit:git-credential[1]), the password will be saved in the credential store so you won't have to type it the next time."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:518
#, priority:100
msgid "Note: the following core Perl modules that may be installed with your distribution of Perl are required: MIME::Base64, MIME::QuotedPrint, Net::Domain and Net::SMTP. These additional Perl modules are also required: Authen::SASL and Mail::Address."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:521
+#: en/git-send-email.txt:523
#, priority:100
msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
msgstr ""
@@ -46320,25 +46582,25 @@ msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--a
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:92
+#: en/git-stash.txt:93
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs, and any non-option arguments form the message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:93
+#: en/git-stash.txt:94
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:100
+#: en/git-stash.txt:101
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:104
+#: en/git-stash.txt:105
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46346,139 +46608,139 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:108
+#: en/git-stash.txt:109
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:109
+#: en/git-stash.txt:110
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:119
+#: en/git-stash.txt:120
#, priority:240
msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:120
+#: en/git-stash.txt:121
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:126
+#: en/git-stash.txt:127
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:130
+#: en/git-stash.txt:131
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:135
+#: en/git-stash.txt:136
#, priority:240
msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:138
+#: en/git-stash.txt:139
#, priority:240
msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:139
+#: en/git-stash.txt:140
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:145
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:145
+#: en/git-stash.txt:146
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:153
+#: en/git-stash.txt:154
#, priority:240
msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:159
+#: en/git-stash.txt:160
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:160
+#: en/git-stash.txt:161
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:164
+#: en/git-stash.txt:165
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:165
+#: en/git-stash.txt:166
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:171
+#: en/git-stash.txt:172
#, priority:240
msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:172 en/git-update-ref.txt:100
+#: en/git-stash.txt:173 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:179
+#: en/git-stash.txt:180
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:180
+#: en/git-stash.txt:181
#, no-wrap, priority:240
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:186
+#: en/git-stash.txt:187
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:195
+#: en/git-stash.txt:196
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:199
+#: en/git-stash.txt:200
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46487,31 +46749,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:203
+#: en/git-stash.txt:204
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:208
+#: en/git-stash.txt:209
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:214
+#: en/git-stash.txt:215
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:219
+#: en/git-stash.txt:220
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:227
+#: en/git-stash.txt:228
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -46523,13 +46785,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:235
+#: en/git-stash.txt:236
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:246
+#: en/git-stash.txt:247
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46544,13 +46806,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:249
+#: en/git-stash.txt:250
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:257
+#: en/git-stash.txt:258
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46562,19 +46824,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:259
+#: en/git-stash.txt:260
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:264
+#: en/git-stash.txt:265
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:275
+#: en/git-stash.txt:276
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46589,19 +46851,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:277
+#: en/git-stash.txt:278
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:283
+#: en/git-stash.txt:284
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:288
+#: en/git-stash.txt:289
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -46610,7 +46872,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:298
+#: en/git-stash.txt:299
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -46688,61 +46950,61 @@ msgid "In addition to the names of files that have been changed, also show the t
msgstr ""
#. type: Plain text
-#: en/git-status.txt:65
+#: en/git-status.txt:66
#, priority:280
msgid "The mode parameter is used to specify the handling of untracked files. It is optional: it defaults to 'all', and if specified, it must be stuck to the option (e.g. `-uno`, but not `-u no`)."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:69
+#: en/git-status.txt:70
#, no-wrap, priority:280
msgid "'no' - Show no untracked files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:70
+#: en/git-status.txt:71
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:81
+#: en/git-status.txt:82
#, priority:280
msgid "When `-u` option is not used, untracked files and directories are shown (i.e. the same as specifying `normal`), to help you avoid forgetting to add newly created files. Because it takes extra work to find untracked files in the filesystem, this mode may take some time in a large working tree. Consider enabling untracked cache and split index if supported (see `git update-index --untracked-cache` and `git update-index --split-index`), Otherwise you can use `no` to have `git status` return more quickly without showing untracked files."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:99
+#: en/git-status.txt:101
#, priority:280
msgid "Ignore changes to submodules when looking for changes. <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 before 1.7.0). Using \"all\" hides all changes to submodules (and suppresses the output of submodule summaries when the config option `status.submoduleSummary` is set)."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:100
+#: en/git-status.txt:102
#, no-wrap, priority:280
msgid "--ignored[=<mode>]"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:102
+#: en/git-status.txt:104
#, priority:280
msgid "Show ignored files as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:105
+#: en/git-status.txt:108
#, priority:280
msgid "The mode parameter is used to specify the handling of ignored files. It is optional: it defaults to 'traditional'."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:109
+#: en/git-status.txt:112
#, priority:280
msgid "'traditional' - Shows ignored files and directories, unless"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:112
+#: en/git-status.txt:115
#, no-wrap, priority:280
msgid ""
"--untracked-files=all is specified, in which case\n"
@@ -46751,109 +47013,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:113
+#: en/git-status.txt:116
#, no-wrap, priority:280
msgid "'no'\t - Show no ignored files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:114
+#: en/git-status.txt:117
#, no-wrap, priority:280
msgid "'matching' - Shows ignored files and directories matching an\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:115
+#: en/git-status.txt:118
#, no-wrap, priority:280
msgid "ignore pattern.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:121
+#: en/git-status.txt:124
#, priority:280
msgid "When 'matching' mode is specified, paths that explicitly match an ignored pattern are shown. If a directory matches an ignore pattern, then it is shown, but not paths contained in the ignored directory. If a directory does not match an ignore pattern, but all contents are ignored, then the directory is not shown, but all contents are shown."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:125
+#: en/git-status.txt:129
#, priority:280
msgid "Terminate entries with NUL, instead of LF. This implies the `--porcelain=v1` output format if no other format is given."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:132
+#: en/git-status.txt:136
#, priority:280
msgid "Display untracked files in columns. See configuration variable column.status for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:133
+#: en/git-status.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--ahead-behind"
msgstr "--ahead-behind"
#. type: Labeled list
-#: en/git-status.txt:134
+#: en/git-status.txt:138
#, ignore-same, no-wrap, priority:280
msgid "--no-ahead-behind"
msgstr "--no-ahead-behind"
#. type: Plain text
-#: en/git-status.txt:137
+#: en/git-status.txt:141
#, priority:280
msgid "Display or do not display detailed ahead/behind counts for the branch relative to its upstream branch. Defaults to true."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:138
+#: en/git-status.txt:142
#, ignore-same, no-wrap, priority:280
msgid "--renames"
msgstr "--renames"
#. type: Plain text
-#: en/git-status.txt:142
+#: en/git-status.txt:146
#, priority:280
msgid "Turn on/off rename detection regardless of user configuration. See also linkgit:git-diff[1] `--no-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:147
+#: en/git-status.txt:151
#, priority:280
msgid "Turn on rename detection, optionally setting the similarity threshold. See also linkgit:git-diff[1] `--find-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:150
+#: en/git-status.txt:154
#, priority:280
msgid "See the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:158
+#: en/git-status.txt:162
#, priority:280
msgid "The output from this command is designed to be used as a commit template comment. The default, long format, is designed to be human readable, verbose and descriptive. Its contents and format are subject to change at any time."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:163
+#: en/git-status.txt:167
#, priority:280
msgid "The paths mentioned in the output, unlike many other Git commands, are made relative to the current directory if you are working in a subdirectory (this is on purpose, to help cutting and pasting). See the status.relativePaths config option below."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:165
+#: en/git-status.txt:169
#, no-wrap, priority:280
msgid "Short Format"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:169
+#: en/git-status.txt:173
#, priority:280
msgid "In the short-format, the status of each path is shown as one of these forms"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:172
+#: en/git-status.txt:176
#, no-wrap, priority:280
msgid ""
"\tXY PATH\n"
@@ -46861,73 +47123,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:176
+#: en/git-status.txt:180
#, priority:280
msgid "where `ORIG_PATH` is where the renamed/copied contents came from. `ORIG_PATH` is only shown when the entry is renamed or copied. The `XY` is a two-letter status code."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:182
+#: en/git-status.txt:186
#, priority:280
msgid "The fields (including the `->`) are separated from each other by a single space. If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash-escaped."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:188
+#: en/git-status.txt:192
#, priority:280
msgid "For paths with merge conflicts, `X` and `Y` show the modification states of each side of the merge. For paths that do not have merge conflicts, `X` shows the status of the index, and `Y` shows the status of the work tree. For untracked paths, `XY` are `??`. Other status codes can be interpreted as follows:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:190
+#: en/git-status.txt:194
#, priority:280
msgid "' ' = unmodified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:191
+#: en/git-status.txt:195
#, priority:280
msgid "'M' = modified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:192
+#: en/git-status.txt:196
#, priority:280
msgid "'A' = added"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:193
+#: en/git-status.txt:197
#, priority:280
msgid "'D' = deleted"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:194
+#: en/git-status.txt:198
#, priority:280
msgid "'R' = renamed"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:195
+#: en/git-status.txt:199
#, priority:280
msgid "'C' = copied"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:196
+#: en/git-status.txt:200
#, priority:280
msgid "'U' = updated but unmerged"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:199
+#: en/git-status.txt:203
#, priority:280
msgid "Ignored files are not listed, unless `--ignored` option is in effect, in which case `XY` are `!!`."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:226
+#: en/git-status.txt:230
#, no-wrap, priority:280
msgid ""
"X Y Meaning\n"
@@ -46958,7 +47220,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:235
+#: en/git-status.txt:239
#, no-wrap, priority:280
msgid ""
"Submodules have more state and instead report\n"
@@ -46971,91 +47233,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:238
+#: en/git-status.txt:242
#, priority:280
msgid "'m' and '?' are applied recursively. For example if a nested submodule in a submodule contains an untracked file, this is reported as '?' as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:240
+#: en/git-status.txt:244
#, priority:280
msgid "If -b is used the short-format status is preceded by a line"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:242
+#: en/git-status.txt:246
#, no-wrap, priority:280
msgid " ## branchname tracking info\n"
msgstr ""
#. type: Title ~
-#: en/git-status.txt:244
+#: en/git-status.txt:248
#, no-wrap, priority:280
msgid "Porcelain Format Version 1"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:251
+#: en/git-status.txt:255
#, priority:280
msgid "Version 1 porcelain format is similar to the short format, but is guaranteed not to change in a backwards-incompatible way between Git versions or based on user configuration. This makes it ideal for parsing by scripts. The description of the short format above also describes the porcelain format, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:254
+#: en/git-status.txt:258
#, priority:280
msgid "The user's color.status configuration is not respected; color will always be off."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:257
+#: en/git-status.txt:261
#, priority:280
msgid "The user's status.relativePaths configuration is not respected; paths shown will always be relative to the repository root."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:267
+#: en/git-status.txt:271
#, priority:280
msgid "There is also an alternate -z format recommended for machine parsing. In that format, the status field is the same, but some other things change. First, the '\\->' is omitted from rename entries and the field order is reversed (e.g 'from \\-> to' becomes 'to from'). Second, a NUL (ASCII 0) follows each filename, replacing space as a field separator and the terminating newline (but a space still separates the status field from the first filename). Third, filenames containing special characters are not specially formatted; no quoting or backslash-escaping is performed."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:269
+#: en/git-status.txt:273
#, priority:280
msgid "Any submodule changes are reported as modified `M` instead of `m` or single `?`."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:271
+#: en/git-status.txt:275
#, no-wrap, priority:280
msgid "Porcelain Format Version 2"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:276
+#: en/git-status.txt:280
#, priority:280
msgid "Version 2 format adds more detailed information about the state of the worktree and changed items. Version 2 also defines an extensible set of easy to parse optional headers."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:280
+#: en/git-status.txt:284
#, priority:280
msgid "Header lines start with \"#\" and are added in response to specific command line arguments. Parsers should ignore headers they don't recognize."
msgstr ""
#. type: Title ^
-#: en/git-status.txt:282
+#: en/git-status.txt:286
#, no-wrap, priority:280
msgid "Branch Headers"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:286
+#: en/git-status.txt:290
#, priority:280
msgid "If `--branch` is given, a series of header lines are printed with information about the current branch."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:296
+#: en/git-status.txt:300
#, no-wrap, priority:280
msgid ""
"Line Notes\n"
@@ -47069,43 +47331,43 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:299
+#: en/git-status.txt:303
#, no-wrap, priority:280
msgid "Changed Tracked Entries"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:306
+#: en/git-status.txt:310
#, priority:280
msgid "Following the headers, a series of lines are printed for tracked entries. One of three different line formats may be used to describe an entry depending on the type of change. Tracked entries are printed in an undefined order; parsers should allow for a mixture of the 3 line types in any order."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:308
+#: en/git-status.txt:312
#, priority:280
msgid "Ordinary changed entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:310
+#: en/git-status.txt:314
#, no-wrap, priority:280
msgid " 1 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:312
+#: en/git-status.txt:316
#, priority:280
msgid "Renamed or copied entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:314
+#: en/git-status.txt:318
#, no-wrap, priority:280
msgid " 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:345
+#: en/git-status.txt:349
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47140,19 +47402,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:349
+#: en/git-status.txt:353
#, priority:280
msgid "Unmerged entries have the following format; the first character is a \"u\" to distinguish from ordinary changed entries."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:351
+#: en/git-status.txt:355
#, no-wrap, priority:280
msgid " u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:368
+#: en/git-status.txt:372
#, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47173,85 +47435,85 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:371
+#: en/git-status.txt:375
#, no-wrap, priority:280
msgid "Other Items"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:376
+#: en/git-status.txt:380
#, priority:280
msgid "Following the tracked entries (and if requested), a series of lines will be printed for untracked and then ignored items found in the worktree."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:378
+#: en/git-status.txt:382
#, priority:280
msgid "Untracked items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:380
+#: en/git-status.txt:384
#, no-wrap, priority:280
msgid " ? <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:382
+#: en/git-status.txt:386
#, priority:280
msgid "Ignored items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:384
+#: en/git-status.txt:388
#, no-wrap, priority:280
msgid " ! <path>\n"
msgstr ""
#. type: Title ^
-#: en/git-status.txt:386
+#: en/git-status.txt:390
#, no-wrap, priority:280
msgid "Pathname Format Notes and -z"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:391
+#: en/git-status.txt:395
#, priority:280
msgid "When the `-z` option is given, pathnames are printed as is and without any quoting and lines are terminated with a NUL (ASCII 0x00) byte."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:395
+#: en/git-status.txt:399
#, 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])."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:404
+#: en/git-status.txt:408
#, priority:280
msgid "The command honors `color.status` (or `status.color` -- they mean the same thing and the latter is kept for backward compatibility) and `color.status.<slot>` configuration variables to colorize its output."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:408
+#: en/git-status.txt:412
#, priority:280
msgid "If the config variable `status.relativePaths` is set to false, then all paths shown are relative to the repository root, not to the current directory."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:419
+#: en/git-status.txt:423
#, priority:280
msgid "If `status.submoduleSummary` is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). Please note that the summary output from the status command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings."
msgstr ""
#. type: Title -
-#: en/git-status.txt:421
+#: en/git-status.txt:425
#, no-wrap, priority:280
msgid "BACKGROUND REFRESH"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:432
+#: en/git-status.txt:436
#, priority:280
msgid "By default, `git status` will automatically refresh the index, updating the cached stat information from the working tree and writing out the result. Writing out the updated index is an optimization that isn't strictly necessary (`status` computes the values for itself, but writing them out is just to save subsequent programs from repeating our computation). When `status` is run in the background, the lock held during the write may conflict with other simultaneous processes, causing them to fail. Scripts running `status` in the background should consider using `git --no-optional-locks status` (see linkgit:git[1] for details)."
msgstr ""
@@ -47695,281 +47957,287 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:176
#, no-wrap, priority:220
-msgid "set-branch ((-d|--default)|(-b|--branch <branch>)) [--] <path>"
+msgid "set-branch (-b|--branch) <branch> [--] <path>"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-submodule.txt:177
+#, no-wrap, priority:220
+msgid "set-branch (-d|--default) [--] <path>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:181
+#: en/git-submodule.txt:182
#, priority:220
msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:182
+#: en/git-submodule.txt:183
#, ignore-ellipsis, no-wrap, priority:220
msgid "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:191
+#: en/git-submodule.txt:192
#, priority:220
msgid "Show commit summary between the given commit (defaults to HEAD) and working tree/index. For a submodule in question, a series of commits in the submodule between the given super project commit and the index or working tree (switched by `--cached`) are shown. If the option `--files` is given, show the series of commits in the submodule between the index of the super project and the working tree of the submodule (this option doesn't allow to use the `--cached` option or to provide an explicit commit)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:194
+#: en/git-submodule.txt:195
#, priority:220
msgid "Using the `--submodule=log` option with linkgit:git-diff[1] will provide that information too."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:195
+#: en/git-submodule.txt:196
#, no-wrap, priority:220
msgid "foreach [--recursive] <command>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:216
+#: en/git-submodule.txt:217
#, priority:220
msgid "Evaluates an arbitrary shell command in each checked out submodule. The command has access to the variables $name, $sm_path, $displaypath, $sha1 and $toplevel: $name is the name of the relevant submodule section in `.gitmodules`, $sm_path is the path of the submodule as recorded in the immediate superproject, $displaypath contains the relative path from the current working directory to the submodules root directory, $sha1 is the commit as recorded in the immediate superproject, and $toplevel is the absolute path to the top-level of the immediate superproject. Note that to avoid conflicts with '$PATH' on Windows, the '$path' variable is now a deprecated synonym of '$sm_path' variable. Any submodules defined in the superproject but not checked out are ignored by this command. Unless given `--quiet`, foreach prints the name of each submodule before evaluating the command. If `--recursive` is given, submodules are traversed recursively (i.e. the given shell command is evaluated in nested submodules as well). A non-zero return from the command in any submodule causes the processing to terminate. This can be overridden by adding '|| :' to the end of the command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:219
+#: en/git-submodule.txt:220
#, priority:220
msgid "As an example, the command below will show the path and currently checked out commit for each submodule:"
msgstr ""
#. type: delimited block -
-#: en/git-submodule.txt:222
+#: en/git-submodule.txt:223
#, no-wrap, priority:220
msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:224
+#: en/git-submodule.txt:225
#, ignore-ellipsis, no-wrap, priority:220
msgid "sync [--recursive] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:231
+#: en/git-submodule.txt:232
#, priority:220
msgid "Synchronizes submodules' remote URL configuration setting to the value specified in `.gitmodules`. It will only affect those submodules which already have a URL entry in .git/config (that is the case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:234
+#: en/git-submodule.txt:235
#, priority:220
msgid "`git submodule sync` synchronizes all submodules while `git submodule sync -- A` synchronizes submodule \"A\" only."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:237
+#: en/git-submodule.txt:238
#, priority:220
msgid "If `--recursive` is specified, this command will recurse into the registered submodules, and sync any nested submodules within."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:238
+#: en/git-submodule.txt:239
#, no-wrap, priority:220
msgid "absorbgitdirs"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:245
+#: en/git-submodule.txt:246
#, priority:220
msgid "If a git directory of a submodule is inside the submodule, move the git directory of the submodule into its superprojects `$GIT_DIR/modules` path and then connect the git directory and its working directory by setting the `core.worktree` and adding a .git file pointing to the git directory embedded in the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:249
+#: en/git-submodule.txt:250
#, priority:220
msgid "A repository that was cloned independently and later added as a submodule or old setups have the submodules git directory inside the submodule instead of embedded into the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:251
+#: en/git-submodule.txt:252
#, priority:220
msgid "This command is recursive by default."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:257
+#: en/git-submodule.txt:258
#, priority:220
msgid "Only print error messages."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:264
+#: en/git-submodule.txt:265
#, priority:220
msgid "This option is only valid for add and update commands. Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:268
+#: en/git-submodule.txt:269
#, priority:220
msgid "This option is only valid for the deinit command. Unregister all submodules in the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:269
+#: en/git-submodule.txt:270
#, no-wrap, priority:220
msgid "-b <branch>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:277
+#: en/git-submodule.txt:278
#, priority:220
msgid "Branch of repository to add as submodule. The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository. If the option is not specified, it defaults to 'master'."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:290
+#: en/git-submodule.txt:291
#, priority:220
msgid "This option is only valid for add, deinit and update commands. When running add, allow adding an otherwise ignored submodule path. When running deinit the submodule working trees will be removed even if they contain local changes. When running update (only effective with the checkout procedure), throw away local changes in submodules when switching to a different commit; and always run a checkout operation in the submodule, even if the commit listed in the index of the containing repository matches the commit checked out in the submodule."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:295
+#: en/git-submodule.txt:296
#, priority:220
msgid "This option is only valid for status and summary commands. These commands typically use the commit found in the submodule HEAD, but with this option, the commit stored in the index is used instead."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:296
+#: en/git-submodule.txt:297
#, ignore-same, no-wrap, priority:220
msgid "--files"
msgstr "--files"
#. type: Plain text
-#: en/git-submodule.txt:300
+#: en/git-submodule.txt:301
#, priority:220
msgid "This option is only valid for the summary command. This command compares the commit in the index with that in the submodule HEAD when this option is used."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:302
+#: en/git-submodule.txt:303
#, ignore-same, no-wrap, priority:220
msgid "--summary-limit"
msgstr "--summary-limit"
#. type: Plain text
-#: en/git-submodule.txt:308
+#: en/git-submodule.txt:309
#, priority:220
msgid "This option is only valid for the summary command. Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:309
+#: en/git-submodule.txt:310
#, ignore-same, no-wrap, priority:220
msgid "--remote"
msgstr "--remote"
#. type: Plain text
-#: en/git-submodule.txt:318
+#: en/git-submodule.txt:319
#, priority:220
msgid "This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:324
+#: en/git-submodule.txt:325
#, priority:220
msgid "This works for any of the supported update procedures (`--checkout`, `--rebase`, etc.). The only change is the source of the target SHA-1. For example, `submodule update --remote --merge` will merge upstream submodule changes into the submodules, while `submodule update --merge` will merge superproject gitlink changes into the submodules."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:329
+#: en/git-submodule.txt:330
#, priority:220
msgid "In order to ensure a current tracking branch state, `update --remote` fetches the submodule's remote repository before calculating the SHA-1. If you don't want to fetch, you should use `submodule update --remote --no-fetch`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:339
+#: en/git-submodule.txt:340
#, priority:220
msgid "Use this option to integrate changes from the upstream subproject with your submodule's current HEAD. Alternatively, you can run `git pull` from the submodule, which is equivalent except for the remote branch name: `update --remote` uses the default upstream repository and `submodule.<name>.branch`, while `git pull` uses the submodule's `branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want to distribute the default upstream branch with the superproject and `branch.<name>.merge` if you want a more native feel while working in the submodule itself."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:341
+#: en/git-submodule.txt:342
#, ignore-same, no-wrap, priority:220
msgid "--no-fetch"
msgstr "--no-fetch"
#. type: Plain text
-#: en/git-submodule.txt:344
+#: en/git-submodule.txt:345
#, priority:220
msgid "This option is only valid for the update command. Don't fetch new objects from the remote site."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:345
+#: en/git-submodule.txt:346
#, ignore-same, no-wrap, priority:220
msgid "--checkout"
msgstr "--checkout"
#. type: Plain text
-#: en/git-submodule.txt:353
+#: en/git-submodule.txt:354
#, priority:220
msgid "This option is only valid for the update command. Checkout the commit recorded in the superproject on a detached HEAD in the submodule. This is the default behavior, the main use of this option is to override `submodule.$name.update` when set to a value other than `checkout`. If the key `submodule.$name.update` is either not explicitly set or set to `checkout`, this option is implicit."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:363
+#: en/git-submodule.txt:364
#, priority:220
msgid "This option is only valid for the update command. Merge the commit recorded in the superproject into the current branch of the submodule. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve the resulting conflicts within the submodule with the usual conflict resolution tools. If the key `submodule.$name.update` is set to `merge`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:364
+#: en/git-submodule.txt:365
#, ignore-same, no-wrap, priority:220
msgid "--rebase"
msgstr "--rebase"
#. type: Plain text
-#: en/git-submodule.txt:372
+#: en/git-submodule.txt:373
#, priority:220
msgid "This option is only valid for the update command. Rebase the current branch onto the commit recorded in the superproject. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve these failures with linkgit:git-rebase[1]. If the key `submodule.$name.update` is set to `rebase`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:373
+#: en/git-submodule.txt:374
#, ignore-same, no-wrap, priority:220
msgid "--init"
msgstr "--init"
#. type: Plain text
-#: en/git-submodule.txt:377
+#: en/git-submodule.txt:378
#, priority:220
msgid "This option is only valid for the update command. Initialize all submodules for which \"git submodule init\" has not been called so far before updating."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:378
+#: en/git-submodule.txt:379
#, ignore-same, no-wrap, priority:220
msgid "--name"
msgstr "--name"
#. type: Plain text
-#: en/git-submodule.txt:382
+#: en/git-submodule.txt:383
#, priority:220
msgid "This option is only valid for the add command. It sets the submodule's name to the given string instead of defaulting to its path. The name must be valid as a directory name and may not end with a '/'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:383
+#: en/git-submodule.txt:384
#, no-wrap, priority:220
msgid "--reference <repository>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:387 en/git-submodule.txt:396
+#: en/git-submodule.txt:388 en/git-submodule.txt:397
#, priority:220
msgid "This option is only valid for add and update commands. These commands sometimes need to clone a remote repository. In this case, this option will be passed to the linkgit:git-clone[1] command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:391
+#: en/git-submodule.txt:392
#, no-wrap, priority:220
msgid ""
"*NOTE*: Do *not* use this option unless you have read the note\n"
@@ -47978,61 +48246,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:398
+#: en/git-submodule.txt:399
#, no-wrap, priority:220
msgid "*NOTE*: see the NOTE for the `--reference` option.\n"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:404
+#: en/git-submodule.txt:405
#, priority:220
msgid "This option is only valid for foreach, update, status and sync commands. Traverse submodules recursively. The operation is performed not only in the submodules of the current repo, but also in any nested submodules inside those submodules (and so on)."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:405
+#: en/git-submodule.txt:406
#, ignore-same, no-wrap, priority:220
msgid "--depth"
msgstr "--depth"
#. type: Plain text
-#: en/git-submodule.txt:409
+#: en/git-submodule.txt:410
#, priority:220
msgid "This option is valid for add and update commands. Create a 'shallow' clone with a history truncated to the specified number of revisions. See linkgit:git-clone[1]"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:410
+#: en/git-submodule.txt:411
#, ignore-same, no-wrap, priority:220
msgid "--[no-]recommend-shallow"
msgstr "--[no-]recommend-shallow"
#. type: Plain text
-#: en/git-submodule.txt:415
+#: en/git-submodule.txt:416
#, priority:220
msgid "This option is only valid for the update command. The initial clone of a submodule will use the recommended `submodule.<name>.shallow` as provided by the `.gitmodules` file by default. To ignore the suggestions use `--no-recommend-shallow`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:421
+#: en/git-submodule.txt:422
#, priority:220
msgid "This option is only valid for the update command. Clone new submodules in parallel with as many jobs. Defaults to the `submodule.fetchJobs` option."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:426
+#: en/git-submodule.txt:427
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:434
+#: en/git-submodule.txt:435
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:438
+#: en/git-submodule.txt:439
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -48664,7 +48932,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:889
+#: en/git-svn.txt:346 en/rev-list-options.txt:905
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -49477,7 +49745,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:777
#, priority:100
-msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider linkgit:git-filter-branch[1] instead. filter-branch also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
+msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports, and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider https://github.com/newren/git-filter-repo[git-filter-repo] instead. filter-repo also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
msgstr ""
#. type: Labeled list
@@ -51398,16 +51666,6 @@ msgid ""
"#\n"
msgstr ""
-#. type: delimited block -
-#: en/git.txt:310
-#, 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/git.txt:315
#, no-wrap, priority:100
@@ -55448,98 +55706,104 @@ msgstr ""
msgid "This option determines how the merge message will be cleaned up before commiting. See linkgit:git-commit[1] for more details. In addition, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on to the commit machinery in the case of a merge conflict."
msgstr ""
+#. type: Labeled list
+#: en/merge-options.txt:44
+#, ignore-same, no-wrap, priority:240
+msgid "--ff-only"
+msgstr "--ff-only"
+
#. type: Plain text
-#: en/merge-options.txt:46
+#: en/merge-options.txt:50
#, priority:240
-msgid "When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. This is the default behavior."
+msgid "Specifies how a merge is handled when the merged-in history is already a descendant of the current history. `--ff` is the default unless merging an annotated (and possibly signed) tag that is not stored in its natural place in the `refs/tags/` hierarchy, in which case `--no-ff` is assumed."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:52
+#: en/merge-options.txt:55
#, priority:240
-msgid "Create a merge commit even when the merge resolves as a fast-forward. This is the default behaviour when merging an annotated (and possibly signed) tag that is not stored in its natural place in 'refs/tags/' hierarchy."
+msgid "With `--ff`, when possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit."
msgstr ""
-#. type: Labeled list
-#: en/merge-options.txt:53
-#, ignore-same, no-wrap, priority:240
-msgid "--ff-only"
-msgstr "--ff-only"
+#. type: Plain text
+#: en/merge-options.txt:58
+#, priority:240
+msgid "With `--no-ff`, create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward."
+msgstr ""
#. type: Plain text
-#: en/merge-options.txt:57
+#: en/merge-options.txt:61
#, priority:240
-msgid "Refuse to merge and exit with a non-zero status unless the current `HEAD` is already up to date or the merge can be resolved as a fast-forward."
+msgid "With `--ff-only`, resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:63
+#: en/merge-options.txt:67
#, priority:240
msgid "GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:69
+#: en/merge-options.txt:73
#, priority:240
msgid "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also linkgit:git-fmt-merge-msg[1]."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:72
+#: en/merge-options.txt:76
#, priority:240
msgid "With --no-log do not list one-line descriptions from the actual commits being merged."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:74
+#: en/merge-options.txt:78
#, ignore-same, no-wrap, priority:240
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
-#: en/merge-options.txt:83
+#: en/merge-options.txt:87
#, priority:240
msgid "With --no-signoff do not add a Signed-off-by line."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:89
+#: en/merge-options.txt:93
#, priority:240
msgid "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:92
+#: en/merge-options.txt:96
#, priority:240
msgid "With -n or --no-stat do not show a diffstat at the end of the merge."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:93
+#: en/merge-options.txt:97
#, ignore-same, no-wrap, priority:240
msgid "--squash"
msgstr "--squash"
#. type: Labeled list
-#: en/merge-options.txt:94
+#: en/merge-options.txt:98
#, ignore-same, no-wrap, priority:240
msgid "--no-squash"
msgstr "--no-squash"
#. type: Plain text
-#: en/merge-options.txt:102
+#: en/merge-options.txt:106
#, priority:240
msgid "Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:105
+#: en/merge-options.txt:109
#, priority:240
msgid "With --no-squash perform the merge and commit the result. This option can be used to override --squash."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:107
+#: en/merge-options.txt:111
#, priority:240
msgid "With --squash, --commit is not allowed, and will fail."
msgstr ""
@@ -55547,71 +55811,77 @@ msgstr ""
#. type: Plain text
#: en/merge-options.txt:115
#, priority:240
+msgid "This option bypasses the pre-merge and commit-msg hooks. See also linkgit:githooks[5]."
+msgstr ""
+
+#. type: Plain text
+#: en/merge-options.txt:123
+#, priority:240
msgid "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise)."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:116
+#: en/merge-options.txt:124
#, no-wrap, priority:240
msgid "-X <option>"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:120
+#: en/merge-options.txt:128
#, priority:240
msgid "Pass merge strategy specific option through to the merge strategy."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:121
+#: en/merge-options.txt:129
#, ignore-same, no-wrap, priority:240
msgid "--verify-signatures"
msgstr "--verify-signatures"
#. type: Labeled list
-#: en/merge-options.txt:122
+#: en/merge-options.txt:130
#, ignore-same, no-wrap, priority:240
msgid "--no-verify-signatures"
msgstr "--no-verify-signatures"
#. type: Plain text
-#: en/merge-options.txt:128
+#: en/merge-options.txt:136
#, priority:240
msgid "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:130
+#: en/merge-options.txt:138
#, ignore-same, no-wrap, priority:240
msgid "--no-summary"
msgstr "--no-summary"
#. type: Plain text
-#: en/merge-options.txt:133
+#: en/merge-options.txt:141
#, priority:240
msgid "Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:138
+#: en/merge-options.txt:146
#, priority:240
msgid "Operate quietly. Implies --no-progress."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:149
+#: en/merge-options.txt:157
#, priority:240
msgid "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:152
+#: en/merge-options.txt:160
#, ignore-same, no-wrap, priority:240
msgid "--allow-unrelated-histories"
msgstr "--allow-unrelated-histories"
#. type: Plain text
-#: en/merge-options.txt:158
+#: en/merge-options.txt:166
#, priority:240
msgid "By default, `git merge` command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added."
msgstr ""
@@ -56934,7 +57204,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:215
#, priority:260
-msgid "minutes ago`}; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -59312,263 +59582,281 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:762
#, priority:260
+msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:771
+#, ignore-ellipsis, priority:260
+msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:775
+#, priority:260
+msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:778
+#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:779
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:766
+#: en/rev-list-options.txt:782
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:773
+#: en/rev-list-options.txt:789
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:781
+#: en/rev-list-options.txt:797
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:800
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:791
+#: en/rev-list-options.txt:807
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:793
+#: en/rev-list-options.txt:809
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:801
+#: en/rev-list-options.txt:817
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:802
+#: en/rev-list-options.txt:818
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:804
+#: en/rev-list-options.txt:820
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:822
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:812
+#: en/rev-list-options.txt:828
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:832
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:818
+#: en/rev-list-options.txt:834
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:819
+#: en/rev-list-options.txt:835
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:826
+#: en/rev-list-options.txt:842
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:847
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:833
+#: en/rev-list-options.txt:849
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:852
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:838
+#: en/rev-list-options.txt:854
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:839
+#: en/rev-list-options.txt:855
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:840
+#: en/rev-list-options.txt:856
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:859
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:846
+#: en/rev-list-options.txt:862
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:864
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:873
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:864
+#: en/rev-list-options.txt:880
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:868
+#: en/rev-list-options.txt:884
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:875
+#: en/rev-list-options.txt:891
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:894
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:880
+#: en/rev-list-options.txt:896
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:882
+#: en/rev-list-options.txt:898
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:884
+#: en/rev-list-options.txt:900
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:887
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:892
+#: en/rev-list-options.txt:908
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:909
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:896
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:898
+#: en/rev-list-options.txt:914
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:902
+#: en/rev-list-options.txt:918
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:907
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:925
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:932
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -59579,19 +59867,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:919
+#: en/rev-list-options.txt:935
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:922
+#: en/rev-list-options.txt:938
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:929
+#: en/rev-list-options.txt:945
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -59603,85 +59891,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:931
+#: en/rev-list-options.txt:947
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:937
+#: en/rev-list-options.txt:953
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:939
+#: en/rev-list-options.txt:955
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:942
+#: en/rev-list-options.txt:958
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:943
+#: en/rev-list-options.txt:959
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:949
+#: en/rev-list-options.txt:965
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:959
+#: en/rev-list-options.txt:975
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:963
+#: en/rev-list-options.txt:979
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:984
#, priority:260
msgid "Listed below are options that control the formatting of diff output. Some of them are specific to linkgit:git-rev-list[1], however other diff options may be given. See linkgit:git-diff-files[1] for more options."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:991
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:981
+#: en/rev-list-options.txt:997
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:1012
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1015
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1018
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.pl.po b/po/documentation.pl.po
index 9e288d05343e10ad41cd7b8ae56ba54a24235742..f6f8edb39a8f4ece3c3adf980f7d3bbaa6ef0d49 100644
--- a/po/documentation.pl.po
+++ b/po/documentation.pl.po
@@ -6,9 +6,9 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2019-08-27 18:53+0200\n"
+"POT-Creation-Date: 2019-12-08 16:35+0100\n"
"PO-Revision-Date: 2019-10-31 12:31+0100\n"
-"Last-Translator: Matthias A횩hauer <mha1993@live.de>\n"
+"Last-Translator: Matthias Ahauer <mha1993@live.de>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
@@ -23,19 +23,19 @@ msgstr "-b"
#. type: Plain text
#: en/blame-options.txt:4
-#, ignore-translated, priority:100
+#, priority:100
msgid "Show blank SHA-1 for boundary commits. This can also be controlled via the `blame.blankboundary` config option."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:319 en/git-fsck.txt:38 en/git-rebase.txt:471
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:321 en/git-fsck.txt:38 en/git-rebase.txt:493
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
#. type: Plain text
#: en/blame-options.txt:8
-#, ignore-translated, priority:100
+#, priority:100
msgid "Do not treat root commits as boundaries. This can also be controlled via the `blame.showRoot` config option."
msgstr ""
@@ -47,31 +47,31 @@ msgstr "--show-stats"
#. type: Plain text
#: en/blame-options.txt:11
-#, ignore-translated, priority:100
+#, priority:100
msgid "Include additional statistics at the end of blame output."
msgstr ""
#. type: Labeled list
#: en/blame-options.txt:12
-#, ignore-translated, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "-L <start>,<end>"
msgstr ""
#. type: Labeled list
#: en/blame-options.txt:13
-#, ignore-translated, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "-L :<funcname>"
msgstr ""
#. type: Plain text
#: en/blame-options.txt:16
-#, ignore-translated, priority:100
+#, priority:100
msgid "Annotate only the given line range. May be specified multiple times. Overlapping ranges are allowed."
msgstr ""
#. type: Plain text
#: en/blame-options.txt:19
-#, ignore-translated, priority:100
+#, priority:100
msgid "<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>."
msgstr ""
@@ -83,48 +83,48 @@ msgstr "-l"
#. type: Plain text
#: en/blame-options.txt:24
-#, ignore-translated, priority:100
+#, priority:100
msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1000
+#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1016
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
#. type: Plain text
#: en/blame-options.txt:27
-#, ignore-translated, priority:100
+#, priority:100
msgid "Show raw timestamp (Default: off)."
msgstr ""
#. type: Labeled list
#: en/blame-options.txt:28
-#, ignore-translated, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "-S <revs-file>"
msgstr ""
#. type: Plain text
#: en/blame-options.txt:30
-#, ignore-translated, priority:100
+#, priority:100
msgid "Use revisions from revs-file instead of calling linkgit:git-rev-list[1]."
msgstr ""
#. type: Labeled list
#: en/blame-options.txt:31
-#, ignore-translated, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "--reverse <rev>..<rev>"
msgstr ""
#. type: Plain text
#: en/blame-options.txt:38
-#, ignore-translated, priority:100
+#, priority:100
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:433 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -466,7 +466,7 @@ msgid "Get and set repository or global options."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1505
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1528
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-export[1]"
msgstr "linkgit:git-fast-export[1]"
@@ -478,7 +478,7 @@ msgid "Git data exporter."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:243
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-import[1]"
msgstr "linkgit:git-fast-import[1]"
@@ -2259,95 +2259,95 @@ msgstr ""
msgid "Example"
msgstr ""
-#. type: Plain text
-#: en/config.txt:185
+#. type: delimited block -
+#: en/config.txt:186
#, no-wrap, priority:100
msgid ""
-"\t# Core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"# Core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:190
+#. type: delimited block -
+#: en/config.txt:191
#, no-wrap, priority:100
msgid ""
-"\t# Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"# Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:194
+#. type: delimited block -
+#: en/config.txt:195
#, no-wrap, priority:100
msgid ""
-"\t[branch \"devel\"]\n"
-"\t\tremote = origin\n"
-"\t\tmerge = refs/heads/devel\n"
+"[branch \"devel\"]\n"
+"\tremote = origin\n"
+"\tmerge = refs/heads/devel\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:199
+#. type: delimited block -
+#: en/config.txt:200
#, no-wrap, priority:100
msgid ""
-"\t# Proxy settings\n"
-"\t[core]\n"
-"\t\tgitProxy=\"ssh\" for \"kernel.org\"\n"
-"\t\tgitProxy=default-proxy ; for the rest\n"
+"# Proxy settings\n"
+"[core]\n"
+"\tgitProxy=\"ssh\" for \"kernel.org\"\n"
+"\tgitProxy=default-proxy ; for the rest\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:204
+#. type: delimited block -
+#: en/config.txt:205
#, no-wrap, priority:100
msgid ""
-"\t[include]\n"
-"\t\tpath = /path/to/foo.inc ; include by absolute path\n"
-"\t\tpath = foo.inc ; find \"foo.inc\" relative to the current file\n"
-"\t\tpath = ~/foo.inc ; find \"foo.inc\" in your `$HOME` directory\n"
+"[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: Plain text
-#: en/config.txt:208
+#. type: delimited block -
+#: en/config.txt:209
#, no-wrap, priority:100
msgid ""
-"\t; include if $GIT_DIR is /path/to/foo/.git\n"
-"\t[includeIf \"gitdir:/path/to/foo/.git\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; 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: Plain text
-#: en/config.txt:212
+#. type: delimited block -
+#: en/config.txt:213
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside /path/to/group\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside /path/to/group\n"
+"[includeIf \"gitdir:/path/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:216
+#. type: delimited block -
+#: en/config.txt:217
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside $HOME/to/group\n"
-"\t[includeIf \"gitdir:~/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside $HOME/to/group\n"
+"[includeIf \"gitdir:~/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:222
+#. type: delimited block -
+#: en/config.txt:223
#, no-wrap, priority:100
msgid ""
-"\t; relative paths are always relative to the including\n"
-"\t; file (if the condition is true); their location is not\n"
-"\t; affected by the condition\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = foo.inc\n"
+"; 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:227
+#: en/config.txt:229
#, no-wrap, priority:100
msgid ""
"\t; include only if we are in a worktree where foo-branch is\n"
@@ -2357,43 +2357,43 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/config.txt:229
+#: en/config.txt:231
#, no-wrap, priority:100
msgid "Values"
msgstr ""
#. type: Plain text
-#: en/config.txt:234
+#: 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:235
+#: en/config.txt:237
#, no-wrap, priority:100
msgid "boolean"
msgstr ""
#. type: Plain text
-#: en/config.txt:240
+#: 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:241
+#: en/config.txt:243
#, no-wrap, priority:100
msgid "true"
msgstr ""
#. type: Plain text
-#: en/config.txt:242
+#: en/config.txt:244
#, priority:100
msgid "Boolean true literals are `yes`, `on`, `true`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:244
+#: en/config.txt:246
#, no-wrap, priority:100
msgid ""
"and `1`. Also, a variable defined without `= <value>`\n"
@@ -2401,109 +2401,109 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/config.txt:245
+#: en/config.txt:247
#, no-wrap, priority:100
msgid "false"
msgstr ""
#. type: Plain text
-#: en/config.txt:246
+#: en/config.txt:248
#, priority:100
msgid "Boolean false literals are `no`, `off`, `false`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:247
+#: en/config.txt:249
#, no-wrap, priority:100
msgid "`0` and the empty string.\n"
msgstr ""
#. type: Plain text
-#: en/config.txt:251
+#: 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:252
+#: en/config.txt:254
#, no-wrap, priority:100
msgid "integer"
msgstr ""
#. type: Plain text
-#: en/config.txt:256
+#: 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:257 en/diff-options.txt:356 en/git-for-each-ref.txt:177
+#: 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:261
+#: 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:265
+#: en/config.txt:267
#, 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."
msgstr ""
#. type: Plain text
-#: en/config.txt:270
+#: en/config.txt:272
#, 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:277
+#: en/config.txt:279
#, 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:280
+#: en/config.txt:282
#, 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:289
+#: en/config.txt:291
#, 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:290
+#: en/config.txt:292
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:296
+#: en/config.txt:298
#, 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:299 en/git-imap-send.txt:58
+#: en/config.txt:301 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:304
+#: en/config.txt:306
#, 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:309
+#: en/config.txt:311
#, 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 ""
@@ -3241,53 +3241,53 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
#, no-wrap, priority:260
-msgid "Generating patches with -p"
+msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:10
+#: en/diff-generate-patch.txt:14
#, priority:260
-msgid "When \"git-diff-index\", \"git-diff-tree\", or \"git-diff-files\" are run with a `-p` option, \"git diff\" without the `--raw` option, or \"git log\" with the \"-p\" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
+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:13
+#: 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:15
+#: 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:17
+#: 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:21
+#: 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:25
+#: 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:27
+#: 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:39
+#: en/diff-generate-patch.txt:43
#, no-wrap, priority:260
msgid ""
"old mode <mode>\n"
@@ -3304,43 +3304,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:42
+#: 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:44
+#: 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:51
+#: 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:55
+#: en/diff-generate-patch.txt:59
#, priority:260
-msgid "The index line includes the SHA-1 checksum 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."
+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:59
+#: 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:64
+#: 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:71
+#: en/diff-generate-patch.txt:75
#, no-wrap, priority:260
msgid ""
"diff --git a/a b/b\n"
@@ -3352,25 +3352,25 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/diff-generate-patch.txt:74
+#: en/diff-generate-patch.txt:78
#, no-wrap, priority:260
-msgid "combined diff format"
+msgid "Combined diff format"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:82
+#: 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:84
+#: en/diff-generate-patch.txt:88
#, priority:260
-msgid "A 'combined diff' format looks like this:"
+msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:93
+#: en/diff-generate-patch.txt:97
#, no-wrap, priority:260
msgid ""
"diff --combined describe.c\n"
@@ -3383,7 +3383,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:103
+#: en/diff-generate-patch.txt:107
#, no-wrap, priority:260
msgid ""
"- static void describe(char *arg)\n"
@@ -3398,7 +3398,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:113
+#: en/diff-generate-patch.txt:117
#, no-wrap, priority:260
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
@@ -3413,37 +3413,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:117
+#: en/diff-generate-patch.txt:121
#, priority:260
-msgid "It is preceded with a \"git diff\" header, that looks like this (when `-c` option is used):"
+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:119
+#: en/diff-generate-patch.txt:123
#, no-wrap, priority:260
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:121
+#: en/diff-generate-patch.txt:125
#, priority:260
-msgid "or like this (when `--cc` option is used):"
+msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:123
+#: en/diff-generate-patch.txt:127
#, no-wrap, priority:260
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:126
+#: 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:131
+#: en/diff-generate-patch.txt:135
#, no-wrap, priority:260
msgid ""
"index <hash>,<hash>..<hash>\n"
@@ -3453,91 +3453,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:137
+#: 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:139
+#: 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:141 en/diff-generate-patch.txt:152 en/diff-generate-patch.txt:153 en/diff-generate-patch.txt:154
+#: 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:142 en/diff-generate-patch.txt:155
+#: 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:146
+#: 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:150
+#: 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:159
+#: 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:165
+#: 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 for apply. The change is similar to the change in the extended 'index' header:"
+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:167
+#: 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:170
+#: 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:179
+#: 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:185
+#: 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:191
+#: 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:197
+#: 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:327 en/merge-options.txt:86
+#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3549,7 +3549,7 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:186 en/git-add.txt:111 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/diff-options.txt:23 en/fetch-options.txt:198 en/git-add.txt:111 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
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
@@ -3573,7 +3573,7 @@ msgid "\tThis is the default.\n"
msgstr ""
#. 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:117 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
+#: 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:118 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"
@@ -3992,7 +3992,7 @@ msgid "Synonym for --dirstat=files,param1,param2..."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:129
+#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--summary"
msgstr "--summary"
@@ -4016,7 +4016,7 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:122 en/git-update-index.txt:168
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:168
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4425,7 +4425,7 @@ msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:402 en/git-status.txt:139
+#: en/diff-options.txt:402 en/git-status.txt:143
#, ignore-same, no-wrap, priority:280
msgid "--no-renames"
msgstr "--no-renames"
@@ -4529,7 +4529,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:463
#, priority:280
-msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
+msgid "It affects the way a change that amounts to a total rewrite of a file does not appear as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
msgstr ""
#. type: Plain text
@@ -4545,7 +4545,7 @@ msgid "-M[<n>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:473 en/git-status.txt:143
+#: en/diff-options.txt:473 en/git-status.txt:147
#, no-wrap, priority:280
msgid "--find-renames[=<n>]"
msgstr ""
@@ -4968,7 +4968,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:203 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:52 en/git-clone.txt:120 en/git-commit.txt:314 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:301 en/git-gc.txt:68 en/git-grep.txt:296 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:315 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:255 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:136 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:215 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:316 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:302 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:256 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5022,7 +5022,7 @@ msgid "Allow (or disallow) external text conversion filters to be run when compa
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:85
+#: en/diff-options.txt:722 en/git-status.txt:87
#, no-wrap, priority:280
msgid "--ignore-submodules[=<when>]"
msgstr ""
@@ -5100,7 +5100,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:265 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:266 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5232,7 +5232,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:48 en/git-commit.txt:317 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:50 en/git-commit.txt:319 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5244,13 +5244,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:34 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:195 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:347 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:278 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:279 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:35 en/git-fast-import.txt:37 en/git-filter-branch.txt:196 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:279 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:280 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5282,7 +5282,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:112 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:113 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5360,7 +5360,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:47 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:97 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:326 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:301 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:85
+#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:98 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:302 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5426,187 +5426,211 @@ msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:167
+#: en/fetch-options.txt:164
+#, priority:220
+msgid "Number of parallel children to be used for all forms of fetching."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:169
#, priority:220
-msgid "Number of parallel children to be used for fetching submodules. Each will fetch from different submodules, such that fetching many submodules will be faster. By default submodules will be fetched one at a time."
+msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:172
+#, priority:220
+msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:168 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:173 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:171
+#: en/fetch-options.txt:176
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:172
+#: en/fetch-options.txt:177 en/git-branch.txt:225 en/git-push.txt:349
+#, ignore-same, no-wrap, priority:240
+msgid "--set-upstream"
+msgstr "--set-upstream"
+
+#. type: Plain text
+#: en/fetch-options.txt:183
+#, priority:220
+msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:184
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:188
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177
+#: en/fetch-options.txt:189
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:184
+#: en/fetch-options.txt:196
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:199
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:194
+#: en/fetch-options.txt:206
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:195 en/git-clone.txt:182
+#: en/fetch-options.txt:207 en/git-clone.txt:182
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:212
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:202 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:51 en/git-clone.txt:119 en/git-commit.txt:313 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:300 en/git-grep.txt:295 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:314 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:254 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:135
+#: en/fetch-options.txt:214 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:315 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:301 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:255 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:207
+#: en/fetch-options.txt:219
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:208 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:298 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:318 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:139
+#: en/fetch-options.txt:220 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:300 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:209 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:299 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:319 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:140
+#: en/fetch-options.txt:221 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:301 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:211 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:142
+#: en/fetch-options.txt:223 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:213 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:326 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:258 en/git-switch.txt:144 en/merge-options.txt:143
+#: en/fetch-options.txt:225 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:328 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:259 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:218 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:230 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:219 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:231 en/git-ls-remote.txt:73 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:220 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:232 en/git-clone.txt:135 en/git-ls-remote.txt:74
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-clone.txt:142
+#: en/fetch-options.txt:239 en/git-clone.txt:142
#, priority:300
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:240
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:233
+#: en/fetch-options.txt:245
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:234
+#: en/fetch-options.txt:246
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:240
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:241 en/git-push.txt:398
+#: en/fetch-options.txt:253 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:242 en/git-push.txt:399
+#: en/fetch-options.txt:254 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:244 en/git-push.txt:401
+#: en/fetch-options.txt:256 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:245 en/git-push.txt:402
+#: en/fetch-options.txt:257 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:246 en/git-push.txt:403
+#: en/fetch-options.txt:258 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:247 en/git-push.txt:405
+#: en/fetch-options.txt:259 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5646,7 +5670,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:20 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:67 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
+#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr ""
@@ -5688,13 +5712,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr ""
#. type: Title -
-#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:83 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:85 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:115 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:253 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:86 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:254 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:52 en/git-grep.txt:308 en/git-status.txt:148
+#: en/git-add.txt:52 en/git-grep.txt:325 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
@@ -5706,7 +5730,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:67 en/git-grep.txt:314
+#: en/git-add.txt:67 en/git-grep.txt:331
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -5724,13 +5748,13 @@ msgid "Allow adding otherwise ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:42 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:394 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:43 en/git-rebase.txt:395 en/git-rebase.txt:536 en/git-svn.txt:297
+#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5754,7 +5778,7 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:275 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
@@ -5844,7 +5868,7 @@ msgid "This option is primarily to help users who are used to older versions of
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:146 en/git-format-patch.txt:101 en/git-submodule.txt:340
+#: en/git-add.txt:146 en/git-format-patch.txt:102 en/git-submodule.txt:341
#, no-wrap, priority:300
msgid "-N"
msgstr ""
@@ -5934,7 +5958,7 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:343 en/git-grep.txt:304 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
+#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:345 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr ""
@@ -5946,7 +5970,7 @@ msgid "This option can be used to separate command-line options from the list of
msgstr ""
#. type: Title -
-#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:357 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:153 en/git-fetch.txt:242 en/git-filter-branch.txt:234 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:634 en/git-grep.txt:316 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:206 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:359 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:638 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr ""
@@ -5988,7 +6012,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:221 en/git-rebase.txt:591
+#: en/git-add.txt:221 en/git-rebase.txt:613
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr ""
@@ -6000,7 +6024,7 @@ msgid "When the command enters the interactive mode, it shows the output of the
msgstr ""
#. type: Plain text
-#: en/git-add.txt:230 en/git-clean.txt:83
+#: en/git-add.txt:230 en/git-clean.txt:85
#, priority:300
msgid "The command loop shows the list of subcommands available, and gives a prompt \"What now> \". In general, when the prompt ends with a single '>', you can pick only one of the choices given and type return, like this:"
msgstr ""
@@ -6300,7 +6324,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:135 en/git-commit-tree.txt:118 en/git-commit.txt:487 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:241 en/git-fast-import.txt:1503 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:679 en/git-gc.txt:154 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:112 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:247 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:519 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:292 en/git-status.txt:434 en/git-submodule.txt:436 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
+#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:489 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1526 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:683 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:437 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
@@ -6312,13 +6336,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:139 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:495 en/git-config.txt:492 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:245 en/git-fast-import.txt:1507 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:480 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:683 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:334 en/git-gui.txt:126 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:116 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:230 en/git-merge-file.txt:94 en/git-merge-index.txt:78 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1052 en/git-receive-pack.txt:251 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:123 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:523 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:300 en/git-status.txt:438 en/git-stripspace.txt:93 en/git-submodule.txt:440 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
+#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:497 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1530 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:693 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:687 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:441 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
#, no-wrap, priority:300
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:140 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:496 en/git-config.txt:493 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:246 en/git-fast-import.txt:1508 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:481 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:684 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:335 en/git-gui.txt:127 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:117 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:231 en/git-merge-file.txt:95 en/git-merge-index.txt:79 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1053 en/git-receive-pack.txt:252 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:124 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:524 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:301 en/git-status.txt:439 en/git-stripspace.txt:94 en/git-submodule.txt:441 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
+#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:498 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1531 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:694 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:688 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:442 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6368,7 +6392,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:118 en/git-rebase.txt:387 en/git-revert.txt:98 en/merge-options.txt:73
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:119 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6410,7 +6434,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:969
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:985
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6440,7 +6464,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:267 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:989
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1005
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6532,37 +6556,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:303 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:304 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:307 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:373 en/git-rebase.txt:524
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:374
+#: en/git-am.txt:109 en/git-rebase.txt:396
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:337
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6622,7 +6646,7 @@ msgid "Run interactively."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:380 en/git-rebase.txt:521
+#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6634,7 +6658,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:381 en/git-rebase.txt:522
+#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6646,7 +6670,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:256 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6658,31 +6682,31 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:333 en/git-rebase.txt:308 en/git-revert.txt:91 en/merge-options.txt:58
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:335 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:334 en/git-rebase.txt:309 en/git-revert.txt:92 en/merge-options.txt:59
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:336 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:338 en/git-rebase.txt:313 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:340 en/git-rebase.txt:331 en/git-revert.txt:96
#, priority:280
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:228 en/sequencer.txt:1
+#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:246 en/sequencer.txt:1
#, ignore-same, no-wrap, priority:240
msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:406 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:997
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1013
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6712,7 +6736,7 @@ msgid "When a patch failure occurs, <msg> will be printed to the screen before e
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:231 en/sequencer.txt:15
+#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:249 en/sequencer.txt:15
#, ignore-same, no-wrap, priority:240
msgid "--abort"
msgstr "--abort"
@@ -6724,7 +6748,7 @@ msgid "Restore the original branch and abort the patching operation."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:238 en/sequencer.txt:10
+#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:256 en/sequencer.txt:10
#, ignore-same, no-wrap, priority:240
msgid "--quit"
msgstr "--quit"
@@ -6736,7 +6760,7 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:262
+#: en/git-am.txt:179 en/git-rebase.txt:280
#, ignore-same, no-wrap, priority:100
msgid "--show-current-patch"
msgstr "--show-current-patch"
@@ -6748,7 +6772,7 @@ msgid "Show the patch being applied when \"git am\" is stopped because of confli
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:451 en/git-format-patch.txt:351 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:188 en/git-tag.txt:231
+#: en/git-am.txt:184 en/git-commit.txt:453 en/git-format-patch.txt:355 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
@@ -6832,7 +6856,7 @@ msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the curren
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:471 en/git-gc.txt:147
+#: en/git-am.txt:234 en/git-commit.txt:473 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
@@ -6930,7 +6954,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:322 en/merge-options.txt:84
+#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -6972,7 +6996,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:291
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:292
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7044,7 +7068,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:342
+#: en/git-apply.txt:134 en/git-rebase.txt:360
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7260,7 +7284,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:330 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:398 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:332 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -9182,7 +9206,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:525
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9218,13 +9242,13 @@ msgid "Sorting and filtering branches are case insensitive."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:153 en/git-status.txt:126 en/git-tag.txt:134
+#: en/git-branch.txt:153 en/git-status.txt:130 en/git-tag.txt:134
#, no-wrap, priority:280
msgid "--column[=<options>]"
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:154 en/git-status.txt:127 en/git-tag.txt:135
+#: en/git-branch.txt:154 en/git-status.txt:131 en/git-tag.txt:135
#, ignore-same, no-wrap, priority:280
msgid "--no-column"
msgstr "--no-column"
@@ -9349,12 +9373,6 @@ msgstr "--no-track"
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
-#. type: Labeled list
-#: en/git-branch.txt:225 en/git-push.txt:349
-#, ignore-same, no-wrap, priority:240
-msgid "--set-upstream"
-msgstr "--set-upstream"
-
#. type: Plain text
#: en/git-branch.txt:228
#, priority:240
@@ -9624,7 +9642,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-filter-branch.txt:449 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10244,7 +10262,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:152 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10893,7 +10911,7 @@ msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will al
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:226
+#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
@@ -11090,7 +11108,7 @@ msgid "Only meaningful with `--stdin`; paths are separated with NUL character in
msgstr ""
#. type: Plain text
-#: en/git-checkout-index.txt:73 en/git-commit.txt:345 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
+#: en/git-checkout-index.txt:73 en/git-commit.txt:347 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
#, priority:280
msgid "Do not interpret any more arguments as options."
msgstr ""
@@ -11411,7 +11429,7 @@ msgid "Quiet, suppress feedback messages."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:144
+#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:152
#, ignore-same, no-wrap, priority:240
msgid "--no-progress"
msgstr "--no-progress"
@@ -11597,7 +11615,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:241 en/git-rebase.txt:268 en/git-rebase.txt:529 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:354 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
+#: en/git-checkout.txt:241 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:355 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11717,7 +11735,7 @@ msgid "In the default overlay mode, `git checkout` never removes files from the
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:312 en/git-rebase.txt:225 en/git-switch.txt:36
+#: en/git-checkout.txt:312 en/git-rebase.txt:243 en/git-switch.txt:36
#, no-wrap, priority:240
msgid "<branch>"
msgstr ""
@@ -12423,7 +12441,7 @@ msgid "This option determines how the commit message will be cleaned up before b
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:65 en/git-clean.txt:61
+#: en/git-cherry-pick.txt:65 en/git-clean.txt:63
#, ignore-same, no-wrap, priority:100
msgid "-x"
msgstr "-x"
@@ -12507,7 +12525,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:249 en/git-rebase.txt:532
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:267 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12531,7 +12549,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:282 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:109
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12549,7 +12567,7 @@ msgid "-X<option>"
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:125
#, no-wrap, priority:240
msgid "--strategy-option=<option>"
msgstr ""
@@ -12745,7 +12763,7 @@ msgid "Show the commit subjects next to the SHA1s."
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:32 en/git-rebase.txt:220
+#: en/git-cherry.txt:32 en/git-rebase.txt:238
#, no-wrap, priority:100
msgid "<upstream>"
msgstr ""
@@ -12763,7 +12781,7 @@ msgid "<head>"
msgstr ""
#. type: Plain text
-#: en/git-cherry.txt:38 en/git-rebase.txt:227
+#: en/git-cherry.txt:38 en/git-rebase.txt:245
#, priority:100
msgid "Working branch; defaults to HEAD."
msgstr ""
@@ -12976,85 +12994,85 @@ msgid "If any optional `<path>...` arguments are given, only those paths are aff
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:33
+#: en/git-clean.txt:35
#, priority:100
-msgid "Remove untracked directories in addition to untracked files. If an untracked directory is managed by a different Git repository, it is not removed by default. Use -f option twice if you really want to remove such a directory."
+msgid "Normally, when no <path> is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. If any paths are specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under `--force`) will be removed."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:41
+#: en/git-clean.txt:43
#, priority:100
-msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f, -n or -i. Git will refuse to delete directories with .git sub directory or file unless a second -f is given."
+msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f or -i. Git will refuse to modify untracked nested git repositories (directories with a .git subdirectory) unless a second -f is given."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:46
+#: en/git-clean.txt:48
#, priority:100
msgid "Show what would be done and clean files interactively. See ``Interactive mode'' for details."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:50
+#: en/git-clean.txt:52
#, priority:100
msgid "Don't actually remove anything, just show what would be done."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:55
+#: en/git-clean.txt:57
#, priority:100
msgid "Be quiet, only report errors, but not the files that are successfully removed."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:56
+#: en/git-clean.txt:58
#, no-wrap, priority:100
msgid "-e <pattern>"
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:57 en/git-ls-files.txt:85 en/git-name-rev.txt:33
+#: en/git-clean.txt:59 en/git-ls-files.txt:85 en/git-name-rev.txt:33
#, no-wrap, priority:100
msgid "--exclude=<pattern>"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:60
+#: en/git-clean.txt:62
#, priority:100
msgid "Use the given exclude pattern in addition to the standard ignore rules (see linkgit:gitignore[5])."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:68
+#: en/git-clean.txt:70
#, priority:100
msgid "Don't use the standard ignore rules (see linkgit:gitignore[5]), but still use the ignore rules given with `-e` options from the command line. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git restore' or 'git reset') to create a pristine working directory to test a clean build."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:69
+#: en/git-clean.txt:71
#, no-wrap, priority:100
msgid "-X"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:72
+#: en/git-clean.txt:74
#, priority:100
msgid "Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files."
msgstr ""
#. type: Title -
-#: en/git-clean.txt:74
+#: en/git-clean.txt:76
#, no-wrap, priority:100
msgid "Interactive mode"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:78
+#: en/git-clean.txt:80
#, priority:100
msgid "When the command enters the interactive mode, it shows the files and directories to be cleaned, and goes into its interactive command loop."
msgstr ""
#. type: delimited block -
-#: en/git-clean.txt:89
+#: en/git-clean.txt:91
#, no-wrap, priority:100
msgid ""
" *** Commands ***\n"
@@ -13064,91 +13082,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:92
+#: en/git-clean.txt:94
#, priority:100
msgid "You also could say `c` or `clean` above as long as the choice is unique."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:94
+#: en/git-clean.txt:96
#, priority:100
msgid "The main command loop has 6 subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:95
+#: en/git-clean.txt:97
#, no-wrap, priority:100
msgid "clean"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:98
+#: en/git-clean.txt:100
#, priority:100
msgid "Start cleaning files and directories, and then quit."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:99
+#: en/git-clean.txt:101
#, no-wrap, priority:100
msgid "filter by pattern"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:107
+#: en/git-clean.txt:109
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Input ignore patterns>>\" prompt. You can input space-separated patterns to exclude files and directories from deletion. E.g. \"*.c *.h\" will excludes files end with \".c\" and \".h\" from deletion. When you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:108
+#: en/git-clean.txt:110
#, no-wrap, priority:100
msgid "select by numbers"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:119
+#: en/git-clean.txt:121
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Select items to delete>>\" prompt. When the prompt ends with double '>>' like this, you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything. Also when you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:120
+#: en/git-clean.txt:122
#, no-wrap, priority:100
msgid "ask each"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:125
+#: en/git-clean.txt:127
#, priority:100
msgid "This will start to clean, and you must confirm one by one in order to delete items. Please note that this action is not as efficient as the above two actions."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:126
+#: en/git-clean.txt:128
#, no-wrap, priority:100
msgid "quit"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:129
+#: en/git-clean.txt:131
#, priority:100
msgid "This lets you quit without do cleaning."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:130
+#: en/git-clean.txt:132
#, no-wrap, priority:100
msgid "help"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:133
+#: en/git-clean.txt:135
#, priority:100
msgid "Show brief usage of interactive git-clean."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:137 en/git-status.txt:436
+#: en/git-clean.txt:139 en/git-status.txt:440
#, ignore-same, priority:280
msgid "linkgit:gitignore[5]"
msgstr "linkgit:gitignore[5]"
@@ -13287,7 +13305,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:108 en/git-submodule.txt:392
+#: en/git-clone.txt:108 en/git-submodule.txt:393
#, ignore-same, no-wrap, priority:300
msgid "--dissociate"
msgstr "--dissociate"
@@ -13517,7 +13535,7 @@ msgstr "--[no-]remote-submodules"
#. type: Plain text
#: en/git-clone.txt:269
#, priority:300
-msgid "All submodules which are cloned will use the status of the submodule�셲 remote-tracking branch to update the submodule, rather than the superproject�셲 recorded SHA-1. Equivalent to passing `--remote` to `git submodule update`."
+msgid "All submodules which are cloned will use the status of the submodules remote-tracking branch to update the submodule, rather than the superprojects recorded SHA-1. Equivalent to passing `--remote` to `git submodule update`."
msgstr ""
#. type: Labeled list
@@ -13533,13 +13551,13 @@ msgid "Instead of placing the cloned repository where it is supposed to be, plac
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:277 en/git-submodule.txt:416
+#: en/git-clone.txt:277 en/git-submodule.txt:417
#, no-wrap, priority:300
msgid "-j <n>"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:278 en/git-submodule.txt:417
+#: en/git-clone.txt:278 en/git-submodule.txt:418
#, no-wrap, priority:300
msgid "--jobs <n>"
msgstr ""
@@ -13897,7 +13915,7 @@ msgid "Read the commit log message from the given file. Use `-` to read from the
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:68 en/git-commit.txt:339
+#: en/git-commit-tree.txt:68 en/git-commit.txt:341
#, ignore-same, no-wrap, priority:280
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
@@ -13981,7 +13999,7 @@ msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:477 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:428 en/git-svn.txt:1156
+#: en/git-commit-tree.txt:114 en/git-commit.txt:479 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:429 en/git-svn.txt:1156
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
@@ -14287,13 +14305,13 @@ msgid "When editing the commit message, start the editor with the contents in th
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:173 en/merge-options.txt:81
+#: en/git-commit.txt:173 en/merge-options.txt:85
#, priority:280
msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:175 en/git-rebase.txt:330
+#: en/git-commit.txt:175 en/git-rebase.txt:348 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14500,115 +14518,115 @@ msgid "Show untracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:288
+#: en/git-commit.txt:289
#, priority:280
msgid "The mode parameter is optional (defaults to 'all'), and is used to specify the handling of untracked files; when -u is not used, the default is 'normal', i.e. show untracked files and directories."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:290 en/git-status.txt:67 en/git-status.txt:107
+#: en/git-commit.txt:291 en/git-status.txt:68 en/git-status.txt:110
#, priority:280
msgid "The possible options are:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:292
+#: en/git-commit.txt:293
#, no-wrap, priority:280
msgid "'no' - Show no untracked files\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:293
+#: en/git-commit.txt:294
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:294 en/git-status.txt:71
+#: en/git-commit.txt:295 en/git-status.txt:72
#, no-wrap, priority:280
msgid "'all' - Also shows individual files in untracked directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:297 en/git-status.txt:84
+#: en/git-commit.txt:298 en/git-status.txt:85
#, priority:280
msgid "The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:308
+#: en/git-commit.txt:310
#, priority:280
msgid "Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template to help the user describe the commit by reminding what changes the commit has. Note that this diff output doesn't have its lines prefixed with '#'. This diff will not be a part of the commit message. See the `commit.verbose` configuration variable in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:312
+#: en/git-commit.txt:314
#, priority:280
msgid "If specified twice, show in addition the unified diff between what would be committed and the worktree files, i.e. the unstaged changes to tracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:316
+#: en/git-commit.txt:318
#, priority:280
msgid "Suppress commit summary message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:321
+#: en/git-commit.txt:323
#, priority:280
msgid "Do not create a commit, but show a list of paths that are to be committed, paths with local changes that will be left uncommitted and paths that are untracked."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:322
+#: en/git-commit.txt:324
#, ignore-same, no-wrap, priority:280
msgid "--status"
msgstr "--status"
#. type: Plain text
-#: en/git-commit.txt:327
+#: en/git-commit.txt:329
#, priority:280
msgid "Include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the commit message. Defaults to on, but can be used to override configuration variable commit.status."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:328
+#: en/git-commit.txt:330
#, ignore-same, no-wrap, priority:280
msgid "--no-status"
msgstr "--no-status"
#. type: Plain text
-#: en/git-commit.txt:332
+#: en/git-commit.txt:334
#, priority:280
msgid "Do not include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the default commit message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:342
+#: en/git-commit.txt:344
#, priority:280
msgid "Countermand `commit.gpgSign` configuration variable that is set to force each and every commit to be signed."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:346 en/git-rm.txt:29
+#: en/git-commit.txt:348 en/git-rm.txt:29
#, ignore-ellipsis, no-wrap, priority:280
msgid "<file>..."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:352
+#: en/git-commit.txt:354
#, priority:280
msgid "When files are given on the command line, the command commits the contents of the named files, without recording the changes already staged. The contents of these files are also staged for the next commit on top of what have been staged before."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:369
+#: en/git-commit.txt:371
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:375
+#: en/git-commit.txt:377
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14618,13 +14636,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:383
+#: en/git-commit.txt:385
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:388
+#: en/git-commit.txt:390
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14633,19 +14651,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:393
+#: en/git-commit.txt:395
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:398
+#: en/git-commit.txt:400
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:404
+#: en/git-commit.txt:406
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14655,31 +14673,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:411
+#: en/git-commit.txt:413
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:414 en/git-commit.txt:440
+#: en/git-commit.txt:416 en/git-commit.txt:442
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:418
+#: en/git-commit.txt:420
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:426
+#: en/git-commit.txt:428
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:432
+#: en/git-commit.txt:434
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14689,55 +14707,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:437
+#: en/git-commit.txt:439
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:448
+#: en/git-commit.txt:450
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:460
+#: en/git-commit.txt:462
#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:464
+#: en/git-commit.txt:466
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:469
+#: en/git-commit.txt:471
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:475
+#: en/git-commit.txt:477
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:479
+#: en/git-commit.txt:481
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:485
+#: en/git-commit.txt:487
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:493
+#: en/git-commit.txt:495
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -15405,211 +15423,211 @@ msgstr ""
msgid "Given a .git/config like this:"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:347
+#. type: delimited block -
+#: en/git-config.txt:348
#, no-wrap, priority:100
msgid ""
-"\t#\n"
-"\t# This is the config file, and\n"
-"\t# a '#' or ';' character indicates\n"
-"\t# a comment\n"
-"\t#\n"
+"#\n"
+"# This is the config file, and\n"
+"# a '#' or ';' character indicates\n"
+"# a comment\n"
+"#\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:352
+#. type: delimited block -
+#: en/git-config.txt:353 en/git.txt:310
#, no-wrap, priority:100
msgid ""
-"\t; core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"; core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:357
+#. type: delimited block -
+#: en/git-config.txt:358
#, no-wrap, priority:100
msgid ""
-"\t; Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"; Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:362
+#. type: delimited block -
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
-"\t; Proxy settings\n"
-"\t[core]\n"
-"\t\tgitproxy=proxy-command for kernel.org\n"
-"\t\tgitproxy=default-proxy ; for all the rest\n"
+"; Proxy settings\n"
+"[core]\n"
+"\tgitproxy=proxy-command for kernel.org\n"
+"\tgitproxy=default-proxy ; for all the rest\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:369
+#. type: delimited block -
+#: en/git-config.txt:370
#, no-wrap, priority:100
msgid ""
-"\t; HTTP\n"
-"\t[http]\n"
-"\t\tsslVerify\n"
-"\t[http \"https://weak.example.com\"]\n"
-"\t\tsslVerify = false\n"
-"\t\tcookieFile = /tmp/cookie.txt\n"
+"; HTTP\n"
+"[http]\n"
+"\tsslVerify\n"
+"[http \"https://weak.example.com\"]\n"
+"\tsslVerify = false\n"
+"\tcookieFile = /tmp/cookie.txt\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:371
+#: en/git-config.txt:373
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:374
+#: en/git-config.txt:376
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:379
+#: en/git-config.txt:381
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:382
+#: en/git-config.txt:384
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:385
+#: en/git-config.txt:387
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:389
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:390
+#: en/git-config.txt:392
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:394
+#: en/git-config.txt:396
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:398
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:399
+#: en/git-config.txt:401
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:402 en/git-gui.txt:120 en/git-merge-index.txt:64
+#: en/git-config.txt:404 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:407
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:410
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:413
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:414
+#: en/git-config.txt:416
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:417
+#: en/git-config.txt:419
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:421
+#: en/git-config.txt:423
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:424
+#: en/git-config.txt:426
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:428
+#: en/git-config.txt:430
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:431
+#: en/git-config.txt:433
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:434
+#: en/git-config.txt:436
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:437
+#: en/git-config.txt:439
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:440
+#: en/git-config.txt:442
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:443
+#: en/git-config.txt:445
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:447
+#: en/git-config.txt:449
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:453
+#: en/git-config.txt:455
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15619,13 +15637,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:457
+#: en/git-config.txt:459
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:466
+#: en/git-config.txt:468
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15638,19 +15656,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:471 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1029 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
+#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:476
+#: en/git-config.txt:478
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:482
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15658,13 +15676,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:483
+#: en/git-config.txt:485
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:488
+#: en/git-config.txt:490
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -17027,7 +17045,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
msgstr ""
#. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:234
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
#, no-wrap, priority:100
msgid "LIMITATIONS"
msgstr ""
@@ -18532,7 +18550,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:976
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:992
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19084,7 +19102,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:422
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:423
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -19180,13 +19198,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:982
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:998
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:988
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1004
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -19541,9 +19559,9 @@ msgid "This program dumps the given revisions in a form suitable to be piped int
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:22
+#: en/git-fast-export.txt:23
#, priority:100
-msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a kind of an interactive 'git filter-branch'."
+msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
@@ -19630,146 +19648,158 @@ msgstr ""
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
+#. type: Labeled list
+#: en/git-fast-export.txt:79
+#, ignore-same, no-wrap, priority:100
+msgid "--mark-tags"
+msgstr "--mark-tags"
+
+#. type: Plain text
+#: en/git-fast-export.txt:87
+#, priority:100
+msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
+msgstr ""
+
#. type: Plain text
-#: en/git-fast-export.txt:83
+#: en/git-fast-export.txt:92
#, priority:100
-msgid "Any commits that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
+msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:84
+#: en/git-fast-export.txt:93
#, ignore-same, no-wrap, priority:100
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
-#: en/git-fast-export.txt:89
+#: en/git-fast-export.txt:98
#, priority:100
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:90
+#: en/git-fast-export.txt:99
#, ignore-same, no-wrap, priority:100
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
-#: en/git-fast-export.txt:93
+#: en/git-fast-export.txt:102
#, priority:100
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:94
+#: en/git-fast-export.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
-#: en/git-fast-export.txt:101
+#: en/git-fast-export.txt:110
#, priority:100
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
+#: en/git-fast-export.txt:111 en/git-ls-tree.txt:72
#, ignore-same, no-wrap, priority:100
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
-#: en/git-fast-export.txt:107
+#: en/git-fast-export.txt:116
#, priority:100
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:108
+#: en/git-fast-export.txt:117
#, ignore-same, no-wrap, priority:100
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
-#: en/git-fast-export.txt:112
+#: en/git-fast-export.txt:121
#, priority:100
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:113
+#: en/git-fast-export.txt:122
#, ignore-same, no-wrap, priority:100
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
-#: en/git-fast-export.txt:124
+#: en/git-fast-export.txt:133
#, priority:100
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:125
+#: en/git-fast-export.txt:134
#, ignore-same, no-wrap, priority:100
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
-#: en/git-fast-export.txt:131
+#: en/git-fast-export.txt:140
#, priority:100
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:132
+#: en/git-fast-export.txt:141
#, no-wrap, priority:100
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:138
+#: en/git-fast-export.txt:147
#, priority:100
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be reencoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:139
+#: en/git-fast-export.txt:148
#, ignore-same, no-wrap, priority:100
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
-#: en/git-fast-export.txt:142
+#: en/git-fast-export.txt:151
#, priority:100
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:143
+#: en/git-fast-export.txt:152
#, ignore-ellipsis, no-wrap, priority:100
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:160
#, priority:100
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:157
+#: en/git-fast-export.txt:166
#, no-wrap, priority:100
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:162
+#: en/git-fast-export.txt:171
#, priority:100
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:167
+#: en/git-fast-export.txt:176
#, no-wrap, priority:100
msgid ""
"$ git fast-export master~5..master |\n"
@@ -19778,55 +19808,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:180
#, priority:100
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:175
+#: en/git-fast-export.txt:184
#, priority:100
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
-#: en/git-fast-export.txt:178
+#: en/git-fast-export.txt:187
#, no-wrap, priority:100
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:186
+#: en/git-fast-export.txt:195
#, priority:100
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:198
+#: en/git-fast-export.txt:207
#, priority:100
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:201
+#: en/git-fast-export.txt:210
#, priority:100
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:204
+#: en/git-fast-export.txt:213
#, no-wrap, priority:100
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:209
+#: en/git-fast-export.txt:218
#, priority:100
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:215
+#: en/git-fast-export.txt:224
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git init anon-repo\n"
@@ -19836,25 +19866,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:222
+#: en/git-fast-export.txt:231
#, priority:100
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:225
+#: en/git-fast-export.txt:234
#, no-wrap, priority:100
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:240
#, priority:100
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:239
+#: en/git-fast-export.txt:248
#, priority:100
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
@@ -20088,7 +20118,7 @@ msgid "See linkgit:git-config[1]"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:144 en/git-p4.txt:507
+#: en/git-fast-import.txt:144 en/git-filter-branch.txt:463 en/git-p4.txt:507
#, no-wrap, priority:100
msgid "PERFORMANCE"
msgstr ""
@@ -20322,7 +20352,7 @@ msgid "fast-import accepts several commands to update the current repository and
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:319 en/git-fast-import.txt:381
+#: en/git-fast-import.txt:319 en/git-fast-import.txt:388
#, ignore-same, no-wrap, priority:100
msgid "`commit`"
msgstr "`commit`"
@@ -20334,7 +20364,7 @@ msgid "Creates a new branch or updates an existing branch by creating a new comm
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:324 en/git-fast-import.txt:771
+#: en/git-fast-import.txt:324 en/git-fast-import.txt:778
#, ignore-same, no-wrap, priority:100
msgid "`tag`"
msgstr "`tag`"
@@ -20346,7 +20376,7 @@ msgid "Creates an annotated tag object from an existing commit or branch. Light
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:330 en/git-fast-import.txt:815
+#: en/git-fast-import.txt:330 en/git-fast-import.txt:823
#, ignore-same, no-wrap, priority:100
msgid "`reset`"
msgstr "`reset`"
@@ -20358,7 +20388,7 @@ msgid "Reset an existing branch (or a new branch) to a specific revision. This
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:335 en/git-fast-import.txt:844
+#: en/git-fast-import.txt:335 en/git-fast-import.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`blob`"
msgstr "`blob`"
@@ -20370,109 +20400,121 @@ msgid "Convert raw file data into a blob, for future use in a `commit` command.
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:340 en/git-fast-import.txt:917
+#: en/git-fast-import.txt:340 en/git-fast-import.txt:925
+#, ignore-same, no-wrap, priority:100
+msgid "`alias`"
+msgstr "`alias`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:346
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
+msgstr ""
+
+#. type: Title ~
+#: en/git-fast-import.txt:347 en/git-fast-import.txt:940
#, ignore-same, no-wrap, priority:100
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
-#: en/git-fast-import.txt:345
+#: en/git-fast-import.txt:352
#, priority:100
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:346 en/git-fast-import.txt:945
+#: en/git-fast-import.txt:353 en/git-fast-import.txt:968
#, ignore-same, no-wrap, priority:100
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
-#: en/git-fast-import.txt:350
+#: en/git-fast-import.txt:357
#, priority:100
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:351 en/git-fast-import.txt:1152
+#: en/git-fast-import.txt:358 en/git-fast-import.txt:1175
#, ignore-same, no-wrap, priority:100
msgid "`done`"
msgstr "`done`"
#. type: Plain text
-#: en/git-fast-import.txt:355
+#: en/git-fast-import.txt:362
#, priority:100
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:356 en/git-fast-import.txt:970
+#: en/git-fast-import.txt:363 en/git-fast-import.txt:993
#, ignore-same, no-wrap, priority:100
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
-#: en/git-fast-import.txt:360
+#: en/git-fast-import.txt:367
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:361 en/git-fast-import.txt:985
+#: en/git-fast-import.txt:368 en/git-fast-import.txt:1008
#, ignore-same, no-wrap, priority:100
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
-#: en/git-fast-import.txt:365
+#: en/git-fast-import.txt:372
#, priority:100
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:366 en/git-fast-import.txt:1016
+#: en/git-fast-import.txt:373 en/git-fast-import.txt:1039
#, ignore-same, no-wrap, priority:100
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
-#: en/git-fast-import.txt:370
+#: en/git-fast-import.txt:377
#, priority:100
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:371 en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:378 en/git-fast-import.txt:1092
#, ignore-same, no-wrap, priority:100
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
#, priority:100
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:1124
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:1147
#, ignore-same, no-wrap, priority:100
msgid "`option`"
msgstr "`option`"
#. type: Plain text
-#: en/git-fast-import.txt:379
+#: en/git-fast-import.txt:386
#, priority:100
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:384
+#: en/git-fast-import.txt:391
#, priority:100
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
#, no-wrap, priority:100
msgid ""
"\t'commit' SP <ref> LF\n"
@@ -20483,247 +20525,247 @@ msgid ""
"\t('encoding' SP <encoding>)?\n"
"\tdata\n"
"\t('from' SP <commit-ish> LF)?\n"
-"\t('merge' SP <commit-ish> LF)?\n"
+"\t('merge' SP <commit-ish> LF)*\n"
"\t(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*\n"
"\tLF?\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:405
+#: en/git-fast-import.txt:412
#, priority:100
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:411
+#: en/git-fast-import.txt:418
#, priority:100
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:417
+#: en/git-fast-import.txt:424
#, priority:100
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:425
+#: en/git-fast-import.txt:432
#, priority:100
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:432
+#: en/git-fast-import.txt:439
#, priority:100
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:434
+#: en/git-fast-import.txt:441
#, ignore-same, no-wrap, priority:100
msgid "`author`"
msgstr "`author`"
#. type: Plain text
-#: en/git-fast-import.txt:440
+#: en/git-fast-import.txt:447
#, priority:100
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:442
+#: en/git-fast-import.txt:449
#, ignore-same, no-wrap, priority:100
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
-#: en/git-fast-import.txt:445
+#: en/git-fast-import.txt:452
#, priority:100
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
#, priority:100
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:458
+#: en/git-fast-import.txt:465
#, priority:100
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:460
+#: en/git-fast-import.txt:467
#, ignore-same, no-wrap, priority:100
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
-#: en/git-fast-import.txt:464
+#: en/git-fast-import.txt:471
#, priority:100
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:466
+#: en/git-fast-import.txt:473
#, ignore-same, no-wrap, priority:100
msgid "`from`"
msgstr "`from`"
#. type: Plain text
-#: en/git-fast-import.txt:472
+#: en/git-fast-import.txt:479
#, priority:100
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
#, priority:100
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:485
+#: en/git-fast-import.txt:492
#, priority:100
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
#, priority:100
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:491
+#: en/git-fast-import.txt:498
#, priority:100
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:493
+#: en/git-fast-import.txt:500
#, priority:100
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:499
+#: en/git-fast-import.txt:506
#, priority:100
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:501
+#: en/git-fast-import.txt:508
#, priority:100
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:503
+#: en/git-fast-import.txt:510
#, priority:100
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
#, priority:100
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:509
+#: en/git-fast-import.txt:516
#, priority:100
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:512
+#: en/git-fast-import.txt:519
#, priority:100
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
#, no-wrap, priority:100
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:521
+#: en/git-fast-import.txt:528
#, priority:100
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:523
+#: en/git-fast-import.txt:530
#, ignore-same, no-wrap, priority:100
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
-#: en/git-fast-import.txt:531
+#: en/git-fast-import.txt:538
#, priority:100
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:534
+#: en/git-fast-import.txt:541
#, priority:100
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:536
+#: en/git-fast-import.txt:543
#, ignore-same, no-wrap, priority:100
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:540
+#: en/git-fast-import.txt:547
#, priority:100
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:541 en/git-fast-import.txt:708
+#: en/git-fast-import.txt:548 en/git-fast-import.txt:715
#, no-wrap, priority:100
msgid "External data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:544
+#: en/git-fast-import.txt:551
#, priority:100
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:547
+#: en/git-fast-import.txt:554
#, no-wrap, priority:100
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
#, priority:100
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:555 en/git-fast-import.txt:721
+#: en/git-fast-import.txt:562 en/git-fast-import.txt:728
#, no-wrap, priority:100
msgid "Inline data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:559
+#: en/git-fast-import.txt:566
#, priority:100
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
#, no-wrap, priority:100
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -20731,259 +20773,259 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:566 en/git-fast-import.txt:732
+#: en/git-fast-import.txt:573 en/git-fast-import.txt:739
#, priority:100
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:569
+#: en/git-fast-import.txt:576
#, priority:100
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
#, priority:100
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:574
+#: en/git-fast-import.txt:581
#, priority:100
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:575
+#: en/git-fast-import.txt:582
#, priority:100
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
#, priority:100
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:580
+#: en/git-fast-import.txt:587
#, priority:100
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:583
+#: en/git-fast-import.txt:590
#, priority:100
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:587
+#: en/git-fast-import.txt:594
#, priority:100
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:594
+#: en/git-fast-import.txt:601
#, priority:100
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
#, priority:100
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:598
+#: en/git-fast-import.txt:605
#, priority:100
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:599
+#: en/git-fast-import.txt:606
#, priority:100
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:600
+#: en/git-fast-import.txt:607
#, priority:100
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:602
+#: en/git-fast-import.txt:609
#, priority:100
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:604
+#: en/git-fast-import.txt:611
#, priority:100
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:606
+#: en/git-fast-import.txt:613
#, priority:100
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:608
+#: en/git-fast-import.txt:615
#, ignore-same, no-wrap, priority:100
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
-#: en/git-fast-import.txt:614
+#: en/git-fast-import.txt:621
#, priority:100
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
#, no-wrap, priority:100
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
#, priority:100
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:624
+#: en/git-fast-import.txt:631
#, ignore-same, no-wrap, priority:100
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
#, priority:100
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:632
+#: en/git-fast-import.txt:639
#, no-wrap, priority:100
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:638 en/git-fast-import.txt:658
+#: en/git-fast-import.txt:645 en/git-fast-import.txt:665
#, priority:100
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:643
+#: en/git-fast-import.txt:650
#, priority:100
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:645
+#: en/git-fast-import.txt:652
#, ignore-same, no-wrap, priority:100
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
-#: en/git-fast-import.txt:649
+#: en/git-fast-import.txt:656
#, priority:100
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:652
+#: en/git-fast-import.txt:659
#, no-wrap, priority:100
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:663
+#: en/git-fast-import.txt:670
#, priority:100
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:672
+#: en/git-fast-import.txt:679
#, priority:100
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
-#: en/git-fast-import.txt:679
+#: en/git-fast-import.txt:686
#, priority:100
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:682
+#: en/git-fast-import.txt:689
#, no-wrap, priority:100
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:688
+#: en/git-fast-import.txt:695
#, priority:100
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:696
+#: en/git-fast-import.txt:703
#, priority:100
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:698
+#: en/git-fast-import.txt:705
#, ignore-same, no-wrap, priority:100
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:707
+#: en/git-fast-import.txt:714
#, priority:100
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:712
+#: en/git-fast-import.txt:719
#, priority:100
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:715
+#: en/git-fast-import.txt:722
#, no-wrap, priority:100
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:720
+#: en/git-fast-import.txt:727
#, priority:100
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:725
+#: en/git-fast-import.txt:732
#, priority:100
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:729
+#: en/git-fast-import.txt:736
#, no-wrap, priority:100
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -20991,76 +21033,77 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:735
+#: en/git-fast-import.txt:742
#, priority:100
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:737
+#: en/git-fast-import.txt:744
#, ignore-same, no-wrap, priority:100
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
-#: en/git-fast-import.txt:743
+#: en/git-fast-import.txt:750
#, priority:100
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:746
+#: en/git-fast-import.txt:753
#, no-wrap, priority:100
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:752
+#: en/git-fast-import.txt:759
#, priority:100
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:756
+#: en/git-fast-import.txt:763
#, priority:100
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:758
+#: en/git-fast-import.txt:765
#, ignore-same, no-wrap, priority:100
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
-#: en/git-fast-import.txt:763
+#: en/git-fast-import.txt:770
#, priority:100
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:766
+#: en/git-fast-import.txt:773
#, no-wrap, priority:100
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:769
+#: en/git-fast-import.txt:776
#, priority:100
msgid "where `<object-identifer>` is any string not containing LF."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:774
+#: en/git-fast-import.txt:781
#, priority:100
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:781
+#: en/git-fast-import.txt:789
#, no-wrap, priority:100
msgid ""
"\t'tag' SP <name> LF\n"
+"\tmark?\n"
"\t'from' SP <commit-ish> LF\n"
"\toriginal-oid?\n"
"\t'tagger' (SP <name>)? SP LT <email> GT SP <when> LF\n"
@@ -21068,55 +21111,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:784
+#: en/git-fast-import.txt:792
#, priority:100
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:789
+#: en/git-fast-import.txt:797
#, priority:100
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:793
+#: en/git-fast-import.txt:801
#, priority:100
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:796
+#: en/git-fast-import.txt:804
#, priority:100
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:799
+#: en/git-fast-import.txt:807
#, priority:100
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:813
#, priority:100
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:813
+#: en/git-fast-import.txt:821
#, priority:100
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:820
+#: en/git-fast-import.txt:828
#, priority:100
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:825
+#: en/git-fast-import.txt:833
#, no-wrap, priority:100
msgid ""
"\t'reset' SP <ref> LF\n"
@@ -21125,25 +21168,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:829
+#: en/git-fast-import.txt:837
#, priority:100
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:831 en/git-fast-import.txt:943
+#: en/git-fast-import.txt:839 en/git-fast-import.txt:966
#, priority:100
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:834
+#: en/git-fast-import.txt:842
#, priority:100
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:838
+#: en/git-fast-import.txt:846
#, no-wrap, priority:100
msgid ""
"\treset refs/tags/938\n"
@@ -21151,19 +21194,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:850
#, priority:100
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:849
+#: en/git-fast-import.txt:857
#, priority:100
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:855
+#: en/git-fast-import.txt:863
#, no-wrap, priority:100
msgid ""
"\t'blob' LF\n"
@@ -21173,43 +21216,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:861
+#: en/git-fast-import.txt:869
#, priority:100
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:871
#, ignore-same, no-wrap, priority:100
msgid "`data`"
msgstr "`data`"
#. type: Plain text
-#: en/git-fast-import.txt:870
+#: en/git-fast-import.txt:878
#, priority:100
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:875
+#: en/git-fast-import.txt:883
#, priority:100
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:876
+#: en/git-fast-import.txt:884
#, no-wrap, priority:100
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:878
+#: en/git-fast-import.txt:886
#, priority:100
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:882
+#: en/git-fast-import.txt:890
#, no-wrap, priority:100
msgid ""
"\t'data' SP <count> LF\n"
@@ -21217,31 +21260,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:888
+#: en/git-fast-import.txt:896
#, priority:100
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:893
+#: en/git-fast-import.txt:901
#, priority:100
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:894
+#: en/git-fast-import.txt:902
#, no-wrap, priority:100
msgid "Delimited format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:899
+#: en/git-fast-import.txt:907
#, priority:100
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:905
+#: en/git-fast-import.txt:913
#, no-wrap, priority:100
msgid ""
"\t'data' SP '<<' <delim> LF\n"
@@ -21251,25 +21294,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:921
#, priority:100
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:915
+#: en/git-fast-import.txt:923
#, priority:100
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:920
+#: en/git-fast-import.txt:928
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object."
+msgstr ""
+
+#. type: delimited block .
+#: en/git-fast-import.txt:934
+#, no-wrap, priority:100
+msgid ""
+"\t'alias' LF\n"
+"\tmark\n"
+"\t'to' SP <commit-ish> LF\n"
+"\tLF?\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:937
+#, priority:100
+msgid "For a detailed description of `<commit-ish>` see above under `from`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:943
#, priority:100
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:924
+#: en/git-fast-import.txt:947
#, no-wrap, priority:100
msgid ""
"\t'checkpoint' LF\n"
@@ -21277,31 +21342,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:930
+#: en/git-fast-import.txt:953
#, priority:100
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:935
+#: en/git-fast-import.txt:958
#, priority:100
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:941
+#: en/git-fast-import.txt:964
#, priority:100
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:950
+#: en/git-fast-import.txt:973
#, priority:100
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:954
+#: en/git-fast-import.txt:977
#, no-wrap, priority:100
msgid ""
"\t'progress' SP <any> LF\n"
@@ -21309,67 +21374,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:960
+#: en/git-fast-import.txt:983
#, priority:100
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:986
#, no-wrap, priority:100
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:968
+#: en/git-fast-import.txt:991
#, priority:100
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:976
+#: en/git-fast-import.txt:999
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:979
+#: en/git-fast-import.txt:1002
#, no-wrap, priority:100
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:983 en/git-fast-import.txt:1014 en/git-fast-import.txt:1067
+#: en/git-fast-import.txt:1006 en/git-fast-import.txt:1037 en/git-fast-import.txt:1090
#, priority:100
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:991
+#: en/git-fast-import.txt:1014
#, priority:100
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:994
+#: en/git-fast-import.txt:1017
#, no-wrap, priority:100
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1022
#, priority:100
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:1024
#, priority:100
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1005
+#: en/git-fast-import.txt:1028
#, no-wrap, priority:100
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21377,283 +21442,283 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1011
+#: en/git-fast-import.txt:1034
#, priority:100
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1022
+#: en/git-fast-import.txt:1045
#, priority:100
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1025
+#: en/git-fast-import.txt:1048
#, priority:100
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1049
#, no-wrap, priority:100
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1030
+#: en/git-fast-import.txt:1053
#, priority:100
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1033
+#: en/git-fast-import.txt:1056
#, no-wrap, priority:100
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1035
+#: en/git-fast-import.txt:1058
#, no-wrap, priority:100
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1041
+#: en/git-fast-import.txt:1064
#, priority:100
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1044
+#: en/git-fast-import.txt:1067
#, no-wrap, priority:100
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1047
+#: en/git-fast-import.txt:1070
#, priority:100
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1072
#, priority:100
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1075
#, no-wrap, priority:100
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1080
#, priority:100
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1060
+#: en/git-fast-import.txt:1083
#, priority:100
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1086
#, no-wrap, priority:100
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1072
+#: en/git-fast-import.txt:1095
#, priority:100
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1075
+#: en/git-fast-import.txt:1098
#, no-wrap, priority:100
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1078
+#: en/git-fast-import.txt:1101
#, priority:100
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1079 en/git-fast-import.txt:1146
+#: en/git-fast-import.txt:1102 en/git-fast-import.txt:1169
#, no-wrap, priority:100
msgid "date-format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1080 en/git-fast-import.txt:1148
+#: en/git-fast-import.txt:1103 en/git-fast-import.txt:1171
#, no-wrap, priority:100
msgid "export-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1081
+#: en/git-fast-import.txt:1104
#, no-wrap, priority:100
msgid "relative-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1082
+#: en/git-fast-import.txt:1105
#, no-wrap, priority:100
msgid "no-relative-marks"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1083 en/git-fast-import.txt:1150
+#: en/git-fast-import.txt:1106 en/git-fast-import.txt:1173
#, no-wrap, priority:100
msgid "force"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1087
+#: en/git-fast-import.txt:1110
#, priority:100
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1088 en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1111 en/git-fast-import.txt:1170
#, no-wrap, priority:100
msgid "import-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1089
+#: en/git-fast-import.txt:1112
#, no-wrap, priority:100
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1097
+#: en/git-fast-import.txt:1120
#, priority:100
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1098
+#: en/git-fast-import.txt:1121
#, no-wrap, priority:100
msgid "get-mark"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1122
#, no-wrap, priority:100
msgid "cat-blob"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1100
+#: en/git-fast-import.txt:1123
#, no-wrap, priority:100
msgid "ls"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1108
+#: en/git-fast-import.txt:1131
#, priority:100
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1109
+#: en/git-fast-import.txt:1132
#, no-wrap, priority:100
msgid "notes"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1114
+#: en/git-fast-import.txt:1137
#, priority:100
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1138
#, no-wrap, priority:100
msgid "done"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1122
+#: en/git-fast-import.txt:1145
#, priority:100
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1129
+#: en/git-fast-import.txt:1152
#, priority:100
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1132
+#: en/git-fast-import.txt:1155
#, no-wrap, priority:100
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1137
+#: en/git-fast-import.txt:1160
#, priority:100
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1141
+#: en/git-fast-import.txt:1164
#, priority:100
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1144
+#: en/git-fast-import.txt:1167
#, priority:100
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1149
+#: en/git-fast-import.txt:1172
#, priority:100
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1178
#, priority:100
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1159
+#: en/git-fast-import.txt:1182
#, priority:100
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1161
+#: en/git-fast-import.txt:1184
#, no-wrap, priority:100
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1168
+#: en/git-fast-import.txt:1191
#, priority:100
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1175
+#: en/git-fast-import.txt:1198
#, priority:100
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1203
#, no-wrap, priority:100
msgid ""
"\tmkfifo fast-import-output\n"
@@ -21662,49 +21727,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1184
+#: en/git-fast-import.txt:1207
#, priority:100
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1188
+#: en/git-fast-import.txt:1211
#, priority:100
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1213
#, no-wrap, priority:100
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1196
+#: en/git-fast-import.txt:1219
#, priority:100
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1203
+#: en/git-fast-import.txt:1226
#, priority:100
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1211
+#: en/git-fast-import.txt:1234
#, priority:100
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1236
#, priority:100
msgid "An example crash:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1229
+#: en/git-fast-import.txt:1252
#, no-wrap, priority:100
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
@@ -21724,7 +21789,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1256
#, no-wrap, priority:100
msgid ""
"\t$ git fast-import <in\n"
@@ -21733,7 +21798,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1239
+#: en/git-fast-import.txt:1262
#, no-wrap, priority:100
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
@@ -21744,13 +21809,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1241
+#: en/git-fast-import.txt:1264
#, no-wrap, priority:100
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1251
+#: en/git-fast-import.txt:1274
#, no-wrap, priority:100
msgid ""
"\tMost Recent Commands Before Crash\n"
@@ -21765,13 +21830,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1252
+#: en/git-fast-import.txt:1275
#, no-wrap, priority:100
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1255
+#: en/git-fast-import.txt:1278
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
@@ -21779,25 +21844,25 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1256
+#: en/git-fast-import.txt:1279
#, no-wrap, priority:100
msgid "active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1259
+#: en/git-fast-import.txt:1282
#, priority:100
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1260
+#: en/git-fast-import.txt:1283
#, priority:100
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1264
+#: en/git-fast-import.txt:1287
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
@@ -21806,7 +21871,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1270
+#: en/git-fast-import.txt:1293
#, no-wrap, priority:100
msgid ""
"status : active loaded dirty\n"
@@ -21818,307 +21883,307 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1274
+#: en/git-fast-import.txt:1297
#, priority:100
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1277
+#: en/git-fast-import.txt:1300
#, no-wrap, priority:100
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1280
+#: en/git-fast-import.txt:1303
#, priority:100
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1282
+#: en/git-fast-import.txt:1305
#, no-wrap, priority:100
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1290
+#: en/git-fast-import.txt:1313
#, priority:100
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1294
+#: en/git-fast-import.txt:1317
#, priority:100
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1296
+#: en/git-fast-import.txt:1319
#, no-wrap, priority:100
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1301
+#: en/git-fast-import.txt:1324
#, priority:100
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1305
+#: en/git-fast-import.txt:1328
#, priority:100
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1307
+#: en/git-fast-import.txt:1330
#, no-wrap, priority:100
msgid "Handling Renames"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1312
+#: en/git-fast-import.txt:1335
#, priority:100
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1337
#, no-wrap, priority:100
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1341
#, priority:100
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1325
+#: en/git-fast-import.txt:1348
#, priority:100
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1331
+#: en/git-fast-import.txt:1354
#, priority:100
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1337
+#: en/git-fast-import.txt:1360
#, priority:100
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1363
#, priority:100
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1342
+#: en/git-fast-import.txt:1365
#, no-wrap, priority:100
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1346
+#: en/git-fast-import.txt:1369
#, priority:100
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1353
+#: en/git-fast-import.txt:1376
#, priority:100
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1358
+#: en/git-fast-import.txt:1381
#, priority:100
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1360
+#: en/git-fast-import.txt:1383
#, no-wrap, priority:100
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1367
+#: en/git-fast-import.txt:1390
#, priority:100
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1369
+#: en/git-fast-import.txt:1392
#, no-wrap, priority:100
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1399
#, priority:100
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1379
+#: en/git-fast-import.txt:1402
#, no-wrap, priority:100
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1385
+#: en/git-fast-import.txt:1408
#, priority:100
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1393
+#: en/git-fast-import.txt:1416
#, priority:100
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1423
#, priority:100
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1407
+#: en/git-fast-import.txt:1430
#, priority:100
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1415
+#: en/git-fast-import.txt:1438
#, priority:100
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1417
+#: en/git-fast-import.txt:1440
#, no-wrap, priority:100
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1423
+#: en/git-fast-import.txt:1446
#, priority:100
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1448
#, no-wrap, priority:100
msgid "per object"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1432
+#: en/git-fast-import.txt:1455
#, priority:100
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1438
+#: en/git-fast-import.txt:1461
#, priority:100
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1440
+#: en/git-fast-import.txt:1463
#, no-wrap, priority:100
msgid "per mark"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1446
+#: en/git-fast-import.txt:1469
#, priority:100
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1448
+#: en/git-fast-import.txt:1471
#, no-wrap, priority:100
msgid "per branch"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1474
#, priority:100
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1457
+#: en/git-fast-import.txt:1480
#, priority:100
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1464
+#: en/git-fast-import.txt:1487
#, priority:100
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1468
+#: en/git-fast-import.txt:1491
#, priority:100
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1496
#, priority:100
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1498
#, no-wrap, priority:100
msgid "per active tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1480
+#: en/git-fast-import.txt:1503
#, priority:100
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1482
+#: en/git-fast-import.txt:1505
#, no-wrap, priority:100
msgid "per active file entry"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1488
+#: en/git-fast-import.txt:1511
#, priority:100
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1493
+#: en/git-fast-import.txt:1516
#, priority:100
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1495
+#: en/git-fast-import.txt:1518
#, no-wrap, priority:100
msgid "SIGNALS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1501
+#: en/git-fast-import.txt:1524
#, priority:100
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -22679,7 +22744,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1041
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -22795,20 +22860,32 @@ msgid ""
"\t[--state-branch <branch>] [--] [<rev-list options>...]\n"
msgstr ""
+#. type: Title -
+#: en/git-filter-branch.txt:20
+#, no-wrap, priority:100
+msgid "WARNING"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:31
+#, priority:100
+msgid "'git filter-branch' has a plethora of pitfalls that can produce non-obvious manglings of the intended history rewrite (and can leave you with little time to investigate such problems since it has such abysmal performance). These safety and performance issues cannot be backward compatibly fixed and as such, its use is not recommended. Please use an alternative history filtering tool such as https://github.com/newren/git-filter-repo/[git filter-repo]. If you still need to use 'git filter-branch', please carefully read <<SAFETY>> (and <<PERFORMANCE>>) to learn about the land mines of filter-branch, and then vigilantly avoid as many of the hazards listed there as reasonably possible."
+msgstr ""
+
#. type: Plain text
-#: en/git-filter-branch.txt:27
+#: en/git-filter-branch.txt:40
#, priority:100
msgid "Lets you rewrite Git revision history by rewriting the branches mentioned in the <rev-list options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge information) will be preserved."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:34
+#: en/git-filter-branch.txt:47
#, priority:100
msgid "The command will only rewrite the _positive_ refs mentioned in the command line (e.g. if you pass 'a..b', only 'b' will be rewritten). If you specify no filters, the commits will be recommitted without any changes, which would normally have no effect. Nevertheless, this may be useful in the future for compensating for some Git bugs or such, therefore such a usage is permitted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:39
+#: en/git-filter-branch.txt:52
#, no-wrap, priority:100
msgid ""
"*NOTE*: This command honors `.git/info/grafts` file and refs in\n"
@@ -22818,7 +22895,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:48
+#: en/git-filter-branch.txt:61
#, no-wrap, priority:100
msgid ""
"*WARNING*! The rewritten history will have different object names for all\n"
@@ -22832,337 +22909,337 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:52
+#: en/git-filter-branch.txt:65
#, priority:100
msgid "Always verify that the rewritten version is correct: The original refs, if different from the rewritten ones, will be stored in the namespace 'refs/original/'."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:56
+#: en/git-filter-branch.txt:69
#, priority:100
msgid "Note that since this operation is very I/O expensive, it might be a good idea to redirect the temporary directory off-disk with the `-d` option, e.g. on tmpfs. Reportedly the speedup is very noticeable."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:59
+#: en/git-filter-branch.txt:72
#, no-wrap, priority:100
msgid "Filters"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:71
+#: en/git-filter-branch.txt:84
#, priority:100
msgid "The filters are applied in the order as listed below. The <command> argument is always evaluated in the shell context using the 'eval' command (with the notable exception of the commit filter, for technical reasons). Prior to that, the `$GIT_COMMIT` environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, and GIT_COMMITTER_DATE are taken from the current commit and exported to the environment, in order to affect the author and committer identities of the replacement commit created by linkgit:git-commit-tree[1] after the filters have run."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:74
+#: en/git-filter-branch.txt:87
#, priority:100
msgid "If any evaluation of <command> returns a non-zero exit status, the whole operation will be aborted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:80
+#: en/git-filter-branch.txt:93
#, priority:100
msgid "A 'map' function is available that takes an \"original sha1 id\" argument and outputs a \"rewritten sha1 id\" if the commit has been already rewritten, and \"original sha1 id\" otherwise; the 'map' function can return several ids on separate lines if your commit filter emitted multiple commits."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:85
+#: en/git-filter-branch.txt:98
#, no-wrap, priority:100
msgid "--setup <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:91
+#: en/git-filter-branch.txt:104
#, priority:100
msgid "This is not a real filter executed for each commit but a one time setup just before the loop. Therefore no commit-specific variables are defined yet. Functions or variables defined here can be used or modified in the following filter steps except the commit filter, for technical reasons."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:92
+#: en/git-filter-branch.txt:105
#, no-wrap, priority:100
msgid "--subdirectory-filter <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:96
+#: en/git-filter-branch.txt:109
#, priority:100
msgid "Only look at the history which touches the given subdirectory. The result will contain that directory (and only that) as its project root. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:97
+#: en/git-filter-branch.txt:110
#, no-wrap, priority:100
msgid "--env-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:102
+#: en/git-filter-branch.txt:115
#, priority:100
msgid "This filter may be used if you only need to modify the environment in which the commit will be performed. Specifically, you might want to rewrite the author/committer name/email/time environment variables (see linkgit:git-commit-tree[1] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:103
+#: en/git-filter-branch.txt:116
#, no-wrap, priority:100
msgid "--tree-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:110
+#: en/git-filter-branch.txt:123
#, priority:100
msgid "This is the filter for rewriting the tree and its contents. The argument is evaluated in shell with the working directory set to the root of the checked out tree. The new tree is then used as-is (new files are auto-added, disappeared files are auto-removed - neither .gitignore files nor any other ignore rules *HAVE ANY EFFECT*!)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:111
+#: en/git-filter-branch.txt:124
#, no-wrap, priority:100
msgid "--index-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:117
+#: en/git-filter-branch.txt:130
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the index. It is similar to the tree filter but does not check out the tree, which makes it much faster. Frequently used with `git rm --cached --ignore-unmatch ...`, see EXAMPLES below. For hairy cases, see linkgit:git-update-index[1]."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:118
+#: en/git-filter-branch.txt:131
#, no-wrap, priority:100
msgid "--parent-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:125
+#: en/git-filter-branch.txt:138
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the commit's parent list. It will receive the parent string on stdin and shall output the new parent string on stdout. The parent string is in the format described in linkgit:git-commit-tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and \"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:126
+#: en/git-filter-branch.txt:139
#, no-wrap, priority:100
msgid "--msg-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:131
+#: en/git-filter-branch.txt:144
#, priority:100
msgid "This is the filter for rewriting the commit messages. The argument is evaluated in the shell with the original commit message on standard input; its standard output is used as the new commit message."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:132
+#: en/git-filter-branch.txt:145
#, no-wrap, priority:100
msgid "--commit-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:138
+#: en/git-filter-branch.txt:151
#, ignore-ellipsis, priority:100
msgid "This is the filter for performing the commit. If this filter is specified, it will be called instead of the 'git commit-tree' command, with arguments of the form \"<TREE_ID> [(-p <PARENT_COMMIT_ID>)...]\" and the log message on stdin. The commit id is expected on stdout."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:142
+#: en/git-filter-branch.txt:155
#, priority:100
msgid "As a special extension, the commit filter may emit multiple commit ids; in that case, the rewritten children of the original commit will have all of them as parents."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:147
+#: en/git-filter-branch.txt:160
#, priority:100
msgid "You can use the 'map' convenience function in this filter, and other convenience functions, too. For example, calling 'skip_commit \"$@\"' will leave out the current commit (but not its changes! If you want that, use 'git rebase' instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:151
+#: en/git-filter-branch.txt:164
#, priority:100
msgid "You can also use the `git_commit_non_empty_tree \"$@\"` instead of `git commit-tree \"$@\"` if you don't wish to keep commits with a single parent and that makes no change to the tree."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:152
+#: en/git-filter-branch.txt:165
#, no-wrap, priority:100
msgid "--tag-name-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:158
+#: en/git-filter-branch.txt:171
#, priority:100
msgid "This is the filter for rewriting tag names. When passed, it will be called for every tag ref that points to a rewritten object (or to a tag object which points to a rewritten object). The original tag name is passed via standard input, and the new tag name is expected on standard output."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:163
+#: en/git-filter-branch.txt:176
#, priority:100
msgid "The original tags are not deleted, but can be overwritten; use \"--tag-name-filter cat\" to simply update the tags. In this case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:174
+#: en/git-filter-branch.txt:187
#, priority:100
msgid "Nearly proper rewriting of tag objects is supported. If the tag has a message attached, a new tag object will be created with the same message, author, and timestamp. If the tag has a signature attached, the signature will be stripped. It is by definition impossible to preserve signatures. The reason this is \"nearly\" proper, is because ideally if the tag did not change (points to the same object, has the same name, etc.) it should retain any signature. That is not the case, signatures will always be removed, buyer beware. There is also no support for changing the author or timestamp (or the tag message for that matter). Tags which point to other tags will be rewritten to point to the underlying commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:175
+#: en/git-filter-branch.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--prune-empty"
msgstr "--prune-empty"
#. type: Plain text
-#: en/git-filter-branch.txt:182
+#: en/git-filter-branch.txt:195
#, priority:100
msgid "Some filters will generate empty commits that leave the tree untouched. This option instructs git-filter-branch to remove such commits if they have exactly one or zero non-pruned parents; merge commits will therefore remain intact. This option cannot be used together with `--commit-filter`, though the same effect can be achieved by using the provided `git_commit_non_empty_tree` function in a commit filter."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:183
+#: en/git-filter-branch.txt:196
#, no-wrap, priority:100
msgid "--original <namespace>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:186
+#: en/git-filter-branch.txt:199
#, priority:100
msgid "Use this option to set the namespace where the original commits will be stored. The default value is 'refs/original'."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:187
+#: en/git-filter-branch.txt:200
#, no-wrap, priority:100
msgid "-d <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:194
+#: en/git-filter-branch.txt:207
#, priority:100
msgid "Use this option to set the path to the temporary directory used for rewriting. When applying a tree filter, the command needs to temporarily check out the tree to some directory, which may consume considerable space in case of large projects. By default it does this in the `.git-rewrite/` directory but you can override that choice by this parameter."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:200
+#: en/git-filter-branch.txt:213
#, priority:100
msgid "'git filter-branch' refuses to start with an existing temporary directory or when there are already refs starting with 'refs/original/', unless forced."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:201
+#: en/git-filter-branch.txt:214
#, no-wrap, priority:100
msgid "--state-branch <branch>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:206
+#: en/git-filter-branch.txt:219
#, priority:100
msgid "This option will cause the mapping from old to new objects to be loaded from named branch upon startup and saved as a new commit to that branch upon exit, enabling incremental of large trees. If '<branch>' does not exist it will be created."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:207
+#: en/git-filter-branch.txt:220
#, ignore-ellipsis, no-wrap, priority:100
msgid "<rev-list options>..."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:212
+#: en/git-filter-branch.txt:225
#, priority:100
msgid "Arguments for 'git rev-list'. All positive refs included by these options are rewritten. You may also specify options such as `--all`, but you must use `--` to separate them from the 'git filter-branch' options. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:216
+#: en/git-filter-branch.txt:229
#, no-wrap, priority:100
msgid "Remap to ancestor"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:223
+#: en/git-filter-branch.txt:236
#, priority:100
msgid "By using linkgit:git-rev-list[1] arguments, e.g., path limiters, you can limit the set of revisions which get rewritten. However, positive refs on the command line are distinguished: we don't let them be excluded by such limiters. For this purpose, they are instead rewritten to point at the nearest ancestor that was not excluded."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:231
+#: en/git-filter-branch.txt:244
#, priority:100
msgid "On success, the exit status is `0`. If the filter can't find any commits to rewrite, the exit status is `2`. On any other error, the exit status may be any other non-zero value."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:238
+#: en/git-filter-branch.txt:251
#, priority:100
msgid "Suppose you want to remove a file (containing confidential information or copyright violation) from all commits:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:241
+#: en/git-filter-branch.txt:254
#, no-wrap, priority:100
msgid "git filter-branch --tree-filter 'rm filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:246
+#: en/git-filter-branch.txt:259
#, priority:100
msgid "However, if the file is absent from the tree of some commit, a simple `rm filename` will fail for that tree and commit. Thus you may instead want to use `rm -f filename` as the script."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:252
+#: en/git-filter-branch.txt:265
#, priority:100
msgid "Using `--index-filter` with 'git rm' yields a significantly faster version. Like with using `rm filename`, `git rm --cached filename` will fail if the file is absent from the tree of a commit. If you want to \"completely forget\" a file, it does not matter when it entered history, so we also add `--ignore-unmatch`:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:255
+#: en/git-filter-branch.txt:268
#, no-wrap, priority:100
msgid "git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:258
+#: en/git-filter-branch.txt:271
#, priority:100
msgid "Now, you will get the rewritten history saved in HEAD."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:261
+#: en/git-filter-branch.txt:274
#, priority:100
msgid "To rewrite the repository to look as if `foodir/` had been its project root, and discard all other history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:264
+#: en/git-filter-branch.txt:277
#, no-wrap, priority:100
msgid "git filter-branch --subdirectory-filter foodir -- --all\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:269
+#: en/git-filter-branch.txt:282
#, priority:100
msgid "Thus you can, e.g., turn a library subdirectory into a repository of its own. Note the `--` that separates 'filter-branch' options from revision options, and the `--all` to rewrite all branches and tags."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:273
+#: en/git-filter-branch.txt:286
#, priority:100
msgid "To set a commit (which typically is at the tip of another history) to be the parent of the current initial commit, in order to paste the other history behind the current history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:276
+#: en/git-filter-branch.txt:289
#, no-wrap, priority:100
msgid "git filter-branch --parent-filter 'sed \"s/^\\$/-p <graft-id>/\"' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:282
+#: en/git-filter-branch.txt:295
#, priority:100
msgid "(if the parent string is empty - which happens when we are dealing with the initial commit - add graftcommit as a parent). Note that this assumes history with a single root (that is, no merge without common ancestors happened). If this is not the case, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:286
+#: en/git-filter-branch.txt:299
#, no-wrap, priority:100
msgid ""
"git filter-branch --parent-filter \\\n"
@@ -23170,13 +23247,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:289
+#: en/git-filter-branch.txt:302
#, priority:100
msgid "or even simpler:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:293
+#: en/git-filter-branch.txt:306
#, no-wrap, priority:100
msgid ""
"git replace --graft $commit-id $graft-id\n"
@@ -23184,13 +23261,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:296
+#: en/git-filter-branch.txt:309
#, priority:100
msgid "To remove commits authored by \"Darl McBribe\" from the history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:305
+#: en/git-filter-branch.txt:318
#, no-wrap, priority:100
msgid ""
"git filter-branch --commit-filter '\n"
@@ -23203,13 +23280,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:308
+#: en/git-filter-branch.txt:321
#, priority:100
msgid "The function 'skip_commit' is defined as follows:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:320
+#: en/git-filter-branch.txt:333
#, no-wrap, priority:100
msgid ""
"skip_commit()\n"
@@ -23225,13 +23302,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:327
+#: en/git-filter-branch.txt:340
#, priority:100
msgid "The shift magic first throws away the tree id and then the -p parameters. Note that this handles merges properly! In case Darl committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 as their parents instead of the merge commit."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:332
+#: en/git-filter-branch.txt:345
#, no-wrap, priority:100
msgid ""
"*NOTE* the changes introduced by the commits, and which are not reverted\n"
@@ -23241,13 +23318,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:336
+#: en/git-filter-branch.txt:349
#, priority:100
msgid "You can rewrite the commit log messages using `--msg-filter`. For example, 'git svn-id' strings in a repository created by 'git svn' can be removed this way:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:341
+#: en/git-filter-branch.txt:354
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23256,13 +23333,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:345
+#: en/git-filter-branch.txt:358
#, priority:100
msgid "If you need to add 'Acked-by' lines to, say, the last 10 commits (none of which is a merge), use this command:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:351
+#: en/git-filter-branch.txt:364
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23272,13 +23349,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:357
+#: en/git-filter-branch.txt:370
#, priority:100
msgid "The `--env-filter` option can be used to modify committer and/or author identity. For example, if you found out that your commits have the wrong identity due to a misconfigured user.email, you can make a correction, before publishing the project, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:369
+#: en/git-filter-branch.txt:382
#, no-wrap, priority:100
msgid ""
"git filter-branch --env-filter '\n"
@@ -23294,19 +23371,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:375
+#: en/git-filter-branch.txt:388
#, priority:100
msgid "To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will point to the top-most revision that a 'git rev-list' of this range will print."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:377
+#: en/git-filter-branch.txt:390
#, priority:100
msgid "Consider this history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:382
+#: en/git-filter-branch.txt:395
#, no-wrap, priority:100
msgid ""
" D--E--F--G--H\n"
@@ -23315,25 +23392,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:385
+#: en/git-filter-branch.txt:398
#, priority:100
msgid "To rewrite only commits D,E,F,G,H, but leave A, B and C alone, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:388
+#: en/git-filter-branch.txt:401
#, ignore-ellipsis, no-wrap, priority:100
msgid "git filter-branch ... C..H\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:391
+#: en/git-filter-branch.txt:404
#, priority:100
msgid "To rewrite commits E,F,G,H, use one of these:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:395
+#: en/git-filter-branch.txt:408
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"git filter-branch ... C..H --not D\n"
@@ -23341,13 +23418,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:398
+#: en/git-filter-branch.txt:411
#, priority:100
msgid "To move the whole tree into a subdirectory, or remove it from there:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:405
+#: en/git-filter-branch.txt:418
#, no-wrap, priority:100
msgid ""
"git filter-branch --index-filter \\\n"
@@ -23358,87 +23435,279 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-filter-branch.txt:410
+#: en/git-filter-branch.txt:423
#, no-wrap, priority:100
msgid "CHECKLIST FOR SHRINKING A REPOSITORY"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:418
+#: en/git-filter-branch.txt:431
#, priority:100
msgid "git-filter-branch can be used to get rid of a subset of files, usually with some combination of `--index-filter` and `--subdirectory-filter`. People expect the resulting repository to be smaller than the original, but you need a few more steps to actually make it smaller, because Git tries hard not to lose your objects until you tell it to. First make sure that:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:422
+#: en/git-filter-branch.txt:435
#, priority:100
msgid "You really removed all variants of a filename, if a blob was moved over its lifetime. `git log --name-only --follow --all -- filename` can help you find renames."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:425
+#: en/git-filter-branch.txt:438
#, priority:100
msgid "You really filtered all refs: use `--tag-name-filter cat -- --all` when calling git-filter-branch."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:428
+#: en/git-filter-branch.txt:441
#, priority:100
msgid "Then there are two ways to get a smaller repository. A safer way is to clone, that keeps your original intact."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:432
+#: en/git-filter-branch.txt:445
#, priority:100
msgid "Clone it with `git clone file:///path/to/repo`. The clone will not have the removed objects. See linkgit:git-clone[1]. (Note that cloning with a plain path just hardlinks everything!)"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:437
+#: en/git-filter-branch.txt:450
#, priority:100
msgid "If you really don't want to clone it, for whatever reasons, check the following points instead (in this order). This is a very destructive approach, so *make a backup* or go back to cloning it. You have been warned."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:441
+#: en/git-filter-branch.txt:454
#, priority:100
msgid "Remove the original refs backed up by git-filter-branch: say `git for-each-ref --format=\"%(refname)\" refs/original/ | xargs -n 1 git update-ref -d`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:443
+#: en/git-filter-branch.txt:456
#, priority:100
msgid "Expire all reflogs with `git reflog expire --expire=now --all`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:447
+#: en/git-filter-branch.txt:460
#, priority:100
msgid "Garbage collect all unreferenced objects with `git gc --prune=now` (or if your git-gc is not new enough to support arguments to `--prune`, use `git repack -ad; git prune` instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:459
+#: en/git-filter-branch.txt:467
#, priority:100
-msgid "git-filter-branch allows you to make complex shell-scripted rewrites of your Git history, but you probably don't need this flexibility if you're simply _removing unwanted data_ like large files or passwords. For those operations you may want to consider http://rtyley.github.io/bfg-repo-cleaner/[The BFG Repo-Cleaner], a JVM-based alternative to git-filter-branch, typically at least 10-50x faster for those use-cases, and with quite different characteristics:"
+msgid "The performance of git-filter-branch is glacially slow; its design makes it impossible for a backward-compatible implementation to ever be fast:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:467
+#: en/git-filter-branch.txt:473
#, priority:100
-msgid "Any particular version of a file is cleaned exactly _once_. The BFG, unlike git-filter-branch, does not give you the opportunity to handle a file differently based on where or when it was committed within your history. This constraint gives the core performance benefit of The BFG, and is well-suited to the task of cleansing bad data - you don't care _where_ the bad data is, you just want it _gone_."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:473
+#: en/git-filter-branch.txt:476
+#, priority:100
+msgid "If you try and cheat and try to make git-filter-branch only work on files modified in a commit, then two things happen"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:482
+#, priority:100
+msgid "you run into problems with deletions whenever the user is simply trying to rename files (because attempting to delete files that don't exist looks like a no-op; it takes some chicanery to remap deletes across file renames when the renames happen via arbitrary user-provided shell)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:488
+#, priority:100
+msgid "even if you succeed at the map-deletes-for-renames chicanery, you still technically violate backward compatibility because users are allowed to filter files in ways that depend upon topology of commits instead of filtering solely based on file contents or names (though this has not been observed in the wild)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:494
+#, priority:100
+msgid "Even if you don't need to edit files but only want to e.g. rename or remove some and thus can avoid checking out each file (i.e. you can use --index-filter), you still are passing shell snippets for your filters. This means that for every commit, you have to have a prepared git repo where those filters can be run. That's a significant setup."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:505
+#, priority:100
+msgid "Further, several additional files are created or updated per commit by git-filter-branch. Some of these are for supporting the convenience functions provided by git-filter-branch (such as map()), while others are for keeping track of internal state (but could have also been accessed by user filters; one of git-filter-branch's regression tests does so). This essentially amounts to using the filesystem as an IPC mechanism between git-filter-branch and the user-provided filters. Disks tend to be a slow IPC mechanism, and writing these files also effectively represents a forced synchronization point between separate processes that we hit with every commit."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:511
+#, priority:100
+msgid "The user-provided shell commands will likely involve a pipeline of commands, resulting in the creation of many processes per commit. Creating and running another process takes a widely varying amount of time between operating systems, but on any platform it is very slow relative to invoking a function."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:517
+#, priority:100
+msgid "git-filter-branch itself is written in shell, which is kind of slow. This is the one performance issue that could be backward-compatibly fixed, but compared to the above problems that are intrinsic to the design of git-filter-branch, the language of the tool itself is a relatively minor issue."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:528
+#, priority:100
+msgid "Side note: Unfortunately, people tend to fixate on the written-in-shell aspect and periodically ask if git-filter-branch could be rewritten in another language to fix the performance issues. Not only does that ignore the bigger intrinsic problems with the design, it'd help less than you'd expect: if git-filter-branch itself were not shell, then the convenience functions (map(), skip_commit(), etc) and the `--setup` argument could no longer be executed once at the beginning of the program but would instead need to be prepended to every user filter (and thus re-executed with every commit)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:539
+#, priority:100
+msgid "The https://github.com/newren/git-filter-repo/[git filter-repo] tool is an alternative to git-filter-branch which does not suffer from these performance problems or the safety problems (mentioned below). For those with existing tooling which relies upon git-filter-branch, 'git repo-filter' also provides https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], a drop-in git-filter-branch replacement (with a few caveats). While filter-lamely suffers from all the same safety issues as git-filter-branch, it at least ameloriates the performance issues a little."
+msgstr ""
+
+#. type: Title -
+#: en/git-filter-branch.txt:542
+#, no-wrap, priority:100
+msgid "SAFETY"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:547
+#, priority:100
+msgid "git-filter-branch is riddled with gotchas resulting in various ways to easily corrupt repos or end up with a mess worse than what you started with:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:560
+#, priority:100
+msgid "Someone can have a set of \"working and tested filters\" which they document or provide to a coworker, who then runs them on a different OS where the same commands are not working/tested (some examples in the git-filter-branch manpage are also affected by this). BSD vs. GNU userland differences can really bite. If lucky, error messages are spewed. But just as likely, the commands either don't do the filtering requested, or silently corrupt by making some unwanted change. The unwanted change may only affect a few commits, so it's not necessarily obvious either. (The fact that problems won't necessarily be obvious means they are likely to go unnoticed until the rewritten history is in use for quite a while, at which point it's really hard to justify another flag-day for another rewrite.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:570
+#, priority:100
+msgid "Filenames with spaces are often mishandled by shell snippets since they cause problems for shell pipelines. Not everyone is familiar with find -print0, xargs -0, git-ls-files -z, etc. Even people who are familiar with these may assume such flags are not relevant because someone else renamed any such files in their repo back before the person doing the filtering joined the project. And often, even those familiar with handling arguments with spaces may not do so just because they aren't in the mindset of thinking about everything that could possibly go wrong."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:580
+#, priority:100
+msgid "Non-ascii filenames can be silently removed despite being in a desired directory. Keeping only wanted paths is often done using pipelines like `git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`. ls-files will only quote filenames if needed, so folks may not notice that one of the files didn't match the regex (at least not until it's much too late). Yes, someone who knows about core.quotePath can avoid this (unless they have other special characters like \\t, \\n, or \"), and people who use ls-files -z with something other than grep can avoid this, but that doesn't mean they will."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:586
+#, priority:100
+msgid "Similarly, when moving files around, one can find that filenames with non-ascii or special characters end up in a different directory, one that includes a double quote character. (This is technically the same issue as above with quoting, but perhaps an interesting different way that it can and has manifested as a problem.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:594
+#, priority:100
+msgid "It's far too easy to accidentally mix up old and new history. It's still possible with any tool, but git-filter-branch almost invites it. If lucky, the only downside is users getting frustrated that they don't know how to shrink their repo and remove the old stuff. If unlucky, they merge old and new history and end up with multiple \"copies\" of each commit, some of which have unwanted or sensitive files and others which don't. This comes about in multiple different ways:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:597
+#, priority:100
+msgid "the default to only doing a partial history rewrite ('--all' is not the default and few examples show it)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:599
+#, priority:100
+msgid "the fact that there's no automatic post-run cleanup"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:602
+#, priority:100
+msgid "the fact that --tag-name-filter (when used to rename tags) doesn't remove the old tags but just adds new ones with the new name"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:611
+#, priority:100
+msgid "the fact that little educational information is provided to inform users of the ramifications of a rewrite and how to avoid mixing old and new history. For example, this man page discusses how users need to understand that they need to rebase their changes for all their branches on top of new history (or delete and reclone), but that's only one of multiple concerns to consider. See the \"DISCUSSION\" section of the git filter-repo manual page for more details."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:614
+#, priority:100
+msgid "Annotated tags can be accidentally converted to lightweight tags, due to either of two issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:619
#, priority:100
-msgid "By default The BFG takes full advantage of multi-core machines, cleansing commit file-trees in parallel. git-filter-branch cleans commits sequentially (i.e. in a single-threaded manner), though it _is_ possible to write filters that include their own parallelism, in the scripts executed against each commit."
+msgid "Someone can do a history rewrite, realize they messed up, restore from the backups in refs/original/, and then redo their git-filter-branch command. (The backup in refs/original/ is not a real backup; it dereferences tags first.)"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:478
+#: en/git-filter-branch.txt:624
#, priority:100
-msgid "The http://rtyley.github.io/bfg-repo-cleaner/#examples[command options] are much more restrictive than git-filter branch, and dedicated just to the tasks of removing unwanted data- e.g: `--strip-blobs-bigger-than 1M`."
+msgid "Running git-filter-branch with either --tags or --all in your <rev-list options>. In order to retain annotated tags as annotated, you must use --tag-name-filter (and must not have restored from refs/original/ in a previously botched rewrite)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:629
+#, priority:100
+msgid "Any commit messages that specify an encoding will become corrupted by the rewrite; git-filter-branch ignores the encoding, takes the original bytes, and feeds it to commit-tree without telling it the proper encoding. (This happens whether or not --msg-filter is used.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:633
+#, priority:100
+msgid "Commit messages (even if they are all UTF-8) by default become corrupted due to not being updated -- any references to other commit hashes in commit messages will now refer to no-longer-extant commits."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:644
+#, priority:100
+msgid "There are no facilities for helping users find what unwanted crud they should delete, which means they are much more likely to have incomplete or partial cleanups that sometimes result in confusion and people wasting time trying to understand. (For example, folks tend to just look for big files to delete instead of big directories or extensions, and once they do so, then sometime later folks using the new repository who are going through history will notice a build artifact directory that has some files but not others, or a cache of dependencies (node_modules or similar) which couldn't have ever been functional since it's missing some files.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:647
+#, priority:100
+msgid "If --prune-empty isn't specified, then the filtering process can create hoards of confusing empty commits"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:651
+#, priority:100
+msgid "If --prune-empty is specified, then intentionally placed empty commits from before the filtering operation are also pruned instead of just pruning commits that became empty due to filtering rules."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:654
+#, ignore-ellipsis, priority:100
+msgid "If --prune empty is specified, sometimes empty commits are missed and left around anyway (a somewhat rare bug, but it happens...)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:658
+#, priority:100
+msgid "A minor issue, but users who have a goal to update all names and emails in a repository may be led to --env-filter which will only update authors and committers, missing taggers."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:664
+#, priority:100
+msgid "If the user provides a --tag-name-filter that maps multiple tags to the same name, no warning or error is provided; git-filter-branch simply overwrites each tag in some undocumented pre-defined order resulting in only one tag at the end. (A git-filter-branch regression test requires this surprising behavior.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:667
+#, priority:100
+msgid "Also, the poor performance of git-filter-branch often leads to safety issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:683
+#, priority:100
+msgid "Coming up with the correct shell snippet to do the filtering you want is sometimes difficult unless you're just doing a trivial modification such as deleting a couple files. Unfortunately, people often learn if the snippet is right or wrong by trying it out, but the rightness or wrongness can vary depending on special circumstances (spaces in filenames, non-ascii filenames, funny author names or emails, invalid timezones, presence of grafts or replace objects, etc.), meaning they may have to wait a long time, hit an error, then restart. The performance of git-filter-branch is so bad that this cycle is painful, reducing the time available to carefully re-check (to say nothing about what it does to the patience of the person doing the rewrite even if they do technically have more time available). This problem is extra compounded because errors from broken filters may not be shown for a long time and/or get lost in a sea of output. Even worse, broken filters often just result in silent incorrect rewrites."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:691
+#, priority:100
+msgid "To top it all off, even when users finally find working commands, they naturally want to share them. But they may be unaware that their repo didn't have some special cases that someone else's does. So, when someone else with a different repository runs the same commands, they get hit by the problems above. Or, the user just runs commands that really were vetted for special cases, but they run it on a different OS where it doesn't work, as noted above."
msgstr ""
#. type: Title =
@@ -23474,7 +23743,7 @@ msgid "This command is intended mostly for internal use by scripts automatically
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:64
+#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:68
#, no-wrap, priority:240
msgid "--log[=<n>]"
msgstr ""
@@ -23486,7 +23755,7 @@ msgid "In addition to branch names, populate the log message with one-line descr
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:65
+#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:69
#, ignore-same, no-wrap, priority:240
msgid "--no-log"
msgstr "--no-log"
@@ -24156,9 +24425,9 @@ msgid ""
"\t\t [--signature-file=<file>]\n"
"\t\t [-n | --numbered | -N | --no-numbered]\n"
"\t\t [--start-number <n>] [--numbered-files]\n"
-"\t\t [--in-reply-to=Message-Id] [--suffix=.<sfx>]\n"
+"\t\t [--in-reply-to=<message id>] [--suffix=.<sfx>]\n"
"\t\t [--ignore-if-in-upstream]\n"
-"\t\t [--rfc] [--subject-prefix=Subject-Prefix]\n"
+"\t\t [--rfc] [--subject-prefix=<subject prefix>]\n"
"\t\t [(--reroll-count|-v) <n>]\n"
"\t\t [--to=<email>] [--cc=<email>]\n"
"\t\t [--[no-]cover-letter] [--quiet]\n"
@@ -24207,523 +24476,524 @@ msgid "By default, each output file is numbered sequentially from 1, and uses th
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:70
+#: en/git-format-patch.txt:71
#, priority:100
-msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`."
+msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`. All directory components will be created."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:74
+#: en/git-format-patch.txt:75
#, priority:100
msgid "By default, the subject of a single patch is \"[PATCH] \" followed by the concatenation of lines from the commit message up to the first blank line (see the DISCUSSION section of linkgit:git-commit[1])."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:78
+#: en/git-format-patch.txt:79
#, priority:100
msgid "When multiple patches are output, the subject prefix will instead be \"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. To omit patch numbers from the subject, use `-N`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:83
+#: en/git-format-patch.txt:84
#, priority:100
msgid "If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a `Message-Id` header to reference."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:89
+#: en/git-format-patch.txt:90
#, no-wrap, priority:100
msgid "-<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:91
+#: en/git-format-patch.txt:92
#, priority:100
msgid "Prepare patches from the topmost <n> commits."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:92
+#: en/git-format-patch.txt:93
#, no-wrap, priority:100
msgid "-o <dir>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:93
+#: en/git-format-patch.txt:94
#, no-wrap, priority:100
msgid "--output-directory <dir>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:96
+#: en/git-format-patch.txt:97
#, priority:100
msgid "Use <dir> to store the resulting files, instead of the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:98 en/git-shortlog.txt:30
+#: en/git-format-patch.txt:99 en/git-shortlog.txt:30
#, ignore-same, no-wrap, priority:260
msgid "--numbered"
msgstr "--numbered"
#. type: Plain text
-#: en/git-format-patch.txt:100
+#: en/git-format-patch.txt:101
#, priority:100
msgid "Name output in '[PATCH n/m]' format, even with a single patch."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:102
+#: en/git-format-patch.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-numbered"
msgstr "--no-numbered"
#. type: Plain text
-#: en/git-format-patch.txt:104
+#: en/git-format-patch.txt:105
#, priority:100
msgid "Name output in '[PATCH]' format."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:105
+#: en/git-format-patch.txt:106
#, no-wrap, priority:100
msgid "--start-number <n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:107
+#: en/git-format-patch.txt:108
#, priority:100
msgid "Start numbering the patches at <n> instead of 1."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:108
+#: en/git-format-patch.txt:109
#, ignore-same, no-wrap, priority:100
msgid "--numbered-files"
msgstr "--numbered-files"
#. type: Plain text
-#: en/git-format-patch.txt:111
+#: en/git-format-patch.txt:112
#, priority:100
msgid "Output file names will be a simple number sequence without the default first line of the commit appended."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:113
+#: en/git-format-patch.txt:114
#, ignore-same, no-wrap, priority:100
msgid "--keep-subject"
msgstr "--keep-subject"
#. type: Plain text
-#: en/git-format-patch.txt:116
+#: en/git-format-patch.txt:117
#, priority:100
msgid "Do not strip/add '[PATCH]' from the first line of the commit log message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:122
+#: en/git-format-patch.txt:123
#, priority:100
msgid "Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:123 en/git-pack-objects.txt:59
+#: en/git-format-patch.txt:124 en/git-pack-objects.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--stdout"
msgstr "--stdout"
#. type: Plain text
-#: en/git-format-patch.txt:126
+#: en/git-format-patch.txt:127
#, priority:100
msgid "Print all commits to the standard output in mbox format, instead of creating a file for each one."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:127
+#: en/git-format-patch.txt:128
#, no-wrap, priority:100
msgid "--attach[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:131
+#: en/git-format-patch.txt:132
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: attachment`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:132
+#: en/git-format-patch.txt:133
#, ignore-same, no-wrap, priority:100
msgid "--no-attach"
msgstr "--no-attach"
#. type: Plain text
-#: en/git-format-patch.txt:135
+#: en/git-format-patch.txt:136
#, priority:100
msgid "Disable the creation of an attachment, overriding the configuration setting."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:136
+#: en/git-format-patch.txt:137
#, no-wrap, priority:100
msgid "--inline[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:140
+#: en/git-format-patch.txt:141
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: inline`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:141
+#: en/git-format-patch.txt:142
#, no-wrap, priority:100
msgid "--thread[=<style>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:142
+#: en/git-format-patch.txt:143
#, ignore-same, no-wrap, priority:100
msgid "--no-thread"
msgstr "--no-thread"
#. type: Plain text
-#: en/git-format-patch.txt:147
+#: en/git-format-patch.txt:148
#, priority:100
msgid "Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the first. Also controls generation of the `Message-Id` header to reference."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:153
+#: en/git-format-patch.txt:154
#, priority:100
msgid "The optional <style> argument can be either `shallow` or `deep`. 'shallow' threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order. 'deep' threading makes every mail a reply to the previous one."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:157
+#: en/git-format-patch.txt:158
#, priority:100
msgid "The default is `--no-thread`, unless the `format.thread` configuration is set. If `--thread` is specified without a style, it defaults to the style specified by `format.thread` if any, or else `shallow`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:161
+#: en/git-format-patch.txt:162
#, priority:100
msgid "Beware that the default for 'git send-email' is to thread emails itself. If you want `git format-patch` to take care of threading, you will want to ensure that threading is disabled for `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:162
-#, no-wrap, priority:100
-msgid "--in-reply-to=Message-Id"
-msgstr ""
+#: en/git-format-patch.txt:163
+#, fuzzy, no-wrap, priority:100
+#| msgid "--no-message-id"
+msgid "--in-reply-to=<message id>"
+msgstr "--no-message-id"
#. type: Plain text
-#: en/git-format-patch.txt:166
+#: en/git-format-patch.txt:167
#, priority:100
-msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given Message-Id, which avoids breaking threads to provide a new patch series."
+msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given <message id>, which avoids breaking threads to provide a new patch series."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:167
+#: en/git-format-patch.txt:168
#, ignore-same, no-wrap, priority:100
msgid "--ignore-if-in-upstream"
msgstr "--ignore-if-in-upstream"
#. type: Plain text
-#: en/git-format-patch.txt:173
+#: en/git-format-patch.txt:174
#, priority:100
msgid "Do not include a patch that matches a commit in <until>..<since>. This will examine all patches reachable from <since> but not from <until> and compare them with the patches being generated, and any patch that matches is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:174
+#: en/git-format-patch.txt:175
#, no-wrap, priority:100
-msgid "--subject-prefix=<Subject-Prefix>"
+msgid "--subject-prefix=<subject prefix>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:179
+#: en/git-format-patch.txt:180
#, priority:100
-msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<Subject-Prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
+msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<subject prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:180
+#: en/git-format-patch.txt:181
#, ignore-same, no-wrap, priority:100
msgid "--rfc"
msgstr "--rfc"
#. type: Plain text
-#: en/git-format-patch.txt:184
+#: en/git-format-patch.txt:185
#, priority:100
msgid "Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For Comments\"; use this when sending an experimental patch for discussion rather than application."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:185
+#: en/git-format-patch.txt:186
#, no-wrap, priority:100
msgid "-v <n>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:186
+#: en/git-format-patch.txt:187
#, no-wrap, priority:100
msgid "--reroll-count=<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:193
+#: en/git-format-patch.txt:194
#, priority:100
msgid "Mark the series as the <n>-th iteration of the topic. The output filenames have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default, but configurable via the `--subject-prefix` option) has ` v<n>` appended to it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:194
+#: en/git-format-patch.txt:195
#, no-wrap, priority:100
msgid "--to=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:199
+#: en/git-format-patch.txt:200
#, priority:100
msgid "Add a `To:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-to` discards all `To:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:200
+#: en/git-format-patch.txt:201
#, no-wrap, priority:100
msgid "--cc=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:205
+#: en/git-format-patch.txt:206
#, priority:100
msgid "Add a `Cc:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-cc` discards all `Cc:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:206
+#: en/git-format-patch.txt:207
#, ignore-same, no-wrap, priority:100
msgid "--from"
msgstr "--from"
#. type: Labeled list
-#: en/git-format-patch.txt:207
+#: en/git-format-patch.txt:208
#, no-wrap, priority:100
msgid "--from=<ident>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:213
+#: en/git-format-patch.txt:214
#, priority:100
msgid "Use `ident` in the `From:` header of each commit email. If the author ident of the commit is not textually identical to the provided `ident`, place a `From:` header in the body of the message with the original author. If no `ident` is given, use the committer ident."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:220
+#: en/git-format-patch.txt:221
#, priority:100
msgid "Note that this option is only useful if you are actually sending the emails and want to identify yourself as the sender, but retain the original author (and `git am` will correctly pick up the in-body header). Note also that `git send-email` already handles this transformation for you, and this option should not be used if you are feeding the result to `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:221
+#: en/git-format-patch.txt:222
#, no-wrap, priority:100
msgid "--add-header=<header>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:228
+#: en/git-format-patch.txt:229
#, priority:100
msgid "Add an arbitrary header to the email headers. This is in addition to any configured headers, and may be used multiple times. For example, `--add-header=\"Organization: git-foo\"`. The negated form `--no-add-header` discards *all* (`To:`, `Cc:`, and custom) headers added so far from config or command line."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:229
+#: en/git-format-patch.txt:230
#, ignore-same, no-wrap, priority:100
msgid "--[no-]cover-letter"
msgstr "--[no-]cover-letter"
#. type: Plain text
-#: en/git-format-patch.txt:233
+#: en/git-format-patch.txt:234
#, priority:100
msgid "In addition to the patches, generate a cover letter file containing the branch description, shortlog and the overall diffstat. You can fill in a description in the file before sending it out."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:234
+#: en/git-format-patch.txt:235
#, no-wrap, priority:100
msgid "--interdiff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:242
+#: en/git-format-patch.txt:243
#, priority:100
msgid "As a reviewer aid, insert an interdiff into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` is a single revision naming the tip of the previous series which shares a common base with the series being formatted (for example `git format-patch --cover-letter --interdiff=feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:243
+#: en/git-format-patch.txt:244
#, no-wrap, priority:100
msgid "--range-diff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:254
+#: en/git-format-patch.txt:255
#, priority:100
msgid "As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1]) into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` can be a single revision naming the tip of the previous series if it shares a common base with the series being formatted (for example `git format-patch --cover-letter --range-diff=feature/v1 -3 feature/v2`), or a revision range if the two versions of the series are disjoint (for example `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:259
+#: en/git-format-patch.txt:260
#, priority:100
msgid "Note that diff options passed to the command affect how the primary product of `format-patch` is generated, and they are not passed to the underlying `range-diff` machinery used to generate the cover-letter material (this may change in the future)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:260
+#: en/git-format-patch.txt:261
#, no-wrap, priority:100
msgid "--creation-factor=<percent>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:265
+#: en/git-format-patch.txt:266
#, priority:100
msgid "Used with `--range-diff`, tweak the heuristic which matches up commits between the previous and current series of patches by adjusting the creation/deletion cost fudge factor. See linkgit:git-range-diff[1]) for details."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:266
+#: en/git-format-patch.txt:267
#, no-wrap, priority:100
msgid "--notes[=<ref>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:267 en/pretty-options.txt:81
+#: en/git-format-patch.txt:268 en/pretty-options.txt:81
#, ignore-same, no-wrap, priority:260
msgid "--no-notes"
msgstr "--no-notes"
#. type: Plain text
-#: en/git-format-patch.txt:270
+#: en/git-format-patch.txt:271
#, priority:100
msgid "Append the notes (see linkgit:git-notes[1]) for the commit after the three-dash line."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:278
+#: en/git-format-patch.txt:279
#, priority:100
msgid "The expected use case of this is to write supporting explanation for the commit that does not belong to the commit log message proper, and include it with the patch submission. While one can simply write these explanations after `format-patch` has run but before sending, keeping them as Git notes allows them to be maintained between versions of the patch series (but see the discussion of the `notes.rewrite` configuration options in linkgit:git-notes[1] to use this workflow)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:281
+#: en/git-format-patch.txt:282
#, priority:100
msgid "The default is `--no-notes`, unless the `format.notes` configuration is set."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:282
+#: en/git-format-patch.txt:283
#, no-wrap, priority:100
msgid "--[no-]signature=<signature>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:287
+#: en/git-format-patch.txt:288
#, priority:100
msgid "Add a signature to each message produced. Per RFC 3676 the signature is separated from the body by a line with '-- ' on it. If the signature option is omitted the signature defaults to the Git version number."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:288
+#: en/git-format-patch.txt:289
#, no-wrap, priority:100
msgid "--signature-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:290
+#: en/git-format-patch.txt:291
#, priority:100
msgid "Works just like --signature except the signature is read from a file."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:291
+#: en/git-format-patch.txt:292
#, no-wrap, priority:100
msgid "--suffix=.<sfx>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:296
+#: en/git-format-patch.txt:297
#, priority:100
msgid "Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is `--suffix=.txt`. Leaving this empty will remove the `.patch` suffix."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:299
+#: en/git-format-patch.txt:300
#, priority:100
msgid "Note that the leading character does not have to be a dot; for example, you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:303
+#: en/git-format-patch.txt:304
#, priority:100
msgid "Do not print the names of the generated files to standard output."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:304
+#: en/git-format-patch.txt:305
#, ignore-same, no-wrap, priority:100
msgid "--no-binary"
msgstr "--no-binary"
#. type: Plain text
-#: en/git-format-patch.txt:309
+#: en/git-format-patch.txt:310
#, priority:100
msgid "Do not output contents of changes in binary files, instead display a notice that those files changed. Patches generated using this option cannot be applied properly, but they are still useful for code review."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:310
+#: en/git-format-patch.txt:311
#, ignore-same, no-wrap, priority:100
msgid "--zero-commit"
msgstr "--zero-commit"
#. type: Plain text
-#: en/git-format-patch.txt:313
+#: en/git-format-patch.txt:314
#, priority:100
msgid "Output an all-zero hash in each patch's From header instead of the hash of the commit."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:314
+#: en/git-format-patch.txt:315
#, no-wrap, priority:100
msgid "--base=<commit>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:318
+#: en/git-format-patch.txt:320
#, priority:100
-msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details."
+msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details. If <commit> is \"auto\", a base commit is automatically chosen."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:325
+#: en/git-format-patch.txt:327
#, priority:100
msgid "Treat the revision argument as a <revision range>, even if it is just a single commit (that would normally be treated as a <since>). Note that root commits included in the specified range are always formatted as creation patches, independently of this flag."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:328
+#: en/git-format-patch.txt:330
#, priority:100
msgid "Show progress reports on stderr as patches are generated."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:335
+#: en/git-format-patch.txt:338
#, priority:100
-msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To\" or \"Cc:\" headers, configure attachments, and sign off patches with configuration variables."
+msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To:\" or \"Cc:\" headers, configure attachments, change the patch output directory, and sign off patches with configuration variables."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:347
+#: en/git-format-patch.txt:351
#, no-wrap, priority:100
msgid ""
"[format]\n"
@@ -24735,17 +25005,18 @@ msgid ""
"\tcc = <email>\n"
"\tattach [ = mime-boundary-string ]\n"
"\tsignOff = true\n"
-"\tcoverletter = auto\n"
+"\toutputDirectory = <directory>\n"
+"\tcoverLetter = auto\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:356
+#: en/git-format-patch.txt:360
#, priority:100
msgid "The patch produced by 'git format-patch' is in UNIX mailbox format, with a fixed \"magic\" time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:366
+#: en/git-format-patch.txt:370
#, no-wrap, priority:100
msgid ""
"From 8f72bad1baf19a53459661343e21d6491c3908d3 Mon Sep 17 00:00:00 2001\n"
@@ -24759,7 +25030,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:369
+#: en/git-format-patch.txt:373
#, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -24767,7 +25038,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:372
+#: en/git-format-patch.txt:376
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"Do the same for ia64 so we can have sleek & trim looking\n"
@@ -24775,19 +25046,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:380
+#: en/git-format-patch.txt:384
#, ignore-ellipsis, priority:100
msgid "Typically it will be placed in a MUA's drafts folder, edited to add timely commentary that should not go in the changelog after the three dashes, and then sent as a message whose body, in our example, starts with \"arch/arm config files were...\". On the receiving end, readers can save interesting patches in a UNIX mailbox and apply them with linkgit:git-am[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:386
+#: en/git-format-patch.txt:390
#, priority:100
msgid "When a patch is part of an ongoing discussion, the patch generated by 'git format-patch' can be tweaked to take advantage of the 'git am --scissors' feature. After your response to the discussion comes a line that consists solely of \"`-- >8 --`\" (scissors and perforation), followed by the patch with unnecessary header fields removed:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:390
+#: en/git-format-patch.txt:394
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"...\n"
@@ -24795,21 +25066,21 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:392
+#: en/git-format-patch.txt:396
#, no-wrap, priority:100
msgid "Makes sense to me. How about this patch?\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:395
+#: en/git-format-patch.txt:399
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-Knig diet\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:398
+#: en/git-format-patch.txt:402
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -24817,61 +25088,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:406
+#: en/git-format-patch.txt:410
#, priority:100
msgid "When sending a patch this way, most often you are sending your own patch, so in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit `From:` and `Date:` lines from the patch file. The patch title is likely to be different from the subject of the discussion the patch is in response to, so it is likely that you would want to keep the Subject: line, like the example above."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:408
+#: en/git-format-patch.txt:412
#, no-wrap, priority:100
msgid "Checking for patch corruption"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:411
+#: en/git-format-patch.txt:415
#, priority:100
msgid "Many mailers if not set up properly will corrupt whitespace. Here are two common types of corruption:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:413
+#: en/git-format-patch.txt:417
#, priority:100
msgid "Empty context lines that do not have _any_ whitespace."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:416
+#: en/git-format-patch.txt:420
#, priority:100
msgid "Non-empty context lines that have one extra whitespace at the beginning."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:418
+#: en/git-format-patch.txt:422
#, priority:100
msgid "One way to test if your MUA is set up correctly is:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:422
+#: en/git-format-patch.txt:426
#, priority:100
msgid "Send the patch to yourself, exactly the way you would, except with To: and Cc: lines that do not contain the list and maintainer address."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:425
+#: en/git-format-patch.txt:429
#, priority:100
msgid "Save that patch to a file in UNIX mailbox format. Call it a.patch, say."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:427
+#: en/git-format-patch.txt:431
#, priority:100
msgid "Apply it:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:432
+#: en/git-format-patch.txt:436
#, no-wrap, priority:100
msgid ""
"$ git fetch <project> master:test-apply\n"
@@ -24881,175 +25152,175 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:434
+#: en/git-format-patch.txt:438
#, priority:100
msgid "If it does not apply correctly, there can be various reasons."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:439
+#: en/git-format-patch.txt:443
#, priority:100
msgid "The patch itself does not apply cleanly. That is _bad_ but does not have much to do with your MUA. You might want to rebase the patch with linkgit:git-rebase[1] before regenerating it in this case."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:444
+#: en/git-format-patch.txt:448
#, priority:100
msgid "The MUA corrupted your patch; \"am\" would complain that the patch does not apply. Look in the .git/rebase-apply/ subdirectory and see what 'patch' file contains and check for the common corruption patterns mentioned above."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:452
+#: en/git-format-patch.txt:456
#, priority:100
msgid "While at it, check the 'info' and 'final-commit' files as well. If what is in 'final-commit' is not exactly what you would want to see in the commit log message, it is very likely that the receiver would end up hand editing the log message when applying your patch. Things like \"Hi, this is my first patch.\\n\" in the patch e-mail should come after the three-dash line that signals the end of the commit message."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:454
+#: en/git-format-patch.txt:458
#, no-wrap, priority:100
msgid "MUA-SPECIFIC HINTS"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:457
+#: en/git-format-patch.txt:461
#, priority:100
msgid "Here are some hints on how to successfully submit patches inline using various mailers."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:459
+#: en/git-format-patch.txt:463
#, no-wrap, priority:100
msgid "GMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:465
+#: en/git-format-patch.txt:469
#, priority:100
msgid "GMail does not have any way to turn off line wrapping in the web interface, so it will mangle any emails that you send. You can however use \"git send-email\" and send your patches through the GMail SMTP server, or use any IMAP email client to connect to the google IMAP server and forward the emails through that."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:468
+#: en/git-format-patch.txt:472
#, priority:100
msgid "For hints on using 'git send-email' to send your patches through the GMail SMTP server, see the EXAMPLE section of linkgit:git-send-email[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:471
+#: en/git-format-patch.txt:475
#, priority:100
msgid "For hints on submission using the IMAP interface, see the EXAMPLE section of linkgit:git-imap-send[1]."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:473
+#: en/git-format-patch.txt:477
#, no-wrap, priority:100
msgid "Thunderbird"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:477
+#: en/git-format-patch.txt:481
#, priority:100
msgid "By default, Thunderbird will both wrap emails as well as flag them as being 'format=flowed', both of which will make the resulting email unusable by Git."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:481
+#: en/git-format-patch.txt:485
#, priority:100
msgid "There are three different approaches: use an add-on to turn off line wraps, configure Thunderbird to not mangle patches, or use an external editor to keep Thunderbird from mangling the patches."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:483
+#: en/git-format-patch.txt:487
#, no-wrap, priority:100
msgid "Approach #1 (add-on)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:491
+#: en/git-format-patch.txt:495
#, priority:100
msgid "Install the Toggle Word Wrap add-on that is available from https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you can tick off. Now you can compose the message as you otherwise do (cut + paste, 'git format-patch' | 'git imap-send', etc), but you have to insert line breaks manually in any text that you type."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:493
+#: en/git-format-patch.txt:497
#, no-wrap, priority:100
msgid "Approach #2 (configuration)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:495
+#: en/git-format-patch.txt:499
#, priority:100
msgid "Three steps:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:499
+#: en/git-format-patch.txt:503
#, ignore-ellipsis, priority:100
msgid "Configure your mail server composition as plain text: Edit...Account Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:501
+#: en/git-format-patch.txt:505
#, priority:100
msgid "Configure your general composition window to not wrap."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:504
+#: en/git-format-patch.txt:508
#, priority:100
msgid "In Thunderbird 2: Edit..Preferences..Composition, wrap plain text messages at 0"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:510
+#: en/git-format-patch.txt:514
#, priority:100
msgid "In Thunderbird 3: Edit..Preferences..Advanced..Config Editor. Search for \"mail.wrap_long_lines\". Toggle it to make sure it is set to `false`. Also, search for \"mailnews.wraplength\" and set the value to 0."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:515
+#: en/git-format-patch.txt:519
#, priority:100
msgid "Disable the use of format=flowed: Edit..Preferences..Advanced..Config Editor. Search for \"mailnews.send_plaintext_flowed\". Toggle it to make sure it is set to `false`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:519
+#: en/git-format-patch.txt:523
#, priority:100
msgid "After that is done, you should be able to compose email as you otherwise would (cut + paste, 'git format-patch' | 'git imap-send', etc), and the patches will not be mangled."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:521
+#: en/git-format-patch.txt:525
#, no-wrap, priority:100
msgid "Approach #3 (external editor)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:526
+#: en/git-format-patch.txt:530
#, priority:100
msgid "The following Thunderbird extensions are needed: AboutConfig from http://aboutconfig.mozdev.org/ and External Editor from http://globs.org/articles.php?lng=en&pg=8"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:528
+#: en/git-format-patch.txt:532
#, priority:100
msgid "Prepare the patch as a text file using your method of choice."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:533
+#: en/git-format-patch.txt:537
#, priority:100
msgid "Before opening a compose window, use Edit->Account Settings to uncheck the \"Compose messages in HTML format\" setting in the \"Composition & Addressing\" panel of the account to be used to send the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:537
+#: en/git-format-patch.txt:541
#, priority:100
msgid "In the main Thunderbird window, 'before' you open the compose window for the patch, use Tools->about:config to set the following to the indicated values:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:541
+#: en/git-format-patch.txt:545
#, no-wrap, priority:100
msgid ""
"\tmailnews.send_plaintext_flowed => false\n"
@@ -25057,25 +25328,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:544
+#: en/git-format-patch.txt:548
#, priority:100
msgid "Open a compose window and click the external editor icon."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:547
+#: en/git-format-patch.txt:551
#, priority:100
msgid "In the external editor window, read in the patch file and exit the editor normally."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:550
+#: en/git-format-patch.txt:554
#, priority:100
msgid "Side note: it may be possible to do step 2 with about:config and the following settings but no one's tried yet."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:555
+#: en/git-format-patch.txt:559
#, no-wrap, priority:100
msgid ""
"\tmail.html_compose => false\n"
@@ -25084,91 +25355,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:560
+#: en/git-format-patch.txt:564
#, priority:100
msgid "There is a script in contrib/thunderbird-patch-inline which can help you include patches with Thunderbird in an easy way. To use it, do the steps above and then use the script as the external editor."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:562
+#: en/git-format-patch.txt:566
#, no-wrap, priority:100
msgid "KMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:564
+#: en/git-format-patch.txt:568
#, priority:100
msgid "This should help you to submit patches inline using KMail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:566
+#: en/git-format-patch.txt:570
#, priority:100
msgid "Prepare the patch as a text file."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:568
+#: en/git-format-patch.txt:572
#, priority:100
msgid "Click on New Mail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:571
+#: en/git-format-patch.txt:575
#, priority:100
msgid "Go under \"Options\" in the Composer window and be sure that \"Word wrap\" is not set."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:573
+#: en/git-format-patch.txt:577
#, ignore-ellipsis, priority:100
msgid "Use Message -> Insert file... and insert the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:576
+#: en/git-format-patch.txt:580
#, priority:100
msgid "Back in the compose window: add whatever other text you wish to the message, complete the addressing and subject fields, and press send."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:578
+#: en/git-format-patch.txt:582
#, no-wrap, priority:100
msgid "BASE TREE INFORMATION"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:587
+#: en/git-format-patch.txt:591
#, priority:100
msgid "The base tree information block is used for maintainers or third party testers to know the exact state the patch series applies to. It consists of the 'base commit', which is a well-known commit that is part of the stable part of the project history everybody else works off of, and zero or more 'prerequisite patches', which are well-known patches in flight that is not yet part of the 'base commit' that need to be applied on top of 'base commit' in topological order before the patches can be applied."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:593
+#: en/git-format-patch.txt:597
#, priority:100
msgid "The 'base commit' is shown as \"base-commit: \" followed by the 40-hex of the commit object name. A 'prerequisite patch' is shown as \"prerequisite-patch-id: \" followed by the 40-hex 'patch id', which can be obtained by passing the patch through the `git patch-id --stable` command."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:597
+#: en/git-format-patch.txt:601
#, priority:100
msgid "Imagine that on top of the public commit P, you applied well-known patches X, Y and Z from somebody else, and then built your three-patch series A, B, C, the history would be like:"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:600
+#: en/git-format-patch.txt:604
#, no-wrap, priority:100
msgid "---P---X---Y---Z---A---B---C\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:607
+#: en/git-format-patch.txt:611
#, priority:100
msgid "With `git format-patch --base=P -3 C` (or variants thereof, e.g. with `--cover-letter` or using `Z..C` instead of `-3 C` to specify the range), the base tree information block is shown at the end of the first message the command outputs (either the first patch, or the cover letter), like this:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:613
+#: en/git-format-patch.txt:617
#, no-wrap, priority:100
msgid ""
"base-commit: P\n"
@@ -25178,13 +25449,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:616
+#: en/git-format-patch.txt:620
#, priority:100
msgid "For non-linear topology, such as"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:621
+#: en/git-format-patch.txt:625
#, no-wrap, priority:100
msgid ""
"---P---X---A---M---C\n"
@@ -25193,91 +25464,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:626
+#: en/git-format-patch.txt:630
#, priority:100
msgid "You can also use `git format-patch --base=P -3 C` to generate patches for A, B and C, and the identifiers for P, X, Y, Z are appended at the end of the first message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:632
+#: en/git-format-patch.txt:636
#, priority:100
msgid "If set `--base=auto` in cmdline, it will track base commit automatically, the base commit will be the merge base of tip commit of the remote-tracking branch and revision-range specified in cmdline. For a local branch, you need to track a remote branch by `git branch --set-upstream-to` before using this option."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:638
+#: en/git-format-patch.txt:642
#, priority:100
msgid "Extract commits between revisions R1 and R2, and apply them on top of the current branch using 'git am' to cherry-pick them:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:641
+#: en/git-format-patch.txt:645
#, no-wrap, priority:100
msgid "$ git format-patch -k --stdout R1..R2 | git am -3 -k\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:645
+#: en/git-format-patch.txt:649
#, priority:100
msgid "Extract all commits which are in the current branch but not in the origin branch:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:648
+#: en/git-format-patch.txt:652
#, no-wrap, priority:100
msgid "$ git format-patch origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:651
+#: en/git-format-patch.txt:655
#, priority:100
msgid "For each commit a separate file is created in the current directory."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:654
+#: en/git-format-patch.txt:658
#, priority:100
msgid "Extract all commits that lead to 'origin' since the inception of the project:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:657
+#: en/git-format-patch.txt:661
#, no-wrap, priority:100
msgid "$ git format-patch --root origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:660
+#: en/git-format-patch.txt:664
#, priority:100
msgid "The same as the previous one:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:663
+#: en/git-format-patch.txt:667
#, no-wrap, priority:100
msgid "$ git format-patch -M -B origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:670
+#: en/git-format-patch.txt:674
#, priority:100
msgid "Additionally, it detects and handles renames and complete rewrites intelligently to produce a renaming patch. A renaming patch reduces the amount of text output, and generally makes it easier to review. Note that non-Git \"patch\" programs won't understand renaming patches, so use it only when you know the recipient uses Git to apply your patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:673
+#: en/git-format-patch.txt:677
#, priority:100
msgid "Extract three topmost commits from the current branch and format them as e-mailable patches:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:676
+#: en/git-format-patch.txt:680
#, no-wrap, priority:100
msgid "$ git format-patch -3\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:681
+#: en/git-format-patch.txt:685
#, ignore-same, priority:100
msgid "linkgit:git-am[1], linkgit:git-send-email[1]"
msgstr "linkgit:git-am[1], linkgit:git-send-email[1]"
@@ -25773,43 +26044,43 @@ msgid "The below documentation is the same as what's found in linkgit:git-config
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:127
+#: en/git-gc.txt:126
#, priority:100
-msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, refs saved by 'git filter-branch' in refs/original/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
+msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, notes saved by 'git notes' under refs/notes/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:134
+#: en/git-gc.txt:133
#, priority:100
msgid "On the other hand, when 'git gc' runs concurrently with another process, there is a risk of it deleting an object that the other process is using but hasn't created a reference to. This may just cause the other process to fail or may corrupt the repository if the other process later adds a reference to the deleted object. Git has two features that significantly mitigate this problem:"
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:137
+#: en/git-gc.txt:136
#, priority:100
msgid "Any object with modification time newer than the `--prune` date is kept, along with everything reachable from it."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:141
+#: en/git-gc.txt:140
#, priority:100
msgid "Most operations that add an object to the database update the modification time of the object if it is already present so that #1 applies."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:145
+#: en/git-gc.txt:144
#, priority:100
msgid "However, these features fall short of a complete solution, so users who run commands concurrently have to live with some risk of corruption (which seems to be low in practice)."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:151
+#: en/git-gc.txt:150
#, priority:100
msgid "The 'git gc --auto' command will run the 'pre-auto-gc' hook. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:159
+#: en/git-gc.txt:158
#, ignore-same, priority:100
msgid "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
msgstr "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
@@ -26075,7 +26346,7 @@ msgid "For each <pathspec> given on command line, descend at most <depth> levels
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:399
+#: en/git-grep.txt:128 en/git-submodule.txt:400
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
@@ -26291,7 +26562,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:951
+#: en/git-grep.txt:217 en/rev-list-options.txt:967
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -26441,127 +26712,151 @@ msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:280
+#: en/git-grep.txt:277
+#, priority:100
+msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:282
+#, priority:100
+msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:287
+#, priority:100
+msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:291
+#, priority:100
+msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:297
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:281
+#: en/git-grep.txt:298
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:282
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:283 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:284
+#: en/git-grep.txt:301
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:289
+#: en/git-grep.txt:306
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:290 en/rev-list-options.txt:65
+#: en/git-grep.txt:307 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:294
+#: en/git-grep.txt:311
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:299
+#: en/git-grep.txt:316
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:300
+#: en/git-grep.txt:317
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:303
+#: en/git-grep.txt:320
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:307
+#: en/git-grep.txt:324
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:328
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:318
+#: en/git-grep.txt:335
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:321
+#: en/git-grep.txt:338
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:322
+#: en/git-grep.txt:339
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:325
+#: en/git-grep.txt:342
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:326
+#: en/git-grep.txt:343
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:329
+#: en/git-grep.txt:346
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:330
+#: en/git-grep.txt:347
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:332
+#: en/git-grep.txt:349
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
@@ -26779,25 +27074,13 @@ msgstr ""
#. type: Plain text
#: en/git-gui.txt:116
#, priority:100
-msgid "A 'git gui' development repository can be obtained from:"
+msgid "The official repository of the 'git gui' project can be found at:"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:118
#, no-wrap, priority:100
-msgid " git clone git://repo.or.cz/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:122
-#, no-wrap, priority:100
-msgid " git clone http://repo.or.cz/r/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:124
-#, priority:100
-msgid "or browsed online at http://repo.or.cz/w/git-gui.git/[]."
+msgid " https://github.com/prati0100/git-gui.git/\n"
msgstr ""
#. type: Title =
@@ -30409,29 +30692,29 @@ msgstr ""
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
-#. type: Plain text
-#: en/git-ls-remote.txt:110
+#. type: delimited block -
+#: en/git-ls-remote.txt:111
#, no-wrap, priority:100
msgid ""
-"\t$ git ls-remote --tags ./.\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"\t$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
-"\t5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"\tc781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
-"\t$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
-"\t$ git ls-remote --tags korg v\\*\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"$ git ls-remote --tags ./.\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
+"$ git ls-remote --tags korg v\\*\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:114
+#: en/git-ls-remote.txt:116
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -30939,7 +31222,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:358
+#: en/git-merge-base.txt:60 en/git-rebase.txt:376
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -30968,235 +31251,235 @@ msgstr ""
msgid "For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:86
+#. type: delimited block .
+#: en/git-merge-base.txt:87
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---B\n"
-"\t /\n"
-"\t---o---1---o---o---o---A\n"
+"\t o---o---o---B\n"
+"\t/\n"
+"---o---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:88
+#: en/git-merge-base.txt:90
#, priority:100
msgid "the merge base between 'A' and 'B' is '1'."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:92
+#: en/git-merge-base.txt:94
#, priority:100
msgid "Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the merge base between 'A' and a hypothetical commit 'M', which is a merge between 'B' and 'C'. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:98
+#. type: delimited block .
+#: en/git-merge-base.txt:101
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---C\n"
-"\t /\n"
-"\t / o---o---o---B\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---C\n"
+" /\n"
+" / o---o---o---B\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:101
+#: en/git-merge-base.txt:105
#, priority:100
msgid "the result of `git merge-base A B C` is '1'. This is because the equivalent topology with a merge commit 'M' between 'B' and 'C' is:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:108
+#. type: delimited block .
+#: en/git-merge-base.txt:113
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---o\n"
-"\t / \\\n"
-"\t / o---o---o---o---M\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---o\n"
+" / \\\n"
+" / o---o---o---o---M\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:112
+#: en/git-merge-base.txt:118
#, priority:100
msgid "and the result of `git merge-base A M` is '1'. Commit '2' is also a common ancestor between 'A' and 'M', but '1' is a better common ancestor, because '2' is an ancestor of '1'. Hence, '2' is not a merge base."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:115
+#: en/git-merge-base.txt:121
#, priority:100
msgid "The result of `git merge-base --octopus A B C` is '2', because '2' is the best common ancestor of all commits."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:118
+#: en/git-merge-base.txt:124
#, priority:100
msgid "When the history involves criss-cross merges, there can be more than one 'best' common ancestor for two commits. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:124
+#. type: delimited block .
+#: en/git-merge-base.txt:131
#, no-wrap, priority:100
msgid ""
-"\t---1---o---A\n"
-"\t \\ /\n"
-"\t X\n"
-"\t / \\\n"
-"\t---2---o---o---B\n"
+"---1---o---A\n"
+" \\ /\n"
+" X\n"
+" / \\\n"
+"---2---o---o---B\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:128
+#: en/git-merge-base.txt:136
#, priority:100
msgid "both '1' and '2' are merge-bases of A and B. Neither one is better than the other (both are 'best' merge bases). When the `--all` option is not given, it is unspecified which best one is output."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:133
+#: en/git-merge-base.txt:141
#, priority:100
msgid "A common idiom to check \"fast-forward-ness\" between two commits A and B is (or at least used to be) to compute the merge base between A and B, and check if it is the same as A, in which case, A is an ancestor of B. You will see this idiom used often in older scripts."
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:139
+#. type: delimited block .
+#: en/git-merge-base.txt:148
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tA=$(git rev-parse --verify A)\n"
-"\tif test \"$A\" = \"$(git merge-base A B)\"\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"A=$(git rev-parse --verify A)\n"
+"if test \"$A\" = \"$(git merge-base A B)\"\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:141
+#: en/git-merge-base.txt:151
#, priority:100
msgid "In modern git, you can say this in a more direct way:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:146
+#. type: delimited block .
+#: en/git-merge-base.txt:157
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tif git merge-base --is-ancestor A B\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"if git merge-base --is-ancestor A B\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:148
+#: en/git-merge-base.txt:160
#, priority:100
msgid "instead."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:150
+#: en/git-merge-base.txt:162
#, no-wrap, priority:100
msgid "Discussion on fork-point mode"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:156
+#: en/git-merge-base.txt:168
#, priority:100
msgid "After working on the `topic` branch created with `git switch -c topic origin/master`, the history of remote-tracking branch `origin/master` may have been rewound and rebuilt, leading to a history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:164
+#. type: delimited block .
+#: en/git-merge-base.txt:177
#, no-wrap, priority:100
msgid ""
-"\t o---B2\n"
-"\t /\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t \\\n"
-"\t B0\n"
-"\t \\\n"
-"\t D0---D1---D (topic)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\\n"
+"\t B0\n"
+"\t \\\n"
+"\t D0---D1---D (topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:170
+#: en/git-merge-base.txt:184
#, priority:100
msgid "where `origin/master` used to point at commits B0, B1, B2 and now it points at B, and your `topic` branch was started on top of it back when `origin/master` was at B0, and you built three commits, D0, D1, and D, on top of it. Imagine that you now want to rebase the work you did on the topic on top of the updated origin/master."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:176
+#: en/git-merge-base.txt:190
#, priority:100
msgid "In such a case, `git merge-base origin/master topic` would return the parent of B0 in the above picture, but B0^..D is *not* the range of commits you would want to replay on top of B (it includes B0, which is not what you wrote; it is a commit the other side discarded when it moved its tip from B0 to B1)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:184
+#: en/git-merge-base.txt:198
#, priority:100
msgid "`git merge-base --fork-point origin/master topic` is designed to help in such a case. It takes not only B but also B0, B1, and B2 (i.e. old tips of the remote-tracking branches your repository's reflog knows about) into account to see on which commit your topic branch was built and finds B0, allowing you to replay only the commits on your topic, excluding the commits the other side later discarded."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:186
+#: en/git-merge-base.txt:200
#, priority:100
msgid "Hence"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:188
+#: en/git-merge-base.txt:202
#, no-wrap, priority:100
msgid " $ fork_point=$(git merge-base --fork-point origin/master topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:190
+#: en/git-merge-base.txt:204
#, priority:100
msgid "will find B0, and"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:192
+#: en/git-merge-base.txt:206
#, no-wrap, priority:100
msgid " $ git rebase --onto origin/master $fork_point topic\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:195
+#: en/git-merge-base.txt:209
#, priority:100
msgid "will replay D0, D1 and D on top of B to create a new history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:203
+#. type: delimited block .
+#: en/git-merge-base.txt:218
#, no-wrap, priority:100
msgid ""
-"\t\t\t o---B2\n"
-"\t\t\t/\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t\t\\ \\\n"
-"\t\t B0 D0'--D1'--D' (topic - updated)\n"
-"\t\t \\\n"
-"\t\t D0---D1---D (topic - old)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\ \\\n"
+"\t B0 D0'--D1'--D' (topic - updated)\n"
+"\t \\\n"
+"\t D0---D1---D (topic - old)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:210
+#: en/git-merge-base.txt:226
#, priority:100
msgid "A caveat is that older reflog entries in your repository may be expired by `git gc`. If B0 no longer appears in the reflog of the remote-tracking branch `origin/master`, the `--fork-point` mode obviously cannot find it and fails, avoiding to give a random and useless result (such as the parent of B0, like the same command without the `--fork-point` option gives)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:221
+#: en/git-merge-base.txt:237
#, priority:100
msgid "Also, the remote-tracking branch you use the `--fork-point` mode with must be the one your topic forked from its tip. If you forked from an older commit than the tip, this mode would not find the fork point (imagine in the above sample history B0 did not exist, origin/master started at B1, moved to B2 and then B, and you forked your topic at origin/master^ when origin/master was B1; the shape of the history would be the same as above, without B0, and the parent of B1 is what `git merge-base origin/master topic` correctly finds, but the `--fork-point` mode will not, because it is not one of the commits that used to be at the tip of origin/master)."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:224
+#: en/git-merge-base.txt:240
#, no-wrap, priority:100
msgid "See also"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:228
+#: en/git-merge-base.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
msgstr "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
@@ -31407,31 +31690,31 @@ msgstr ""
msgid "Examples:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:62
+#. type: delimited block -
+#: en/git-merge-index.txt:63
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
-" This is MM from the original tree.\t\t\t# original\n"
-" This is modified MM in the branch A.\t\t\t# merge1\n"
-" This is modified MM in the branch B.\t\t\t# merge2\n"
-" This is modified MM in the branch B.\t\t\t# current contents\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
+"This is MM from the original tree.\t\t# original\n"
+"This is modified MM in the branch A.\t\t# merge1\n"
+"This is modified MM in the branch B.\t\t# merge2\n"
+"This is modified MM in the branch B.\t\t# current contents\n"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:71
+#. type: delimited block -
+#: en/git-merge-index.txt:74
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
-" cat: : No such file or directory\n"
-" This is added AA in the branch A.\n"
-" This is added AA in the branch B.\n"
-" This is added AA in the branch B.\n"
-" fatal: merge program failed\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
+"cat: : No such file or directory\n"
+"This is added AA in the branch A.\n"
+"This is added AA in the branch B.\n"
+"This is added AA in the branch B.\n"
+"fatal: merge program failed\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-index.txt:76
+#: en/git-merge-index.txt:80
#, priority:100
msgid "where the latter example shows how 'git merge-index' will stop trying to merge once anything has returned an error (i.e., `cat` returned an error for the AA file, because it didn't exist in the original, and thus 'git merge-index' didn't even try to merge the MM thing)."
msgstr ""
@@ -31729,7 +32012,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n"
-"\t[-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
+"\t[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
"\t[--[no-]allow-unrelated-histories]\n"
"\t[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]\n"
"'git merge' (--continue | --abort | --quit)\n"
@@ -32810,7 +33093,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:281 en/merge-options.txt:108
+#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -33790,7 +34073,7 @@ msgid "Conflicts can occur when applying a commit to p4. When this happens, the
msgstr ""
#. type: Labeled list
-#: en/git-p4.txt:359 en/git-submodule.txt:270
+#: en/git-p4.txt:359 en/git-submodule.txt:271
#, no-wrap, priority:220
msgid "--branch <branch>"
msgstr ""
@@ -34926,7 +35209,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:263 en/rev-list-options.txt:760
+#: en/git-pack-objects.txt:263 en/rev-list-options.txt:776
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -34938,13 +35221,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:266 en/rev-list-options.txt:767
+#: en/git-pack-objects.txt:266 en/rev-list-options.txt:783
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:269 en/rev-list-options.txt:770
+#: en/git-pack-objects.txt:269 en/rev-list-options.txt:786
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -34956,7 +35239,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:276 en/rev-list-options.txt:777
+#: en/git-pack-objects.txt:276 en/rev-list-options.txt:793
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -34968,7 +35251,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:281 en/rev-list-options.txt:785
+#: en/git-pack-objects.txt:281 en/rev-list-options.txt:801
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -35727,13 +36010,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:502
+#: en/git-pull.txt:136 en/git-rebase.txt:524
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:503
+#: en/git-pull.txt:137 en/git-rebase.txt:525
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -37526,8 +37809,8 @@ msgstr ""
#: en/git-rebase.txt:16
#, no-wrap, priority:100
msgid ""
-"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
-"\t[<upstream> [<branch>]]\n"
+"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>]\n"
+"\t[--onto <newbase> | --keep-base] [<upstream> [<branch>]]\n"
"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
"\t--root [<branch>]\n"
"'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch)\n"
@@ -37846,512 +38129,542 @@ msgstr ""
msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:220
+#, ignore-same, no-wrap, priority:100
+msgid "--keep-base"
+msgstr "--keep-base"
+
#. type: Plain text
-#: en/git-rebase.txt:224
+#: en/git-rebase.txt:225
+#, ignore-ellipsis, priority:100
+msgid "Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running 'git rebase --keep-base <upstream> <branch>' is equivalent to running 'git rebase --onto <upstream>... <upstream>'."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:230
+#, priority:100
+msgid "This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:235
+#, priority:100
+msgid "Although both this option and --fork-point find the merge base between <upstream> and <branch>, this option uses the merge base as the _starting point_ on which new commits will be created, whereas --fork-point uses the merge base to determine the _set of commits_ which will be rebased."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#, priority:100
+msgid "See also INCOMPATIBLE OPTIONS below."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:242
#, priority:100
msgid "Upstream branch to compare against. May be any valid commit, not just an existing branch name. Defaults to the configured upstream for the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:230
+#: en/git-rebase.txt:248
#, priority:100
msgid "Restart the rebasing process after having resolved a merge conflict."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237
+#: en/git-rebase.txt:255
#, priority:100
msgid "Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:242
+#: en/git-rebase.txt:260
#, priority:100
msgid "Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:243 en/git-rebase.txt:538
+#: en/git-rebase.txt:261 en/git-rebase.txt:560
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:246
+#: en/git-rebase.txt:264
#, priority:100
msgid "Keep the commits that do not change anything from its parents in the result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:248 en/git-rebase.txt:255 en/git-rebase.txt:280 en/git-rebase.txt:293 en/git-rebase.txt:302 en/git-rebase.txt:344 en/git-rebase.txt:379 en/git-rebase.txt:386 en/git-rebase.txt:393 en/git-rebase.txt:405 en/git-rebase.txt:445 en/git-rebase.txt:470 en/git-rebase.txt:482 en/git-rebase.txt:501
-#, priority:100
-msgid "See also INCOMPATIBLE OPTIONS below."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rebase.txt:253
+#: en/git-rebase.txt:271
#, priority:100
msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:258
+#: en/git-rebase.txt:276
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:259 en/git-rebase.txt:539
+#: en/git-rebase.txt:277 en/git-rebase.txt:561
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:261
+#: en/git-rebase.txt:279
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:266
+#: en/git-rebase.txt:284
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:272
+#: en/git-rebase.txt:290
#, priority:100
msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:278
+#: en/git-rebase.txt:296
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:286
+#: en/git-rebase.txt:304
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:291
+#: en/git-rebase.txt:309
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:294
+#: en/git-rebase.txt:312
#, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:295
+#: en/git-rebase.txt:313
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:300
+#: en/git-rebase.txt:318
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:317
+#: en/git-rebase.txt:335
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:321
+#: en/git-rebase.txt:339
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:325
+#: en/git-rebase.txt:343
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:329
+#: en/git-rebase.txt:347
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:332
+#: en/git-rebase.txt:350
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:333 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:336
+#: en/git-rebase.txt:354
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:345 en/merge-options.txt:47
+#: en/git-rebase.txt:363 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:346
+#: en/git-rebase.txt:364
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:351
+#: en/git-rebase.txt:369
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:357
+#: en/git-rebase.txt:375
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:359
+#: en/git-rebase.txt:377
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:363
+#: en/git-rebase.txt:381
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:387
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:372
+#: en/git-rebase.txt:390
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:394
+#, priority:100
+msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:399
#, priority:100
msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:384
+#: en/git-rebase.txt:406
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:391
+#: en/git-rebase.txt:413
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:421
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:403
+#: en/git-rebase.txt:425
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:407
+#: en/git-rebase.txt:429
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:415
+#: en/git-rebase.txt:437
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:422
+#: en/git-rebase.txt:444
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:426
+#: en/git-rebase.txt:448
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges`, but in contrast to that option works well in interactive rebases: commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:430
+#: en/git-rebase.txt:452
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:432
+#: en/git-rebase.txt:454
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:434 en/git-rebase.txt:535 en/git-svn.txt:680
+#: en/git-rebase.txt:456 en/git-rebase.txt:557 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:439
+#: en/git-rebase.txt:461
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:443
+#: en/git-rebase.txt:465
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:446
+#: en/git-rebase.txt:468
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:447
+#: en/git-rebase.txt:469
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:474
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:455
+#: en/git-rebase.txt:477
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:457
+#: en/git-rebase.txt:479
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:459
+#: en/git-rebase.txt:481
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:483
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:487
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:490
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:480
+#: en/git-rebase.txt:502
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:505
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:484
+#: en/git-rebase.txt:506
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:495
+#: en/git-rebase.txt:517
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:499
+#: en/git-rebase.txt:521
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:509
+#: en/git-rebase.txt:531
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:510
+#: en/git-rebase.txt:532
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:511
+#: en/git-rebase.txt:533
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:514
+#: en/git-rebase.txt:536
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:516
+#: en/git-rebase.txt:538
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:519
+#: en/git-rebase.txt:541
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:523
+#: en/git-rebase.txt:545
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:527
+#: en/git-rebase.txt:549
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:530
+#: en/git-rebase.txt:552
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:553
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:555
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Plain text
-#: en/git-rebase.txt:534
+#: en/git-rebase.txt:556
#, ignore-same, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:537
+#: en/git-rebase.txt:559
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:540
+#: en/git-rebase.txt:562
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:542
+#: en/git-rebase.txt:564
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:544
+#: en/git-rebase.txt:566
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:567
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:546
+#: en/git-rebase.txt:568
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:547
+#: en/git-rebase.txt:569
#, priority:100
-msgid "--rebase-merges and --strategy"
+msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:548
+#: en/git-rebase.txt:570
#, priority:100
-msgid "--rebase-merges and --strategy-option"
+msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:550
+#: en/git-rebase.txt:572
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:575
#, no-wrap, priority:100
msgid "There are some subtle differences how the backends behave.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:556
+#: en/git-rebase.txt:578
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38359,7 +38672,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:561
+#: en/git-rebase.txt:583
#, no-wrap, priority:100
msgid ""
"The am backend drops any \"empty\" commits, regardless of whether the\n"
@@ -38369,7 +38682,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:588
#, no-wrap, priority:100
msgid ""
"The interactive backend drops commits by default that\n"
@@ -38379,7 +38692,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:591
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38387,7 +38700,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:573
+#: en/git-rebase.txt:595
#, no-wrap, priority:100
msgid ""
"Directory rename heuristics are enabled in the merge and interactive\n"
@@ -38396,145 +38709,145 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:597
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:577
+#: en/git-rebase.txt:599
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:582
+#: en/git-rebase.txt:604
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:587
+#: en/git-rebase.txt:609
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:589
+#: en/git-rebase.txt:611
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:596
+#: en/git-rebase.txt:618
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:598
+#: en/git-rebase.txt:620
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:600
+#: en/git-rebase.txt:622
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:601
+#: en/git-rebase.txt:623
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:602
+#: en/git-rebase.txt:624
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:603
+#: en/git-rebase.txt:625
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:605
+#: en/git-rebase.txt:627
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:607
+#: en/git-rebase.txt:629
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:631
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:610
+#: en/git-rebase.txt:632
#, priority:100
msgid "commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:612
+#: en/git-rebase.txt:634
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:614
+#: en/git-rebase.txt:636
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:615
+#: en/git-rebase.txt:637
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:616
+#: en/git-rebase.txt:638
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:644
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:646
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:626
+#: en/git-rebase.txt:648
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:653
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:658
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -38543,73 +38856,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:641
+#: en/git-rebase.txt:663
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:668
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:649
+#: en/git-rebase.txt:671
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:652
+#: en/git-rebase.txt:674
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:655
+#: en/git-rebase.txt:677
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:685
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:667
+#: en/git-rebase.txt:689
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:693
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:696
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:699
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:680
+#: en/git-rebase.txt:702
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:687
+#: en/git-rebase.txt:709
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -38620,25 +38933,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:691
+#: en/git-rebase.txt:713
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:694
+#: en/git-rebase.txt:716
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:701
+#: en/git-rebase.txt:723
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:710
+#: en/git-rebase.txt:732
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -38651,31 +38964,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:715
+#: en/git-rebase.txt:737
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:720
+#: en/git-rebase.txt:742
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:745
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:727
+#: en/git-rebase.txt:749
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:759
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -38689,85 +39002,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:740
+#: en/git-rebase.txt:762
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:746
+#: en/git-rebase.txt:768
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:750
+#: en/git-rebase.txt:772
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:752
+#: en/git-rebase.txt:774
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:756
+#: en/git-rebase.txt:778
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:760
+#: en/git-rebase.txt:782
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:763
+#: en/git-rebase.txt:785
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:765
+#: en/git-rebase.txt:787
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:767
+#: en/git-rebase.txt:789
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:794
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:775
+#: en/git-rebase.txt:797
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:804
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:809
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:816
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38778,13 +39091,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:819
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:826
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38795,13 +39108,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:808
+#: en/git-rebase.txt:830
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:815
+#: en/git-rebase.txt:837
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38812,73 +39125,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:822
+#: en/git-rebase.txt:844
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:824
+#: en/git-rebase.txt:846
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:825
+#: en/git-rebase.txt:847
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:829
+#: en/git-rebase.txt:851
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:836
+#: en/git-rebase.txt:859
#, priority:100
-msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or `filter-branch`."
+msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:839
+#: en/git-rebase.txt:862
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:867
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:848
+#: en/git-rebase.txt:871
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:850
+#: en/git-rebase.txt:873
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:875
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:858
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38889,19 +39202,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:885
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:866
+#: en/git-rebase.txt:889
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:894
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -38911,67 +39224,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:876
+#: en/git-rebase.txt:899
#, priority:100
-msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge-base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
+msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:880
+#: en/git-rebase.txt:903
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:883
+#: en/git-rebase.txt:906
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:886
+#: en/git-rebase.txt:909
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:888
+#: en/git-rebase.txt:911
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:893
+#: en/git-rebase.txt:916
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:895
+#: en/git-rebase.txt:918
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:926
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:907
+#: en/git-rebase.txt:930
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:912
+#: en/git-rebase.txt:935
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:922
+#: en/git-rebase.txt:945
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -38985,25 +39298,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:929
+#: en/git-rebase.txt:952
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:932
+#: en/git-rebase.txt:955
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:935 en/git-rebase.txt:1012
+#: en/git-rebase.txt:958 en/git-rebase.txt:1035
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:941
+#: en/git-rebase.txt:964
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39014,7 +39327,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:946
+#: en/git-rebase.txt:969
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39024,7 +39337,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:950
+#: en/git-rebase.txt:973
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39033,55 +39346,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:954
+#: en/git-rebase.txt:977
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:962
+#: en/git-rebase.txt:985
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:992
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:975
+#: en/git-rebase.txt:998
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:978
+#: en/git-rebase.txt:1001
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1008
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:989
+#: en/git-rebase.txt:1012
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:996
+#: en/git-rebase.txt:1019
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1003
+#: en/git-rebase.txt:1026
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39092,13 +39405,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1009
+#: en/git-rebase.txt:1032
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1015
+#: en/git-rebase.txt:1038
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39106,7 +39419,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1022
+#: en/git-rebase.txt:1045
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39118,7 +39431,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1049
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39127,37 +39440,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1035
+#: en/git-rebase.txt:1058
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1037
+#: en/git-rebase.txt:1060
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1039
+#: en/git-rebase.txt:1062
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1043
+#: en/git-rebase.txt:1066
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1068
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1072
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -39465,117 +39778,118 @@ msgstr ""
msgid "Using this hook, it is easy to generate mails describing the updates to the repository. This example script sends one mail message per ref listing the commits pushed to the repository, and logs the push certificates of signed pushes with good signatures to a logger service:"
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:191
+#. type: delimited block -
+#: en/git-receive-pack.txt:192
#, no-wrap, priority:100
msgid ""
-"\t#!/bin/sh\n"
-"\t# mail out commit update information.\n"
-"\twhile read oval nval ref\n"
-"\tdo\n"
-"\t\tif expr \"$oval\" : '0*$' >/dev/null\n"
-"\t\tthen\n"
-"\t\t\techo \"Created a new ref, with the following commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\"\n"
-"\t\telse\n"
-"\t\t\techo \"New commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
-"\t\tfi |\n"
-"\t\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
-"\tdone\n"
-"\t# log signed push certificate, if any\n"
-"\tif test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"#!/bin/sh\n"
+"# mail out commit update information.\n"
+"while read oval nval ref\n"
+"do\n"
+"\tif expr \"$oval\" : '0*$' >/dev/null\n"
"\tthen\n"
-"\t\t(\n"
-"\t\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
-"\t\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
-"\t\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
-"\tfi\n"
-"\texit 0\n"
+"\t\techo \"Created a new ref, with the following commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\"\n"
+"\telse\n"
+"\t\techo \"New commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
+"\tfi |\n"
+"\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
+"done\n"
+"# log signed push certificate, if any\n"
+"if test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"then\n"
+"\t(\n"
+"\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
+"\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
+"\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
+"fi\n"
+"exit 0\n"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:194
+#: en/git-receive-pack.txt:196
#, priority:100
msgid "The exit code from this hook invocation is ignored, however a non-zero exit code will generate an error message."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:200
+#: en/git-receive-pack.txt:202
#, priority:100
msgid "Note that it is possible for refname to not have sha1-new when this hook runs. This can easily occur if another user modifies the ref after it was updated by 'git-receive-pack', but before the hook was able to evaluate it. It is recommended that hooks rely on sha1-new rather than the current value of refname."
msgstr ""
#. type: Title -
-#: en/git-receive-pack.txt:202
+#: en/git-receive-pack.txt:204
#, no-wrap, priority:100
msgid "POST-UPDATE HOOK"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:207
+#: en/git-receive-pack.txt:209
#, priority:100
msgid "After all other processing, if at least one ref was updated, and if $GIT_DIR/hooks/post-update file exists and is executable, then post-update will be called with the list of refs that have been updated. This can be used to implement any repository wide cleanup tasks."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:211
+#: en/git-receive-pack.txt:213
#, priority:100
msgid "The exit code from this hook invocation is ignored; the only thing left for 'git-receive-pack' to do at that point is to exit itself anyway."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:214
+#: en/git-receive-pack.txt:216
#, priority:100
msgid "This hook can be used, for example, to run `git update-server-info` if the repository is packed and is served via a dumb transport."
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:217
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/git-receive-pack.txt:220
+#, fuzzy, no-wrap, priority:100
+#| msgid "git-update-server-info(1)"
msgid ""
-"\t#!/bin/sh\n"
-"\texec git update-server-info\n"
-msgstr ""
+"#!/bin/sh\n"
+"exec git update-server-info\n"
+msgstr "git-update-server-info(1)"
#. type: Title -
-#: en/git-receive-pack.txt:220
+#: en/git-receive-pack.txt:224
#, no-wrap, priority:100
msgid "QUARANTINE ENVIRONMENT"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:227
+#: en/git-receive-pack.txt:231
#, priority:100
msgid "When `receive-pack` takes in objects, they are placed into a temporary \"quarantine\" directory within the `$GIT_DIR/objects` directory and migrated into the main object store only after the `pre-receive` hook has completed. If the push fails before then, the temporary directory is removed entirely."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:229
+#: en/git-receive-pack.txt:233
#, priority:100
msgid "This has a few user-visible effects and caveats:"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:235
+#: en/git-receive-pack.txt:239
#, priority:100
msgid "Pushes which fail due to problems with the incoming pack, missing objects, or due to the `pre-receive` hook will not leave any on-disk data. This is usually helpful to prevent repeated failed pushes from filling up your disk, but can make debugging more challenging."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:238
+#: en/git-receive-pack.txt:242
#, priority:100
msgid "Any objects created by the `pre-receive` hook will be created in the quarantine directory (and migrated only if it succeeds)."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:244
+#: en/git-receive-pack.txt:248
#, priority:100
msgid "The `pre-receive` hook MUST NOT update any refs to point to quarantined objects. Other programs accessing the repository will not be able to see the objects (and if the pre-receive hook fails, those refs would become corrupted). For safety, any ref updates from within `pre-receive` are automatically rejected."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:249
+#: en/git-receive-pack.txt:253
#, ignore-same, priority:100
msgid "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
msgstr "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
@@ -40903,7 +41217,7 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:131
#, priority:100
-msgid "linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and linkgit:git-rebase[1], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
+msgid "linkgit:git-hash-object[1], linkgit:git-rebase[1], and https://github.com/newren/git-filter-repo[git-filter-repo], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
msgstr ""
#. type: Plain text
@@ -40926,9 +41240,10 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:158
-#, priority:100
-msgid "linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1]"
-msgstr ""
+#, fuzzy, priority:100
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] https://github.com/newren/git-filter-repo[git-filter-repo]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title =
#: en/git-request-pull.txt:2
@@ -41720,7 +42035,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:228 en/git-stash.txt:229
+#: en/git-reset.txt:228 en/git-stash.txt:230
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -42447,102 +42762,49 @@ msgid "git-rev-list - Lists commit objects in reverse chronological order"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:65
+#: en/git-rev-list.txt:13
#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"'git rev-list' [ --max-count=<number> ]\n"
-"\t [ --skip=<number> ]\n"
-"\t [ --max-age=<timestamp> ]\n"
-"\t [ --min-age=<timestamp> ]\n"
-"\t [ --sparse ]\n"
-"\t [ --merges ]\n"
-"\t [ --no-merges ]\n"
-"\t [ --min-parents=<number> ]\n"
-"\t [ --no-min-parents ]\n"
-"\t [ --max-parents=<number> ]\n"
-"\t [ --no-max-parents ]\n"
-"\t [ --first-parent ]\n"
-"\t [ --remove-empty ]\n"
-"\t [ --full-history ]\n"
-"\t [ --not ]\n"
-"\t [ --all ]\n"
-"\t [ --branches[=<pattern>] ]\n"
-"\t [ --tags[=<pattern>] ]\n"
-"\t [ --remotes[=<pattern>] ]\n"
-"\t [ --glob=<glob-pattern> ]\n"
-"\t [ --ignore-missing ]\n"
-"\t [ --stdin ]\n"
-"\t [ --quiet ]\n"
-"\t [ --topo-order ]\n"
-"\t [ --parents ]\n"
-"\t [ --timestamp ]\n"
-"\t [ --left-right ]\n"
-"\t [ --left-only ]\n"
-"\t [ --right-only ]\n"
-"\t [ --cherry-mark ]\n"
-"\t [ --cherry-pick ]\n"
-"\t [ --encoding=<encoding> ]\n"
-"\t [ --(author|committer|grep)=<pattern> ]\n"
-"\t [ --regexp-ignore-case | -i ]\n"
-"\t [ --extended-regexp | -E ]\n"
-"\t [ --fixed-strings | -F ]\n"
-"\t [ --date=<format>]\n"
-"\t [ [ --objects | --objects-edge | --objects-edge-aggressive ]\n"
-"\t [ --unpacked ]\n"
-"\t [ --object-names | --no-object-names ]\n"
-"\t [ --filter=<filter-spec> [ --filter-print-omitted ] ] ]\n"
-"\t [ --missing=<missing-action> ]\n"
-"\t [ --pretty | --header ]\n"
-"\t [ --bisect ]\n"
-"\t [ --bisect-vars ]\n"
-"\t [ --bisect-all ]\n"
-"\t [ --merge ]\n"
-"\t [ --reverse ]\n"
-"\t [ --walk-reflogs ]\n"
-"\t [ --no-walk ] [ --do-walk ]\n"
-"\t [ --count ]\n"
-"\t [ --use-bitmap-index ]\n"
-"\t <commit>... [ \\-- <paths>... ]\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:73
+msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rev-list.txt:21
#, priority:100
msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:80
+#: en/git-rev-list.txt:28
#, priority:100
msgid "You can think of this as a set operation. Commits given on the command line form a set of commits that are reachable from any of them, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:82
+#: en/git-rev-list.txt:30
#, priority:100
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:85
+#: en/git-rev-list.txt:33
#, no-wrap, priority:100
msgid "\t$ git rev-list foo bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:89
+#: en/git-rev-list.txt:37
#, priority:100
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:93
+#: en/git-rev-list.txt:41
#, priority:100
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:97
+#: en/git-rev-list.txt:45
#, no-wrap, priority:100
msgid ""
"\t$ git rev-list origin..HEAD\n"
@@ -42550,13 +42812,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:102
+#: en/git-rev-list.txt:50
#, ignore-ellipsis, priority:100
msgid "Another special notation is \"'<commit1>'...'<commit2>'\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:106
+#: en/git-rev-list.txt:54
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git rev-list A B --not $(git merge-base --all A B)\n"
@@ -42564,7 +42826,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:113
+#: en/git-rev-list.txt:61
#, priority:100
msgid "'rev-list' is a very essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For this reason, it has a lot of different options that enables it to be used by commands as different as 'git bisect' and 'git repack'."
msgstr ""
@@ -44686,31 +44948,31 @@ msgstr ""
msgid "To use 'git send-email' to send your patches through the GMail SMTP server, edit ~/.gitconfig to specify your account settings:"
msgstr ""
-#. type: Plain text
-#: en/git-send-email.txt:494
+#. type: delimited block -
+#: en/git-send-email.txt:495
#, no-wrap, priority:100
msgid ""
-"\t[sendemail]\n"
-"\t\tsmtpEncryption = tls\n"
-"\t\tsmtpServer = smtp.gmail.com\n"
-"\t\tsmtpUser = yourname@gmail.com\n"
-"\t\tsmtpServerPort = 587\n"
+"[sendemail]\n"
+"\tsmtpEncryption = tls\n"
+"\tsmtpServer = smtp.gmail.com\n"
+"\tsmtpUser = yourname@gmail.com\n"
+"\tsmtpServerPort = 587\n"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:498
+#: en/git-send-email.txt:500
#, priority:100
msgid "If you have multifactor authentication setup on your gmail account, you will need to generate an app-specific password for use with 'git send-email'. Visit https://security.google.com/settings/security/apppasswords to create it."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:501
+#: en/git-send-email.txt:503
#, priority:100
msgid "Once your commits are ready to be sent to the mailing list, run the following commands:"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:505
+#: en/git-send-email.txt:507
#, no-wrap, priority:100
msgid ""
"\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -44719,19 +44981,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:510
+#: en/git-send-email.txt:512
#, priority:100
msgid "The first time you run it, you will be prompted for your credentials. Enter the app-specific or your regular password as appropriate. If you have credential helper configured (see linkgit:git-credential[1]), the password will be saved in the credential store so you won't have to type it the next time."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:518
#, priority:100
msgid "Note: the following core Perl modules that may be installed with your distribution of Perl are required: MIME::Base64, MIME::QuotedPrint, Net::Domain and Net::SMTP. These additional Perl modules are also required: Authen::SASL and Mail::Address."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:521
+#: en/git-send-email.txt:523
#, priority:100
msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
msgstr ""
@@ -46320,25 +46582,25 @@ msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--a
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:92
+#: en/git-stash.txt:93
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs, and any non-option arguments form the message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:93
+#: en/git-stash.txt:94
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:100
+#: en/git-stash.txt:101
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:104
+#: en/git-stash.txt:105
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46346,139 +46608,139 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:108
+#: en/git-stash.txt:109
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:109
+#: en/git-stash.txt:110
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:119
+#: en/git-stash.txt:120
#, priority:240
msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:120
+#: en/git-stash.txt:121
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:126
+#: en/git-stash.txt:127
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:130
+#: en/git-stash.txt:131
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:135
+#: en/git-stash.txt:136
#, priority:240
msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:138
+#: en/git-stash.txt:139
#, priority:240
msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:139
+#: en/git-stash.txt:140
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:145
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:145
+#: en/git-stash.txt:146
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:153
+#: en/git-stash.txt:154
#, priority:240
msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:159
+#: en/git-stash.txt:160
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:160
+#: en/git-stash.txt:161
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:164
+#: en/git-stash.txt:165
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:165
+#: en/git-stash.txt:166
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:171
+#: en/git-stash.txt:172
#, priority:240
msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:172 en/git-update-ref.txt:100
+#: en/git-stash.txt:173 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:179
+#: en/git-stash.txt:180
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:180
+#: en/git-stash.txt:181
#, no-wrap, priority:240
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:186
+#: en/git-stash.txt:187
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:195
+#: en/git-stash.txt:196
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:199
+#: en/git-stash.txt:200
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46487,31 +46749,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:203
+#: en/git-stash.txt:204
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:208
+#: en/git-stash.txt:209
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:214
+#: en/git-stash.txt:215
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:219
+#: en/git-stash.txt:220
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:227
+#: en/git-stash.txt:228
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -46523,13 +46785,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:235
+#: en/git-stash.txt:236
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:246
+#: en/git-stash.txt:247
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46544,13 +46806,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:249
+#: en/git-stash.txt:250
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:257
+#: en/git-stash.txt:258
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46562,19 +46824,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:259
+#: en/git-stash.txt:260
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:264
+#: en/git-stash.txt:265
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:275
+#: en/git-stash.txt:276
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46589,19 +46851,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:277
+#: en/git-stash.txt:278
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:283
+#: en/git-stash.txt:284
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:288
+#: en/git-stash.txt:289
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -46610,7 +46872,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:298
+#: en/git-stash.txt:299
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -46688,61 +46950,61 @@ msgid "In addition to the names of files that have been changed, also show the t
msgstr ""
#. type: Plain text
-#: en/git-status.txt:65
+#: en/git-status.txt:66
#, priority:280
msgid "The mode parameter is used to specify the handling of untracked files. It is optional: it defaults to 'all', and if specified, it must be stuck to the option (e.g. `-uno`, but not `-u no`)."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:69
+#: en/git-status.txt:70
#, no-wrap, priority:280
msgid "'no' - Show no untracked files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:70
+#: en/git-status.txt:71
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:81
+#: en/git-status.txt:82
#, priority:280
msgid "When `-u` option is not used, untracked files and directories are shown (i.e. the same as specifying `normal`), to help you avoid forgetting to add newly created files. Because it takes extra work to find untracked files in the filesystem, this mode may take some time in a large working tree. Consider enabling untracked cache and split index if supported (see `git update-index --untracked-cache` and `git update-index --split-index`), Otherwise you can use `no` to have `git status` return more quickly without showing untracked files."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:99
+#: en/git-status.txt:101
#, priority:280
msgid "Ignore changes to submodules when looking for changes. <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 before 1.7.0). Using \"all\" hides all changes to submodules (and suppresses the output of submodule summaries when the config option `status.submoduleSummary` is set)."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:100
+#: en/git-status.txt:102
#, no-wrap, priority:280
msgid "--ignored[=<mode>]"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:102
+#: en/git-status.txt:104
#, priority:280
msgid "Show ignored files as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:105
+#: en/git-status.txt:108
#, priority:280
msgid "The mode parameter is used to specify the handling of ignored files. It is optional: it defaults to 'traditional'."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:109
+#: en/git-status.txt:112
#, priority:280
msgid "'traditional' - Shows ignored files and directories, unless"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:112
+#: en/git-status.txt:115
#, no-wrap, priority:280
msgid ""
"--untracked-files=all is specified, in which case\n"
@@ -46751,109 +47013,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:113
+#: en/git-status.txt:116
#, no-wrap, priority:280
msgid "'no'\t - Show no ignored files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:114
+#: en/git-status.txt:117
#, no-wrap, priority:280
msgid "'matching' - Shows ignored files and directories matching an\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:115
+#: en/git-status.txt:118
#, no-wrap, priority:280
msgid "ignore pattern.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:121
+#: en/git-status.txt:124
#, priority:280
msgid "When 'matching' mode is specified, paths that explicitly match an ignored pattern are shown. If a directory matches an ignore pattern, then it is shown, but not paths contained in the ignored directory. If a directory does not match an ignore pattern, but all contents are ignored, then the directory is not shown, but all contents are shown."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:125
+#: en/git-status.txt:129
#, priority:280
msgid "Terminate entries with NUL, instead of LF. This implies the `--porcelain=v1` output format if no other format is given."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:132
+#: en/git-status.txt:136
#, priority:280
msgid "Display untracked files in columns. See configuration variable column.status for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:133
+#: en/git-status.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--ahead-behind"
msgstr "--ahead-behind"
#. type: Labeled list
-#: en/git-status.txt:134
+#: en/git-status.txt:138
#, ignore-same, no-wrap, priority:280
msgid "--no-ahead-behind"
msgstr "--no-ahead-behind"
#. type: Plain text
-#: en/git-status.txt:137
+#: en/git-status.txt:141
#, priority:280
msgid "Display or do not display detailed ahead/behind counts for the branch relative to its upstream branch. Defaults to true."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:138
+#: en/git-status.txt:142
#, ignore-same, no-wrap, priority:280
msgid "--renames"
msgstr "--renames"
#. type: Plain text
-#: en/git-status.txt:142
+#: en/git-status.txt:146
#, priority:280
msgid "Turn on/off rename detection regardless of user configuration. See also linkgit:git-diff[1] `--no-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:147
+#: en/git-status.txt:151
#, priority:280
msgid "Turn on rename detection, optionally setting the similarity threshold. See also linkgit:git-diff[1] `--find-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:150
+#: en/git-status.txt:154
#, priority:280
msgid "See the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:158
+#: en/git-status.txt:162
#, priority:280
msgid "The output from this command is designed to be used as a commit template comment. The default, long format, is designed to be human readable, verbose and descriptive. Its contents and format are subject to change at any time."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:163
+#: en/git-status.txt:167
#, priority:280
msgid "The paths mentioned in the output, unlike many other Git commands, are made relative to the current directory if you are working in a subdirectory (this is on purpose, to help cutting and pasting). See the status.relativePaths config option below."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:165
+#: en/git-status.txt:169
#, no-wrap, priority:280
msgid "Short Format"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:169
+#: en/git-status.txt:173
#, priority:280
msgid "In the short-format, the status of each path is shown as one of these forms"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:172
+#: en/git-status.txt:176
#, no-wrap, priority:280
msgid ""
"\tXY PATH\n"
@@ -46861,73 +47123,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:176
+#: en/git-status.txt:180
#, priority:280
msgid "where `ORIG_PATH` is where the renamed/copied contents came from. `ORIG_PATH` is only shown when the entry is renamed or copied. The `XY` is a two-letter status code."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:182
+#: en/git-status.txt:186
#, priority:280
msgid "The fields (including the `->`) are separated from each other by a single space. If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash-escaped."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:188
+#: en/git-status.txt:192
#, priority:280
msgid "For paths with merge conflicts, `X` and `Y` show the modification states of each side of the merge. For paths that do not have merge conflicts, `X` shows the status of the index, and `Y` shows the status of the work tree. For untracked paths, `XY` are `??`. Other status codes can be interpreted as follows:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:190
+#: en/git-status.txt:194
#, priority:280
msgid "' ' = unmodified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:191
+#: en/git-status.txt:195
#, priority:280
msgid "'M' = modified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:192
+#: en/git-status.txt:196
#, priority:280
msgid "'A' = added"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:193
+#: en/git-status.txt:197
#, priority:280
msgid "'D' = deleted"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:194
+#: en/git-status.txt:198
#, priority:280
msgid "'R' = renamed"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:195
+#: en/git-status.txt:199
#, priority:280
msgid "'C' = copied"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:196
+#: en/git-status.txt:200
#, priority:280
msgid "'U' = updated but unmerged"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:199
+#: en/git-status.txt:203
#, priority:280
msgid "Ignored files are not listed, unless `--ignored` option is in effect, in which case `XY` are `!!`."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:226
+#: en/git-status.txt:230
#, no-wrap, priority:280
msgid ""
"X Y Meaning\n"
@@ -46958,7 +47220,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:235
+#: en/git-status.txt:239
#, no-wrap, priority:280
msgid ""
"Submodules have more state and instead report\n"
@@ -46971,91 +47233,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:238
+#: en/git-status.txt:242
#, priority:280
msgid "'m' and '?' are applied recursively. For example if a nested submodule in a submodule contains an untracked file, this is reported as '?' as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:240
+#: en/git-status.txt:244
#, priority:280
msgid "If -b is used the short-format status is preceded by a line"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:242
+#: en/git-status.txt:246
#, no-wrap, priority:280
msgid " ## branchname tracking info\n"
msgstr ""
#. type: Title ~
-#: en/git-status.txt:244
+#: en/git-status.txt:248
#, no-wrap, priority:280
msgid "Porcelain Format Version 1"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:251
+#: en/git-status.txt:255
#, priority:280
msgid "Version 1 porcelain format is similar to the short format, but is guaranteed not to change in a backwards-incompatible way between Git versions or based on user configuration. This makes it ideal for parsing by scripts. The description of the short format above also describes the porcelain format, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:254
+#: en/git-status.txt:258
#, priority:280
msgid "The user's color.status configuration is not respected; color will always be off."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:257
+#: en/git-status.txt:261
#, priority:280
msgid "The user's status.relativePaths configuration is not respected; paths shown will always be relative to the repository root."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:267
+#: en/git-status.txt:271
#, priority:280
msgid "There is also an alternate -z format recommended for machine parsing. In that format, the status field is the same, but some other things change. First, the '\\->' is omitted from rename entries and the field order is reversed (e.g 'from \\-> to' becomes 'to from'). Second, a NUL (ASCII 0) follows each filename, replacing space as a field separator and the terminating newline (but a space still separates the status field from the first filename). Third, filenames containing special characters are not specially formatted; no quoting or backslash-escaping is performed."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:269
+#: en/git-status.txt:273
#, priority:280
msgid "Any submodule changes are reported as modified `M` instead of `m` or single `?`."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:271
+#: en/git-status.txt:275
#, no-wrap, priority:280
msgid "Porcelain Format Version 2"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:276
+#: en/git-status.txt:280
#, priority:280
msgid "Version 2 format adds more detailed information about the state of the worktree and changed items. Version 2 also defines an extensible set of easy to parse optional headers."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:280
+#: en/git-status.txt:284
#, priority:280
msgid "Header lines start with \"#\" and are added in response to specific command line arguments. Parsers should ignore headers they don't recognize."
msgstr ""
#. type: Title ^
-#: en/git-status.txt:282
+#: en/git-status.txt:286
#, no-wrap, priority:280
msgid "Branch Headers"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:286
+#: en/git-status.txt:290
#, priority:280
msgid "If `--branch` is given, a series of header lines are printed with information about the current branch."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:296
+#: en/git-status.txt:300
#, no-wrap, priority:280
msgid ""
"Line Notes\n"
@@ -47069,43 +47331,43 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:299
+#: en/git-status.txt:303
#, no-wrap, priority:280
msgid "Changed Tracked Entries"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:306
+#: en/git-status.txt:310
#, priority:280
msgid "Following the headers, a series of lines are printed for tracked entries. One of three different line formats may be used to describe an entry depending on the type of change. Tracked entries are printed in an undefined order; parsers should allow for a mixture of the 3 line types in any order."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:308
+#: en/git-status.txt:312
#, priority:280
msgid "Ordinary changed entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:310
+#: en/git-status.txt:314
#, no-wrap, priority:280
msgid " 1 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:312
+#: en/git-status.txt:316
#, priority:280
msgid "Renamed or copied entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:314
+#: en/git-status.txt:318
#, no-wrap, priority:280
msgid " 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:345
+#: en/git-status.txt:349
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47140,19 +47402,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:349
+#: en/git-status.txt:353
#, priority:280
msgid "Unmerged entries have the following format; the first character is a \"u\" to distinguish from ordinary changed entries."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:351
+#: en/git-status.txt:355
#, no-wrap, priority:280
msgid " u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:368
+#: en/git-status.txt:372
#, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47173,85 +47435,85 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:371
+#: en/git-status.txt:375
#, no-wrap, priority:280
msgid "Other Items"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:376
+#: en/git-status.txt:380
#, priority:280
msgid "Following the tracked entries (and if requested), a series of lines will be printed for untracked and then ignored items found in the worktree."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:378
+#: en/git-status.txt:382
#, priority:280
msgid "Untracked items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:380
+#: en/git-status.txt:384
#, no-wrap, priority:280
msgid " ? <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:382
+#: en/git-status.txt:386
#, priority:280
msgid "Ignored items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:384
+#: en/git-status.txt:388
#, no-wrap, priority:280
msgid " ! <path>\n"
msgstr ""
#. type: Title ^
-#: en/git-status.txt:386
+#: en/git-status.txt:390
#, no-wrap, priority:280
msgid "Pathname Format Notes and -z"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:391
+#: en/git-status.txt:395
#, priority:280
msgid "When the `-z` option is given, pathnames are printed as is and without any quoting and lines are terminated with a NUL (ASCII 0x00) byte."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:395
+#: en/git-status.txt:399
#, 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])."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:404
+#: en/git-status.txt:408
#, priority:280
msgid "The command honors `color.status` (or `status.color` -- they mean the same thing and the latter is kept for backward compatibility) and `color.status.<slot>` configuration variables to colorize its output."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:408
+#: en/git-status.txt:412
#, priority:280
msgid "If the config variable `status.relativePaths` is set to false, then all paths shown are relative to the repository root, not to the current directory."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:419
+#: en/git-status.txt:423
#, priority:280
msgid "If `status.submoduleSummary` is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). Please note that the summary output from the status command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings."
msgstr ""
#. type: Title -
-#: en/git-status.txt:421
+#: en/git-status.txt:425
#, no-wrap, priority:280
msgid "BACKGROUND REFRESH"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:432
+#: en/git-status.txt:436
#, priority:280
msgid "By default, `git status` will automatically refresh the index, updating the cached stat information from the working tree and writing out the result. Writing out the updated index is an optimization that isn't strictly necessary (`status` computes the values for itself, but writing them out is just to save subsequent programs from repeating our computation). When `status` is run in the background, the lock held during the write may conflict with other simultaneous processes, causing them to fail. Scripts running `status` in the background should consider using `git --no-optional-locks status` (see linkgit:git[1] for details)."
msgstr ""
@@ -47695,281 +47957,287 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:176
#, no-wrap, priority:220
-msgid "set-branch ((-d|--default)|(-b|--branch <branch>)) [--] <path>"
+msgid "set-branch (-b|--branch) <branch> [--] <path>"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-submodule.txt:177
+#, no-wrap, priority:220
+msgid "set-branch (-d|--default) [--] <path>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:181
+#: en/git-submodule.txt:182
#, priority:220
msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:182
+#: en/git-submodule.txt:183
#, ignore-ellipsis, no-wrap, priority:220
msgid "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:191
+#: en/git-submodule.txt:192
#, priority:220
msgid "Show commit summary between the given commit (defaults to HEAD) and working tree/index. For a submodule in question, a series of commits in the submodule between the given super project commit and the index or working tree (switched by `--cached`) are shown. If the option `--files` is given, show the series of commits in the submodule between the index of the super project and the working tree of the submodule (this option doesn't allow to use the `--cached` option or to provide an explicit commit)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:194
+#: en/git-submodule.txt:195
#, priority:220
msgid "Using the `--submodule=log` option with linkgit:git-diff[1] will provide that information too."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:195
+#: en/git-submodule.txt:196
#, no-wrap, priority:220
msgid "foreach [--recursive] <command>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:216
+#: en/git-submodule.txt:217
#, priority:220
msgid "Evaluates an arbitrary shell command in each checked out submodule. The command has access to the variables $name, $sm_path, $displaypath, $sha1 and $toplevel: $name is the name of the relevant submodule section in `.gitmodules`, $sm_path is the path of the submodule as recorded in the immediate superproject, $displaypath contains the relative path from the current working directory to the submodules root directory, $sha1 is the commit as recorded in the immediate superproject, and $toplevel is the absolute path to the top-level of the immediate superproject. Note that to avoid conflicts with '$PATH' on Windows, the '$path' variable is now a deprecated synonym of '$sm_path' variable. Any submodules defined in the superproject but not checked out are ignored by this command. Unless given `--quiet`, foreach prints the name of each submodule before evaluating the command. If `--recursive` is given, submodules are traversed recursively (i.e. the given shell command is evaluated in nested submodules as well). A non-zero return from the command in any submodule causes the processing to terminate. This can be overridden by adding '|| :' to the end of the command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:219
+#: en/git-submodule.txt:220
#, priority:220
msgid "As an example, the command below will show the path and currently checked out commit for each submodule:"
msgstr ""
#. type: delimited block -
-#: en/git-submodule.txt:222
+#: en/git-submodule.txt:223
#, no-wrap, priority:220
msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:224
+#: en/git-submodule.txt:225
#, ignore-ellipsis, no-wrap, priority:220
msgid "sync [--recursive] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:231
+#: en/git-submodule.txt:232
#, priority:220
msgid "Synchronizes submodules' remote URL configuration setting to the value specified in `.gitmodules`. It will only affect those submodules which already have a URL entry in .git/config (that is the case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:234
+#: en/git-submodule.txt:235
#, priority:220
msgid "`git submodule sync` synchronizes all submodules while `git submodule sync -- A` synchronizes submodule \"A\" only."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:237
+#: en/git-submodule.txt:238
#, priority:220
msgid "If `--recursive` is specified, this command will recurse into the registered submodules, and sync any nested submodules within."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:238
+#: en/git-submodule.txt:239
#, no-wrap, priority:220
msgid "absorbgitdirs"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:245
+#: en/git-submodule.txt:246
#, priority:220
msgid "If a git directory of a submodule is inside the submodule, move the git directory of the submodule into its superprojects `$GIT_DIR/modules` path and then connect the git directory and its working directory by setting the `core.worktree` and adding a .git file pointing to the git directory embedded in the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:249
+#: en/git-submodule.txt:250
#, priority:220
msgid "A repository that was cloned independently and later added as a submodule or old setups have the submodules git directory inside the submodule instead of embedded into the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:251
+#: en/git-submodule.txt:252
#, priority:220
msgid "This command is recursive by default."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:257
+#: en/git-submodule.txt:258
#, priority:220
msgid "Only print error messages."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:264
+#: en/git-submodule.txt:265
#, priority:220
msgid "This option is only valid for add and update commands. Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:268
+#: en/git-submodule.txt:269
#, priority:220
msgid "This option is only valid for the deinit command. Unregister all submodules in the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:269
+#: en/git-submodule.txt:270
#, no-wrap, priority:220
msgid "-b <branch>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:277
+#: en/git-submodule.txt:278
#, priority:220
msgid "Branch of repository to add as submodule. The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository. If the option is not specified, it defaults to 'master'."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:290
+#: en/git-submodule.txt:291
#, priority:220
msgid "This option is only valid for add, deinit and update commands. When running add, allow adding an otherwise ignored submodule path. When running deinit the submodule working trees will be removed even if they contain local changes. When running update (only effective with the checkout procedure), throw away local changes in submodules when switching to a different commit; and always run a checkout operation in the submodule, even if the commit listed in the index of the containing repository matches the commit checked out in the submodule."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:295
+#: en/git-submodule.txt:296
#, priority:220
msgid "This option is only valid for status and summary commands. These commands typically use the commit found in the submodule HEAD, but with this option, the commit stored in the index is used instead."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:296
+#: en/git-submodule.txt:297
#, ignore-same, no-wrap, priority:220
msgid "--files"
msgstr "--files"
#. type: Plain text
-#: en/git-submodule.txt:300
+#: en/git-submodule.txt:301
#, priority:220
msgid "This option is only valid for the summary command. This command compares the commit in the index with that in the submodule HEAD when this option is used."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:302
+#: en/git-submodule.txt:303
#, ignore-same, no-wrap, priority:220
msgid "--summary-limit"
msgstr "--summary-limit"
#. type: Plain text
-#: en/git-submodule.txt:308
+#: en/git-submodule.txt:309
#, priority:220
msgid "This option is only valid for the summary command. Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:309
+#: en/git-submodule.txt:310
#, ignore-same, no-wrap, priority:220
msgid "--remote"
msgstr "--remote"
#. type: Plain text
-#: en/git-submodule.txt:318
+#: en/git-submodule.txt:319
#, priority:220
msgid "This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:324
+#: en/git-submodule.txt:325
#, priority:220
msgid "This works for any of the supported update procedures (`--checkout`, `--rebase`, etc.). The only change is the source of the target SHA-1. For example, `submodule update --remote --merge` will merge upstream submodule changes into the submodules, while `submodule update --merge` will merge superproject gitlink changes into the submodules."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:329
+#: en/git-submodule.txt:330
#, priority:220
msgid "In order to ensure a current tracking branch state, `update --remote` fetches the submodule's remote repository before calculating the SHA-1. If you don't want to fetch, you should use `submodule update --remote --no-fetch`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:339
+#: en/git-submodule.txt:340
#, priority:220
msgid "Use this option to integrate changes from the upstream subproject with your submodule's current HEAD. Alternatively, you can run `git pull` from the submodule, which is equivalent except for the remote branch name: `update --remote` uses the default upstream repository and `submodule.<name>.branch`, while `git pull` uses the submodule's `branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want to distribute the default upstream branch with the superproject and `branch.<name>.merge` if you want a more native feel while working in the submodule itself."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:341
+#: en/git-submodule.txt:342
#, ignore-same, no-wrap, priority:220
msgid "--no-fetch"
msgstr "--no-fetch"
#. type: Plain text
-#: en/git-submodule.txt:344
+#: en/git-submodule.txt:345
#, priority:220
msgid "This option is only valid for the update command. Don't fetch new objects from the remote site."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:345
+#: en/git-submodule.txt:346
#, ignore-same, no-wrap, priority:220
msgid "--checkout"
msgstr "--checkout"
#. type: Plain text
-#: en/git-submodule.txt:353
+#: en/git-submodule.txt:354
#, priority:220
msgid "This option is only valid for the update command. Checkout the commit recorded in the superproject on a detached HEAD in the submodule. This is the default behavior, the main use of this option is to override `submodule.$name.update` when set to a value other than `checkout`. If the key `submodule.$name.update` is either not explicitly set or set to `checkout`, this option is implicit."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:363
+#: en/git-submodule.txt:364
#, priority:220
msgid "This option is only valid for the update command. Merge the commit recorded in the superproject into the current branch of the submodule. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve the resulting conflicts within the submodule with the usual conflict resolution tools. If the key `submodule.$name.update` is set to `merge`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:364
+#: en/git-submodule.txt:365
#, ignore-same, no-wrap, priority:220
msgid "--rebase"
msgstr "--rebase"
#. type: Plain text
-#: en/git-submodule.txt:372
+#: en/git-submodule.txt:373
#, priority:220
msgid "This option is only valid for the update command. Rebase the current branch onto the commit recorded in the superproject. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve these failures with linkgit:git-rebase[1]. If the key `submodule.$name.update` is set to `rebase`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:373
+#: en/git-submodule.txt:374
#, ignore-same, no-wrap, priority:220
msgid "--init"
msgstr "--init"
#. type: Plain text
-#: en/git-submodule.txt:377
+#: en/git-submodule.txt:378
#, priority:220
msgid "This option is only valid for the update command. Initialize all submodules for which \"git submodule init\" has not been called so far before updating."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:378
+#: en/git-submodule.txt:379
#, ignore-same, no-wrap, priority:220
msgid "--name"
msgstr "--name"
#. type: Plain text
-#: en/git-submodule.txt:382
+#: en/git-submodule.txt:383
#, priority:220
msgid "This option is only valid for the add command. It sets the submodule's name to the given string instead of defaulting to its path. The name must be valid as a directory name and may not end with a '/'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:383
+#: en/git-submodule.txt:384
#, no-wrap, priority:220
msgid "--reference <repository>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:387 en/git-submodule.txt:396
+#: en/git-submodule.txt:388 en/git-submodule.txt:397
#, priority:220
msgid "This option is only valid for add and update commands. These commands sometimes need to clone a remote repository. In this case, this option will be passed to the linkgit:git-clone[1] command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:391
+#: en/git-submodule.txt:392
#, no-wrap, priority:220
msgid ""
"*NOTE*: Do *not* use this option unless you have read the note\n"
@@ -47978,61 +48246,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:398
+#: en/git-submodule.txt:399
#, no-wrap, priority:220
msgid "*NOTE*: see the NOTE for the `--reference` option.\n"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:404
+#: en/git-submodule.txt:405
#, priority:220
msgid "This option is only valid for foreach, update, status and sync commands. Traverse submodules recursively. The operation is performed not only in the submodules of the current repo, but also in any nested submodules inside those submodules (and so on)."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:405
+#: en/git-submodule.txt:406
#, ignore-same, no-wrap, priority:220
msgid "--depth"
msgstr "--depth"
#. type: Plain text
-#: en/git-submodule.txt:409
+#: en/git-submodule.txt:410
#, priority:220
msgid "This option is valid for add and update commands. Create a 'shallow' clone with a history truncated to the specified number of revisions. See linkgit:git-clone[1]"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:410
+#: en/git-submodule.txt:411
#, ignore-same, no-wrap, priority:220
msgid "--[no-]recommend-shallow"
msgstr "--[no-]recommend-shallow"
#. type: Plain text
-#: en/git-submodule.txt:415
+#: en/git-submodule.txt:416
#, priority:220
msgid "This option is only valid for the update command. The initial clone of a submodule will use the recommended `submodule.<name>.shallow` as provided by the `.gitmodules` file by default. To ignore the suggestions use `--no-recommend-shallow`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:421
+#: en/git-submodule.txt:422
#, priority:220
msgid "This option is only valid for the update command. Clone new submodules in parallel with as many jobs. Defaults to the `submodule.fetchJobs` option."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:426
+#: en/git-submodule.txt:427
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:434
+#: en/git-submodule.txt:435
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:438
+#: en/git-submodule.txt:439
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -48664,7 +48932,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:889
+#: en/git-svn.txt:346 en/rev-list-options.txt:905
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -49477,7 +49745,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:777
#, priority:100
-msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider linkgit:git-filter-branch[1] instead. filter-branch also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
+msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports, and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider https://github.com/newren/git-filter-repo[git-filter-repo] instead. filter-repo also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
msgstr ""
#. type: Labeled list
@@ -51398,16 +51666,6 @@ msgid ""
"#\n"
msgstr ""
-#. type: delimited block -
-#: en/git.txt:310
-#, 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/git.txt:315
#, no-wrap, priority:100
@@ -55448,98 +55706,104 @@ msgstr ""
msgid "This option determines how the merge message will be cleaned up before commiting. See linkgit:git-commit[1] for more details. In addition, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on to the commit machinery in the case of a merge conflict."
msgstr ""
+#. type: Labeled list
+#: en/merge-options.txt:44
+#, ignore-same, no-wrap, priority:240
+msgid "--ff-only"
+msgstr "--ff-only"
+
#. type: Plain text
-#: en/merge-options.txt:46
+#: en/merge-options.txt:50
#, priority:240
-msgid "When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. This is the default behavior."
+msgid "Specifies how a merge is handled when the merged-in history is already a descendant of the current history. `--ff` is the default unless merging an annotated (and possibly signed) tag that is not stored in its natural place in the `refs/tags/` hierarchy, in which case `--no-ff` is assumed."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:52
+#: en/merge-options.txt:55
#, priority:240
-msgid "Create a merge commit even when the merge resolves as a fast-forward. This is the default behaviour when merging an annotated (and possibly signed) tag that is not stored in its natural place in 'refs/tags/' hierarchy."
+msgid "With `--ff`, when possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit."
msgstr ""
-#. type: Labeled list
-#: en/merge-options.txt:53
-#, ignore-same, no-wrap, priority:240
-msgid "--ff-only"
-msgstr "--ff-only"
+#. type: Plain text
+#: en/merge-options.txt:58
+#, priority:240
+msgid "With `--no-ff`, create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward."
+msgstr ""
#. type: Plain text
-#: en/merge-options.txt:57
+#: en/merge-options.txt:61
#, priority:240
-msgid "Refuse to merge and exit with a non-zero status unless the current `HEAD` is already up to date or the merge can be resolved as a fast-forward."
+msgid "With `--ff-only`, resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:63
+#: en/merge-options.txt:67
#, priority:240
msgid "GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:69
+#: en/merge-options.txt:73
#, priority:240
msgid "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also linkgit:git-fmt-merge-msg[1]."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:72
+#: en/merge-options.txt:76
#, priority:240
msgid "With --no-log do not list one-line descriptions from the actual commits being merged."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:74
+#: en/merge-options.txt:78
#, ignore-same, no-wrap, priority:240
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
-#: en/merge-options.txt:83
+#: en/merge-options.txt:87
#, priority:240
msgid "With --no-signoff do not add a Signed-off-by line."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:89
+#: en/merge-options.txt:93
#, priority:240
msgid "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:92
+#: en/merge-options.txt:96
#, priority:240
msgid "With -n or --no-stat do not show a diffstat at the end of the merge."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:93
+#: en/merge-options.txt:97
#, ignore-same, no-wrap, priority:240
msgid "--squash"
msgstr "--squash"
#. type: Labeled list
-#: en/merge-options.txt:94
+#: en/merge-options.txt:98
#, ignore-same, no-wrap, priority:240
msgid "--no-squash"
msgstr "--no-squash"
#. type: Plain text
-#: en/merge-options.txt:102
+#: en/merge-options.txt:106
#, priority:240
msgid "Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:105
+#: en/merge-options.txt:109
#, priority:240
msgid "With --no-squash perform the merge and commit the result. This option can be used to override --squash."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:107
+#: en/merge-options.txt:111
#, priority:240
msgid "With --squash, --commit is not allowed, and will fail."
msgstr ""
@@ -55547,71 +55811,77 @@ msgstr ""
#. type: Plain text
#: en/merge-options.txt:115
#, priority:240
+msgid "This option bypasses the pre-merge and commit-msg hooks. See also linkgit:githooks[5]."
+msgstr ""
+
+#. type: Plain text
+#: en/merge-options.txt:123
+#, priority:240
msgid "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise)."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:116
+#: en/merge-options.txt:124
#, no-wrap, priority:240
msgid "-X <option>"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:120
+#: en/merge-options.txt:128
#, priority:240
msgid "Pass merge strategy specific option through to the merge strategy."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:121
+#: en/merge-options.txt:129
#, ignore-same, no-wrap, priority:240
msgid "--verify-signatures"
msgstr "--verify-signatures"
#. type: Labeled list
-#: en/merge-options.txt:122
+#: en/merge-options.txt:130
#, ignore-same, no-wrap, priority:240
msgid "--no-verify-signatures"
msgstr "--no-verify-signatures"
#. type: Plain text
-#: en/merge-options.txt:128
+#: en/merge-options.txt:136
#, priority:240
msgid "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:130
+#: en/merge-options.txt:138
#, ignore-same, no-wrap, priority:240
msgid "--no-summary"
msgstr "--no-summary"
#. type: Plain text
-#: en/merge-options.txt:133
+#: en/merge-options.txt:141
#, priority:240
msgid "Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:138
+#: en/merge-options.txt:146
#, priority:240
msgid "Operate quietly. Implies --no-progress."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:149
+#: en/merge-options.txt:157
#, priority:240
msgid "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:152
+#: en/merge-options.txt:160
#, ignore-same, no-wrap, priority:240
msgid "--allow-unrelated-histories"
msgstr "--allow-unrelated-histories"
#. type: Plain text
-#: en/merge-options.txt:158
+#: en/merge-options.txt:166
#, priority:240
msgid "By default, `git merge` command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added."
msgstr ""
@@ -56934,7 +57204,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:215
#, priority:260
-msgid "minutes ago`}; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -59312,263 +59582,281 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:762
#, priority:260
+msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:771
+#, ignore-ellipsis, priority:260
+msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:775
+#, priority:260
+msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:778
+#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:779
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:766
+#: en/rev-list-options.txt:782
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:773
+#: en/rev-list-options.txt:789
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:781
+#: en/rev-list-options.txt:797
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:800
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:791
+#: en/rev-list-options.txt:807
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:793
+#: en/rev-list-options.txt:809
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:801
+#: en/rev-list-options.txt:817
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:802
+#: en/rev-list-options.txt:818
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:804
+#: en/rev-list-options.txt:820
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:822
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:812
+#: en/rev-list-options.txt:828
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:832
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:818
+#: en/rev-list-options.txt:834
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:819
+#: en/rev-list-options.txt:835
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:826
+#: en/rev-list-options.txt:842
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:847
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:833
+#: en/rev-list-options.txt:849
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:852
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:838
+#: en/rev-list-options.txt:854
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:839
+#: en/rev-list-options.txt:855
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:840
+#: en/rev-list-options.txt:856
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:859
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:846
+#: en/rev-list-options.txt:862
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:864
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:873
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:864
+#: en/rev-list-options.txt:880
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:868
+#: en/rev-list-options.txt:884
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:875
+#: en/rev-list-options.txt:891
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:894
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:880
+#: en/rev-list-options.txt:896
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:882
+#: en/rev-list-options.txt:898
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:884
+#: en/rev-list-options.txt:900
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:887
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:892
+#: en/rev-list-options.txt:908
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:909
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:896
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:898
+#: en/rev-list-options.txt:914
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:902
+#: en/rev-list-options.txt:918
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:907
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:925
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:932
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -59579,19 +59867,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:919
+#: en/rev-list-options.txt:935
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:922
+#: en/rev-list-options.txt:938
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:929
+#: en/rev-list-options.txt:945
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -59603,85 +59891,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:931
+#: en/rev-list-options.txt:947
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:937
+#: en/rev-list-options.txt:953
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:939
+#: en/rev-list-options.txt:955
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:942
+#: en/rev-list-options.txt:958
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:943
+#: en/rev-list-options.txt:959
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:949
+#: en/rev-list-options.txt:965
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:959
+#: en/rev-list-options.txt:975
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:963
+#: en/rev-list-options.txt:979
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:984
#, priority:260
msgid "Listed below are options that control the formatting of diff output. Some of them are specific to linkgit:git-rev-list[1], however other diff options may be given. See linkgit:git-diff-files[1] for more options."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:991
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:981
+#: en/rev-list-options.txt:997
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:1012
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1015
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1018
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.pot b/po/documentation.pot
index c35492b54cb499c4632821abd4346473d4a690d5..16a3d45b607e92b7b449433ad8fa0b78fe341caa 100644
--- a/po/documentation.pot
+++ b/po/documentation.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-08-27 18:53+0200\n"
+"POT-Creation-Date: 2019-12-08 16:35+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "-b"
msgstr ""
@@ -29,8 +29,8 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:319 en/git-fsck.txt:38 en/git-rebase.txt:471
-#, no-wrap, priority:100
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:321 en/git-fsck.txt:38 en/git-rebase.txt:493
+#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr ""
@@ -42,7 +42,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:9
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--show-stats"
msgstr ""
@@ -78,7 +78,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:198 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "-l"
msgstr ""
@@ -89,8 +89,8 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1000
-#, no-wrap, priority:260
+#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1016
+#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr ""
@@ -125,14 +125,14 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:433 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
-#, no-wrap, priority:300
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr ""
#. type: Labeled list
#: en/blame-options.txt:40 en/git-commit.txt:113 en/git-push.txt:176 en/git-worktree.txt:179
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--porcelain"
msgstr ""
@@ -144,7 +144,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:43
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--line-porcelain"
msgstr ""
@@ -156,7 +156,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:48 en/git-pack-objects.txt:138 en/git-svn.txt:373
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--incremental"
msgstr ""
@@ -204,7 +204,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:73 en/git-fsck.txt:100
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]progress"
msgstr ""
@@ -276,7 +276,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "-h"
msgstr ""
@@ -288,7 +288,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:1 en/git-blame.txt:233
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-annotate[1]"
msgstr ""
@@ -300,7 +300,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:4 en/git-annotate.txt:30
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-blame[1]"
msgstr ""
@@ -312,7 +312,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-count-objects[1]"
msgstr ""
@@ -324,7 +324,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:10
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-difftool[1]"
msgstr ""
@@ -336,7 +336,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:13
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fsck[1]"
msgstr ""
@@ -348,7 +348,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:16
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-help[1]"
msgstr ""
@@ -360,7 +360,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:19
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-instaweb[1]"
msgstr ""
@@ -372,7 +372,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:22
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-tree[1]"
msgstr ""
@@ -384,7 +384,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:25
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rerere[1]"
msgstr ""
@@ -396,7 +396,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:28
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-branch[1]"
msgstr ""
@@ -408,7 +408,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:31
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-commit[1]"
msgstr ""
@@ -420,7 +420,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:34
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-tag[1]"
msgstr ""
@@ -432,7 +432,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:37
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-whatchanged[1]"
msgstr ""
@@ -444,7 +444,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitweb[1]"
msgstr ""
@@ -456,7 +456,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:1 en/git-difftool.txt:144
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-config[1]"
msgstr ""
@@ -467,8 +467,8 @@ msgid "Get and set repository or global options."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1528
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-export[1]"
msgstr ""
@@ -479,8 +479,8 @@ msgid "Git data exporter."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:243
-#, no-wrap, priority:100
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-import[1]"
msgstr ""
@@ -492,7 +492,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:10
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-filter-branch[1]"
msgstr ""
@@ -504,7 +504,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:13 en/git-difftool.txt:141
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-mergetool[1]"
msgstr ""
@@ -516,7 +516,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:16
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-pack-refs[1]"
msgstr ""
@@ -528,7 +528,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:19
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-prune[1]"
msgstr ""
@@ -540,7 +540,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:22
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-reflog[1]"
msgstr ""
@@ -552,7 +552,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:25
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-remote[1]"
msgstr ""
@@ -564,7 +564,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:28
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-repack[1]"
msgstr ""
@@ -576,7 +576,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:31
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-replace[1]"
msgstr ""
@@ -588,7 +588,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:1
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-archimport[1]"
msgstr ""
@@ -600,7 +600,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:4
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-cvsexportcommit[1]"
msgstr ""
@@ -612,7 +612,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:7
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-cvsimport[1]"
msgstr ""
@@ -624,7 +624,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:10
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-cvsserver[1]"
msgstr ""
@@ -636,7 +636,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:13
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-imap-send[1]"
msgstr ""
@@ -648,7 +648,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:16
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-p4[1]"
msgstr ""
@@ -660,7 +660,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:19
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-quiltimport[1]"
msgstr ""
@@ -672,7 +672,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:22
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-request-pull[1]"
msgstr ""
@@ -684,7 +684,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:25
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-send-email[1]"
msgstr ""
@@ -696,7 +696,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:28
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-svn[1]"
msgstr ""
@@ -708,7 +708,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "linkgit:git-add[1]"
msgstr ""
@@ -720,7 +720,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:4
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-am[1]"
msgstr ""
@@ -732,7 +732,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:7
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-archive[1]"
msgstr ""
@@ -744,7 +744,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:10
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-bisect[1]"
msgstr ""
@@ -756,7 +756,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:13
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-branch[1]"
msgstr ""
@@ -768,7 +768,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:16
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-bundle[1]"
msgstr ""
@@ -780,7 +780,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:19
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-checkout[1]"
msgstr ""
@@ -792,7 +792,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:22 en/git-revert.txt:139
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-cherry-pick[1]"
msgstr ""
@@ -804,7 +804,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:25
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-citool[1]"
msgstr ""
@@ -816,7 +816,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:28
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-clean[1]"
msgstr ""
@@ -828,7 +828,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:31
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-clone[1]"
msgstr ""
@@ -840,7 +840,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:34
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-commit[1]"
msgstr ""
@@ -852,7 +852,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:37
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-describe[1]"
msgstr ""
@@ -864,7 +864,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:138
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-diff[1]"
msgstr ""
@@ -876,7 +876,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:43 en/git-fetch-pack.txt:129
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fetch[1]"
msgstr ""
@@ -888,7 +888,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:46
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-format-patch[1]"
msgstr ""
@@ -900,7 +900,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:49
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-gc[1]"
msgstr ""
@@ -912,7 +912,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:52
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-grep[1]"
msgstr ""
@@ -924,7 +924,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:55
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-gui[1]"
msgstr ""
@@ -936,7 +936,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:58
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-init[1]"
msgstr ""
@@ -948,7 +948,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:61
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-log[1]"
msgstr ""
@@ -960,7 +960,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:64 en/git-fmt-merge-msg.txt:75
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge[1]"
msgstr ""
@@ -972,7 +972,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:67
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-mv[1]"
msgstr ""
@@ -984,7 +984,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:70
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-notes[1]"
msgstr ""
@@ -996,7 +996,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:73 en/git-fetch.txt:296
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "linkgit:git-pull[1]"
msgstr ""
@@ -1008,7 +1008,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:76
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-push[1]"
msgstr ""
@@ -1020,7 +1020,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:79
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-range-diff[1]"
msgstr ""
@@ -1032,7 +1032,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:82 en/git-svn.txt:1171
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rebase[1]"
msgstr ""
@@ -1044,7 +1044,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:85
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-reset[1]"
msgstr ""
@@ -1056,7 +1056,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:88
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-restore[1]"
msgstr ""
@@ -1068,7 +1068,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:91 en/git-cherry-pick.txt:240
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-revert[1]"
msgstr ""
@@ -1080,7 +1080,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:94
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rm[1]"
msgstr ""
@@ -1092,7 +1092,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:97
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-shortlog[1]"
msgstr ""
@@ -1104,7 +1104,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:100
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show[1]"
msgstr ""
@@ -1116,7 +1116,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stash[1]"
msgstr ""
@@ -1128,7 +1128,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:106
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-status[1]"
msgstr ""
@@ -1140,7 +1140,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:109
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-submodule[1]"
msgstr ""
@@ -1152,7 +1152,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:112
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-switch[1]"
msgstr ""
@@ -1164,7 +1164,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:115
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-tag[1]"
msgstr ""
@@ -1176,7 +1176,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:118
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-worktree[1]"
msgstr ""
@@ -1188,7 +1188,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitk[1]"
msgstr ""
@@ -1200,7 +1200,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:1
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-cat-file[1]"
msgstr ""
@@ -1212,7 +1212,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:4
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-cherry[1]"
msgstr ""
@@ -1224,7 +1224,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:7
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-diff-files[1]"
msgstr ""
@@ -1236,7 +1236,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:10
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-diff-index[1]"
msgstr ""
@@ -1248,7 +1248,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:13
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-diff-tree[1]"
msgstr ""
@@ -1260,7 +1260,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:16
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-for-each-ref[1]"
msgstr ""
@@ -1272,7 +1272,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:19
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-get-tar-commit-id[1]"
msgstr ""
@@ -1284,7 +1284,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:22
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-ls-files[1]"
msgstr ""
@@ -1296,7 +1296,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:25
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-ls-remote[1]"
msgstr ""
@@ -1308,7 +1308,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:28
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-ls-tree[1]"
msgstr ""
@@ -1320,7 +1320,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:31
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-base[1]"
msgstr ""
@@ -1332,7 +1332,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:34
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-name-rev[1]"
msgstr ""
@@ -1344,7 +1344,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:37
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-pack-redundant[1]"
msgstr ""
@@ -1356,7 +1356,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:40
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rev-list[1]"
msgstr ""
@@ -1368,7 +1368,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:43
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rev-parse[1]"
msgstr ""
@@ -1380,7 +1380,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:46
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-index[1]"
msgstr ""
@@ -1392,7 +1392,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:49 en/git-for-each-ref.txt:391
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-ref[1]"
msgstr ""
@@ -1404,7 +1404,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:52
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-unpack-file[1]"
msgstr ""
@@ -1416,7 +1416,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:55
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-var[1]"
msgstr ""
@@ -1428,7 +1428,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:58
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-pack[1]"
msgstr ""
@@ -1440,7 +1440,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:1
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-apply[1]"
msgstr ""
@@ -1452,7 +1452,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:4
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-checkout-index[1]"
msgstr ""
@@ -1464,7 +1464,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:7
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-commit-graph[1]"
msgstr ""
@@ -1476,7 +1476,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:10
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-commit-tree[1]"
msgstr ""
@@ -1488,7 +1488,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:13
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-hash-object[1]"
msgstr ""
@@ -1500,7 +1500,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:16
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-index-pack[1]"
msgstr ""
@@ -1512,7 +1512,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:19
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-file[1]"
msgstr ""
@@ -1524,7 +1524,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:22
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-index[1]"
msgstr ""
@@ -1536,7 +1536,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:25
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-mktag[1]"
msgstr ""
@@ -1548,7 +1548,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:28
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-mktree[1]"
msgstr ""
@@ -1560,7 +1560,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:31
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-multi-pack-index[1]"
msgstr ""
@@ -1572,7 +1572,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:34
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-pack-objects[1]"
msgstr ""
@@ -1584,7 +1584,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:37
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-prune-packed[1]"
msgstr ""
@@ -1596,7 +1596,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:40
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-read-tree[1]"
msgstr ""
@@ -1608,7 +1608,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:43
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-symbolic-ref[1]"
msgstr ""
@@ -1620,7 +1620,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:46
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-unpack-objects[1]"
msgstr ""
@@ -1632,7 +1632,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:49
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-update-index[1]"
msgstr ""
@@ -1644,7 +1644,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:52
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-update-ref[1]"
msgstr ""
@@ -1656,7 +1656,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:120
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-write-tree[1]"
msgstr ""
@@ -1668,7 +1668,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:1
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-check-attr[1]"
msgstr ""
@@ -1680,7 +1680,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:4
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-check-ignore[1]"
msgstr ""
@@ -1692,7 +1692,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:7
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-check-mailmap[1]"
msgstr ""
@@ -1704,7 +1704,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:10
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-check-ref-format[1]"
msgstr ""
@@ -1716,7 +1716,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:13
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-column[1]"
msgstr ""
@@ -1728,7 +1728,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:16
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-credential[1]"
msgstr ""
@@ -1740,7 +1740,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:19
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-credential-cache[1]"
msgstr ""
@@ -1752,7 +1752,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:22
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-credential-store[1]"
msgstr ""
@@ -1764,7 +1764,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:25
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fmt-merge-msg[1]"
msgstr ""
@@ -1776,7 +1776,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:28
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-interpret-trailers[1]"
msgstr ""
@@ -1788,7 +1788,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:31
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-mailinfo[1]"
msgstr ""
@@ -1800,7 +1800,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:34
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-mailsplit[1]"
msgstr ""
@@ -1812,7 +1812,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:37
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-one-file[1]"
msgstr ""
@@ -1824,7 +1824,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-purehelpers.txt:40 en/git-cherry.txt:142
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-patch-id[1]"
msgstr ""
@@ -1836,7 +1836,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:43
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-sh-i18n[1]"
msgstr ""
@@ -1848,7 +1848,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:46
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-sh-setup[1]"
msgstr ""
@@ -1860,7 +1860,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:49
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stripspace[1]"
msgstr ""
@@ -1872,7 +1872,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:1
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-http-fetch[1]"
msgstr ""
@@ -1884,7 +1884,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:4
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-http-push[1]"
msgstr ""
@@ -1896,7 +1896,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:7
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-parse-remote[1]"
msgstr ""
@@ -1908,7 +1908,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:10
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-receive-pack[1]"
msgstr ""
@@ -1920,7 +1920,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:13
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-shell[1]"
msgstr ""
@@ -1932,7 +1932,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:16
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-upload-archive[1]"
msgstr ""
@@ -1944,7 +1944,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:19
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-upload-pack[1]"
msgstr ""
@@ -1956,7 +1956,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:1
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-daemon[1]"
msgstr ""
@@ -1968,7 +1968,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:4
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fetch-pack[1]"
msgstr ""
@@ -1980,7 +1980,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:7
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-http-backend[1]"
msgstr ""
@@ -1992,7 +1992,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:10
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-send-pack[1]"
msgstr ""
@@ -2004,7 +2004,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:13
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-update-server-info[1]"
msgstr ""
@@ -2142,7 +2142,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:113
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`gitdir`"
msgstr ""
@@ -2208,7 +2208,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:147
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`onbranch`"
msgstr ""
@@ -2260,95 +2260,95 @@ msgstr ""
msgid "Example"
msgstr ""
-#. type: Plain text
-#: en/config.txt:185
+#. type: delimited block -
+#: en/config.txt:186
#, no-wrap, priority:100
msgid ""
-"\t# Core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"# Core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:190
+#. type: delimited block -
+#: en/config.txt:191
#, no-wrap, priority:100
msgid ""
-"\t# Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"# Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:194
+#. type: delimited block -
+#: en/config.txt:195
#, no-wrap, priority:100
msgid ""
-"\t[branch \"devel\"]\n"
-"\t\tremote = origin\n"
-"\t\tmerge = refs/heads/devel\n"
+"[branch \"devel\"]\n"
+"\tremote = origin\n"
+"\tmerge = refs/heads/devel\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:199
+#. type: delimited block -
+#: en/config.txt:200
#, no-wrap, priority:100
msgid ""
-"\t# Proxy settings\n"
-"\t[core]\n"
-"\t\tgitProxy=\"ssh\" for \"kernel.org\"\n"
-"\t\tgitProxy=default-proxy ; for the rest\n"
+"# Proxy settings\n"
+"[core]\n"
+"\tgitProxy=\"ssh\" for \"kernel.org\"\n"
+"\tgitProxy=default-proxy ; for the rest\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:204
+#. type: delimited block -
+#: en/config.txt:205
#, no-wrap, priority:100
msgid ""
-"\t[include]\n"
-"\t\tpath = /path/to/foo.inc ; include by absolute path\n"
-"\t\tpath = foo.inc ; find \"foo.inc\" relative to the current file\n"
-"\t\tpath = ~/foo.inc ; find \"foo.inc\" in your `$HOME` directory\n"
+"[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: Plain text
-#: en/config.txt:208
+#. type: delimited block -
+#: en/config.txt:209
#, no-wrap, priority:100
msgid ""
-"\t; include if $GIT_DIR is /path/to/foo/.git\n"
-"\t[includeIf \"gitdir:/path/to/foo/.git\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; 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: Plain text
-#: en/config.txt:212
+#. type: delimited block -
+#: en/config.txt:213
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside /path/to/group\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside /path/to/group\n"
+"[includeIf \"gitdir:/path/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:216
+#. type: delimited block -
+#: en/config.txt:217
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside $HOME/to/group\n"
-"\t[includeIf \"gitdir:~/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside $HOME/to/group\n"
+"[includeIf \"gitdir:~/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:222
+#. type: delimited block -
+#: en/config.txt:223
#, no-wrap, priority:100
msgid ""
-"\t; relative paths are always relative to the including\n"
-"\t; file (if the condition is true); their location is not\n"
-"\t; affected by the condition\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = foo.inc\n"
+"; 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:227
+#: en/config.txt:229
#, no-wrap, priority:100
msgid ""
"\t; include only if we are in a worktree where foo-branch is\n"
@@ -2358,43 +2358,43 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/config.txt:229
+#: en/config.txt:231
#, no-wrap, priority:100
msgid "Values"
msgstr ""
#. type: Plain text
-#: en/config.txt:234
+#: 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:235
+#: en/config.txt:237
#, no-wrap, priority:100
msgid "boolean"
msgstr ""
#. type: Plain text
-#: en/config.txt:240
+#: 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:241
+#: en/config.txt:243
#, no-wrap, priority:100
msgid "true"
msgstr ""
#. type: Plain text
-#: en/config.txt:242
+#: en/config.txt:244
#, priority:100
msgid "Boolean true literals are `yes`, `on`, `true`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:244
+#: en/config.txt:246
#, no-wrap, priority:100
msgid ""
"and `1`. Also, a variable defined without `= <value>`\n"
@@ -2402,116 +2402,116 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/config.txt:245
+#: en/config.txt:247
#, no-wrap, priority:100
msgid "false"
msgstr ""
#. type: Plain text
-#: en/config.txt:246
+#: en/config.txt:248
#, priority:100
msgid "Boolean false literals are `no`, `off`, `false`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:247
+#: en/config.txt:249
#, no-wrap, priority:100
msgid "`0` and the empty string.\n"
msgstr ""
#. type: Plain text
-#: en/config.txt:251
+#: 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:252
+#: en/config.txt:254
#, no-wrap, priority:100
msgid "integer"
msgstr ""
#. type: Plain text
-#: en/config.txt:256
-#, priority:100
+#: 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:257 en/diff-options.txt:356 en/git-for-each-ref.txt:177
+#: 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 ""
#. type: Plain text
-#: en/config.txt:261
+#: 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:265
+#: en/config.txt:267
#, 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."
msgstr ""
#. type: Plain text
-#: en/config.txt:270
+#: en/config.txt:272
#, 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:277
+#: en/config.txt:279
#, 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:280
+#: en/config.txt:282
#, 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:289
+#: en/config.txt:291
#, 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:290
+#: en/config.txt:292
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:296
+#: en/config.txt:298
#, 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:299 en/git-imap-send.txt:58
+#: en/config.txt:301 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:304
+#: en/config.txt:306
#, 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:309
+#: en/config.txt:311
#, 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
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.conflictStyle"
msgstr ""
@@ -2523,7 +2523,7 @@ msgstr ""
#. type: Labeled list
#: en/config/merge.txt:9
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.defaultToUpstream"
msgstr ""
@@ -2535,7 +2535,7 @@ msgstr ""
#. type: Labeled list
#: en/config/merge.txt:19
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.ff"
msgstr ""
@@ -2547,7 +2547,7 @@ msgstr ""
#. type: Labeled list
#: en/config/merge.txt:29
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.verifySignatures"
msgstr ""
@@ -2559,7 +2559,7 @@ msgstr ""
#. type: Labeled list
#: en/config/merge.txt:35
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.renameLimit"
msgstr ""
@@ -2571,7 +2571,7 @@ msgstr ""
#. type: Labeled list
#: en/config/merge.txt:41
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.renames"
msgstr ""
@@ -2583,7 +2583,7 @@ msgstr ""
#. type: Labeled list
#: en/config/merge.txt:46
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.directoryRenames"
msgstr ""
@@ -2595,7 +2595,7 @@ msgstr ""
#. type: Labeled list
#: en/config/merge.txt:59
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.renormalize"
msgstr ""
@@ -2607,7 +2607,7 @@ msgstr ""
#. type: Labeled list
#: en/config/merge.txt:69
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.stat"
msgstr ""
@@ -2619,7 +2619,7 @@ msgstr ""
#. type: Labeled list
#: en/config/merge.txt:73
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.tool"
msgstr ""
@@ -2631,7 +2631,7 @@ msgstr ""
#. type: Labeled list
#: en/config/merge.txt:79
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.guitool"
msgstr ""
@@ -2643,7 +2643,7 @@ msgstr ""
#. type: Labeled list
#: en/config/merge.txt:87
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.verbosity"
msgstr ""
@@ -2691,7 +2691,7 @@ msgstr ""
#. type: Labeled list
#: en/config/fmt-merge-msg.txt:1
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.branchdesc"
msgstr ""
@@ -2703,7 +2703,7 @@ msgstr ""
#. type: Labeled list
#: en/config/fmt-merge-msg.txt:6
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "merge.log"
msgstr ""
@@ -2823,7 +2823,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-format.txt:16
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]"
msgstr ""
@@ -2835,7 +2835,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-format.txt:19
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "git-diff-files [<pattern>...]"
msgstr ""
@@ -3242,53 +3242,53 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
#, no-wrap, priority:260
-msgid "Generating patches with -p"
+msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:10
+#: en/diff-generate-patch.txt:14
#, priority:260
-msgid "When \"git-diff-index\", \"git-diff-tree\", or \"git-diff-files\" are run with a `-p` option, \"git diff\" without the `--raw` option, or \"git log\" with the \"-p\" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
+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:13
+#: 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:15
+#: 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:17
+#: 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:21
+#: 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:25
+#: 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:27
+#: 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:39
+#: en/diff-generate-patch.txt:43
#, no-wrap, priority:260
msgid ""
"old mode <mode>\n"
@@ -3305,43 +3305,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:42
+#: 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:44
+#: 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:51
+#: 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:55
+#: en/diff-generate-patch.txt:59
#, priority:260
-msgid "The index line includes the SHA-1 checksum 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."
+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:59
+#: 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:64
+#: 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:71
+#: en/diff-generate-patch.txt:75
#, no-wrap, priority:260
msgid ""
"diff --git a/a b/b\n"
@@ -3353,25 +3353,25 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/diff-generate-patch.txt:74
+#: en/diff-generate-patch.txt:78
#, no-wrap, priority:260
-msgid "combined diff format"
+msgid "Combined diff format"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:82
+#: 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:84
+#: en/diff-generate-patch.txt:88
#, priority:260
-msgid "A 'combined diff' format looks like this:"
+msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:93
+#: en/diff-generate-patch.txt:97
#, no-wrap, priority:260
msgid ""
"diff --combined describe.c\n"
@@ -3384,7 +3384,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:103
+#: en/diff-generate-patch.txt:107
#, no-wrap, priority:260
msgid ""
"- static void describe(char *arg)\n"
@@ -3399,7 +3399,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:113
+#: en/diff-generate-patch.txt:117
#, no-wrap, priority:260
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
@@ -3414,37 +3414,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:117
+#: en/diff-generate-patch.txt:121
#, priority:260
-msgid "It is preceded with a \"git diff\" header, that looks like this (when `-c` option is used):"
+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:119
+#: en/diff-generate-patch.txt:123
#, no-wrap, priority:260
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:121
+#: en/diff-generate-patch.txt:125
#, priority:260
-msgid "or like this (when `--cc` option is used):"
+msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:123
+#: en/diff-generate-patch.txt:127
#, no-wrap, priority:260
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:126
+#: 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:131
+#: en/diff-generate-patch.txt:135
#, no-wrap, priority:260
msgid ""
"index <hash>,<hash>..<hash>\n"
@@ -3454,92 +3454,92 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:137
+#: 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:139
+#: 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:141 en/diff-generate-patch.txt:152 en/diff-generate-patch.txt:153 en/diff-generate-patch.txt:154
+#: 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:142 en/diff-generate-patch.txt:155
+#: 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:146
+#: 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:150
+#: 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:159
+#: 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:165
+#: 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 for apply. The change is similar to the change in the extended 'index' header:"
+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:167
+#: 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:170
+#: 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:179
-#, priority:260
+#: 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:185
+#: 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:191
+#: 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:197
+#: 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:327 en/merge-options.txt:86
-#, no-wrap, priority:280
+#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
+#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr ""
@@ -3550,14 +3550,14 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:186 en/git-add.txt:111 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
-#, no-wrap, priority:300
+#: en/diff-options.txt:23 en/fetch-options.txt:198 en/git-add.txt:111 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
+#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:24 en/git-add.txt:89 en/git-checkout.txt:269 en/git-commit.txt:71 en/git-restore.txt:47
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr ""
@@ -3574,14 +3574,14 @@ msgid "\tThis is the default.\n"
msgstr ""
#. 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:117 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
-#, no-wrap, priority:300
+#: 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:118 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 ""
#. type: Labeled list
#: en/diff-options.txt:31
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--no-patch"
msgstr ""
@@ -3653,7 +3653,7 @@ 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
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--raw"
msgstr ""
@@ -3676,7 +3676,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:72
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--patch-with-raw"
msgstr ""
@@ -3688,7 +3688,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:76
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--indent-heuristic"
msgstr ""
@@ -3700,7 +3700,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:80
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--no-indent-heuristic"
msgstr ""
@@ -3712,7 +3712,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:83
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--minimal"
msgstr ""
@@ -3724,7 +3724,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:87
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--patience"
msgstr ""
@@ -3736,7 +3736,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:90
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--histogram"
msgstr ""
@@ -3786,7 +3786,7 @@ msgstr ""
#: en/diff-options.txt:107
#, ignore-same, no-wrap, priority:280
msgid "`default`, `myers`"
-msgstr "`default`, `myers`"
+msgstr ""
#. type: Plain text
#: en/diff-options.txt:109
@@ -3796,13 +3796,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:109
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "`minimal`"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:112
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "`patience`"
msgstr ""
@@ -3814,7 +3814,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:114
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "`histogram`"
msgstr ""
@@ -3838,7 +3838,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:137
-#, priority:280
+#, 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 ""
@@ -3850,7 +3850,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:141
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--compact-summary"
msgstr ""
@@ -3862,7 +3862,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:149 en/git-apply.txt:45
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--numstat"
msgstr ""
@@ -3874,7 +3874,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:156
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--shortstat"
msgstr ""
@@ -3886,13 +3886,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:161
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "-X[<param1,param2,...>]"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:162
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "--dirstat[=<param1,param2,...>]"
msgstr ""
@@ -3904,7 +3904,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:171
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "`changes`"
msgstr ""
@@ -3916,7 +3916,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:177
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "`lines`"
msgstr ""
@@ -3928,7 +3928,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:185
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "`files`"
msgstr ""
@@ -3940,7 +3940,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:190
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "`cumulative`"
msgstr ""
@@ -3970,7 +3970,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:206
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--cumulative"
msgstr ""
@@ -3982,19 +3982,19 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:209
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "--dirstat-by-file[=<param1,param2>...]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:211
-#, priority:280
+#, ignore-ellipsis, priority:280
msgid "Synonym for --dirstat=files,param1,param2..."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:129
-#, no-wrap, priority:280
+#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:137
+#, ignore-same, no-wrap, priority:280
msgid "--summary"
msgstr ""
@@ -4006,7 +4006,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:217
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--patch-with-stat"
msgstr ""
@@ -4017,8 +4017,8 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:122 en/git-update-index.txt:168
-#, no-wrap, priority:280
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:168
+#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr ""
@@ -4050,7 +4050,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:188 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr ""
@@ -4062,7 +4062,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:242 en/git-ls-tree.txt:60
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--name-status"
msgstr ""
@@ -4106,7 +4106,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:225 en/git-show-branch.txt:124
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--no-color"
msgstr ""
@@ -4159,7 +4159,7 @@ msgstr ""
#: en/diff-options.txt:284 en/diff-options.txt:326
#, ignore-same, no-wrap, priority:280
msgid "no"
-msgstr "no"
+msgstr ""
#. type: Plain text
#: en/diff-options.txt:286
@@ -4171,7 +4171,7 @@ msgstr ""
#: en/diff-options.txt:286 en/git-commit.txt:211
#, ignore-same, no-wrap, priority:280
msgid "default"
-msgstr "default"
+msgstr ""
#. type: Plain text
#: en/diff-options.txt:289
@@ -4183,7 +4183,7 @@ msgstr ""
#: en/diff-options.txt:289 en/diff-options.txt:358
#, ignore-same, no-wrap, priority:280
msgid "plain"
-msgstr "plain"
+msgstr ""
#. type: Plain text
#: en/diff-options.txt:296
@@ -4195,7 +4195,7 @@ msgstr ""
#: en/diff-options.txt:296
#, ignore-same, no-wrap, priority:280
msgid "blocks"
-msgstr "blocks"
+msgstr ""
#. type: Plain text
#: en/diff-options.txt:301
@@ -4207,7 +4207,7 @@ msgstr ""
#: en/diff-options.txt:301
#, ignore-same, no-wrap, priority:280
msgid "zebra"
-msgstr "zebra"
+msgstr ""
#. type: Plain text
#: en/diff-options.txt:306
@@ -4219,7 +4219,7 @@ msgstr ""
#: en/diff-options.txt:306
#, ignore-same, no-wrap, priority:280
msgid "dimmed-zebra"
-msgstr "dimmed-zebra"
+msgstr ""
#. type: Plain text
#: en/diff-options.txt:311
@@ -4229,7 +4229,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:313
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--no-color-moved"
msgstr ""
@@ -4273,7 +4273,7 @@ msgstr ""
#: en/diff-options.txt:328 en/merge-strategies.txt:61
#, ignore-same, no-wrap, priority:280
msgid "ignore-space-at-eol"
-msgstr "ignore-space-at-eol"
+msgstr ""
#. type: Plain text
#: en/diff-options.txt:330 en/diff-options.txt:665
@@ -4285,7 +4285,7 @@ msgstr ""
#: en/diff-options.txt:330 en/merge-strategies.txt:59
#, ignore-same, no-wrap, priority:280
msgid "ignore-space-change"
-msgstr "ignore-space-change"
+msgstr ""
#. type: Plain text
#: en/diff-options.txt:334 en/diff-options.txt:671
@@ -4297,7 +4297,7 @@ msgstr ""
#: en/diff-options.txt:334 en/merge-strategies.txt:60
#, ignore-same, no-wrap, priority:280
msgid "ignore-all-space"
-msgstr "ignore-all-space"
+msgstr ""
#. type: Plain text
#: en/diff-options.txt:337
@@ -4309,7 +4309,7 @@ msgstr ""
#: en/diff-options.txt:337
#, ignore-same, no-wrap, priority:280
msgid "allow-indentation-change"
-msgstr "allow-indentation-change"
+msgstr ""
#. type: Plain text
#: en/diff-options.txt:342
@@ -4319,7 +4319,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:344
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--no-color-moved-ws"
msgstr ""
@@ -4357,7 +4357,7 @@ msgstr ""
#: en/diff-options.txt:362
#, ignore-same, no-wrap, priority:280
msgid "porcelain"
-msgstr "porcelain"
+msgstr ""
#. type: Plain text
#: en/diff-options.txt:369
@@ -4369,7 +4369,7 @@ msgstr ""
#: en/diff-options.txt:369 en/git-daemon.txt:131 en/git-submodule.txt:167
#, ignore-same, no-wrap, priority:280
msgid "none"
-msgstr "none"
+msgstr ""
#. type: Plain text
#: en/diff-options.txt:371
@@ -4426,8 +4426,8 @@ msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:402 en/git-status.txt:139
-#, no-wrap, priority:280
+#: en/diff-options.txt:402 en/git-status.txt:143
+#, ignore-same, no-wrap, priority:280
msgid "--no-renames"
msgstr ""
@@ -4439,7 +4439,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:406
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--[no-]rename-empty"
msgstr ""
@@ -4451,7 +4451,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:410 en/git-apply.txt:58
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--check"
msgstr ""
@@ -4475,7 +4475,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:432
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--full-index"
msgstr ""
@@ -4487,7 +4487,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:437 en/git-apply.txt:160
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--binary"
msgstr ""
@@ -4530,7 +4530,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:463
#, priority:280
-msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
+msgid "It affects the way a change that amounts to a total rewrite of a file does not appear as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
msgstr ""
#. type: Plain text
@@ -4546,7 +4546,7 @@ msgid "-M[<n>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:473 en/git-status.txt:143
+#: en/diff-options.txt:473 en/git-status.txt:147
#, no-wrap, priority:280
msgid "--find-renames[=<n>]"
msgstr ""
@@ -4601,7 +4601,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:497 en/git-svn.txt:626
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--find-copies-harder"
msgstr ""
@@ -4619,7 +4619,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:507
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--irreversible-delete"
msgstr ""
@@ -4649,13 +4649,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:527
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:538
-#, priority:280
+#, ignore-ellipsis, priority:280
msgid "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."
msgstr ""
@@ -4715,7 +4715,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-options.txt:573
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
"...\n"
@@ -4760,7 +4760,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:594
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--pickaxe-all"
msgstr ""
@@ -4772,7 +4772,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:599
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--pickaxe-regex"
msgstr ""
@@ -4856,13 +4856,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:64 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-tag.txt:60
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "-a"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:657 en/git-grep.txt:102
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--text"
msgstr ""
@@ -4874,7 +4874,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:660
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-cr-at-eol"
msgstr ""
@@ -4886,25 +4886,25 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:663
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-space-at-eol"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-space-change"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:134 en/git-hash-object.txt:29 en/git-help.txt:79
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "-w"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:673
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-all-space"
msgstr ""
@@ -4916,7 +4916,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:678
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-blank-lines"
msgstr ""
@@ -4946,7 +4946,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:688 en/git-grep.txt:262
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--function-context"
msgstr ""
@@ -4958,7 +4958,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:693 en/git-ls-remote.txt:46
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--exit-code"
msgstr ""
@@ -4969,8 +4969,8 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:203 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:52 en/git-clone.txt:120 en/git-commit.txt:314 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:301 en/git-gc.txt:68 en/git-grep.txt:296 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:315 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:255 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:136 en/rev-list-options.txt:220
-#, no-wrap, priority:300
+#: en/diff-options.txt:698 en/fetch-options.txt:215 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:316 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:302 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:256 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
+#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr ""
@@ -4982,7 +4982,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:703
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--ext-diff"
msgstr ""
@@ -4994,7 +4994,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:708
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--no-ext-diff"
msgstr ""
@@ -5006,13 +5006,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:105
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--textconv"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:712 en/git-grep.txt:108
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--no-textconv"
msgstr ""
@@ -5023,7 +5023,7 @@ msgid "Allow (or disallow) external text conversion filters to be run when compa
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:85
+#: en/diff-options.txt:722 en/git-status.txt:87
#, no-wrap, priority:280
msgid "--ignore-submodules[=<when>]"
msgstr ""
@@ -5060,7 +5060,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:741
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--no-prefix"
msgstr ""
@@ -5084,7 +5084,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:747
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--ita-invisible-in-index"
msgstr ""
@@ -5101,8 +5101,8 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:265 en/rev-list-options.txt:138
-#, no-wrap, priority:300
+#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:266 en/rev-list-options.txt:138
+#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr ""
@@ -5114,7 +5114,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:5
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--append"
msgstr ""
@@ -5174,7 +5174,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:31
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--unshallow"
msgstr ""
@@ -5192,7 +5192,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:39
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--update-shallow"
msgstr ""
@@ -5233,8 +5233,8 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:48 en/git-commit.txt:317 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
-#, no-wrap, priority:300
+#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:50 en/git-commit.txt:319 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
+#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr ""
@@ -5245,14 +5245,14 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:34 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:195 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:347 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:278 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
-#, no-wrap, priority:300
+#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:279 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:35 en/git-fast-import.txt:37 en/git-filter-branch.txt:196 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:279 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
-#, no-wrap, priority:300
+#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:280 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr ""
@@ -5283,14 +5283,14 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:112 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
-#, no-wrap, priority:280
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:113 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:83 en/git-am.txt:41 en/git-fetch-pack.txt:54 en/git-index-pack.txt:54 en/git-reset.txt:83
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--keep"
msgstr ""
@@ -5302,7 +5302,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:87
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--multiple"
msgstr ""
@@ -5314,7 +5314,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:91
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--[no-]auto-gc"
msgstr ""
@@ -5326,7 +5326,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:96 en/git-push.txt:153
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--prune"
msgstr ""
@@ -5350,7 +5350,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:110
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--prune-tags"
msgstr ""
@@ -5361,14 +5361,14 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:47 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:97 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:326 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:301 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:85
-#, no-wrap, priority:300
+#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:98 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:302 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
+#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:125 en/git-clone.txt:233
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--no-tags"
msgstr ""
@@ -5392,7 +5392,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:142 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--tags"
msgstr ""
@@ -5416,7 +5416,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:161
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "-j"
msgstr ""
@@ -5427,194 +5427,218 @@ msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:167
+#: en/fetch-options.txt:164
+#, priority:220
+msgid "Number of parallel children to be used for all forms of fetching."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:169
#, priority:220
-msgid "Number of parallel children to be used for fetching submodules. Each will fetch from different submodules, such that fetching many submodules will be faster. By default submodules will be fetched one at a time."
+msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:172
+#, priority:220
+msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:168 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
-#, no-wrap, priority:240
+#: en/fetch-options.txt:173 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
+#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:171
+#: en/fetch-options.txt:176
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:172
+#: en/fetch-options.txt:177 en/git-branch.txt:225 en/git-push.txt:349
+#, ignore-same, no-wrap, priority:240
+msgid "--set-upstream"
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:183
+#, priority:220
+msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:184
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:188
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177
+#: en/fetch-options.txt:189
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:184
+#: en/fetch-options.txt:196
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:187
-#, no-wrap, priority:220
+#: en/fetch-options.txt:199
+#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:194
+#: en/fetch-options.txt:206
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:195 en/git-clone.txt:182
+#: en/fetch-options.txt:207 en/git-clone.txt:182
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:212
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:202 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:51 en/git-clone.txt:119 en/git-commit.txt:313 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:300 en/git-grep.txt:295 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:314 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:254 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:135
-#, no-wrap, priority:300
+#: en/fetch-options.txt:214 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:315 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:301 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:255 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:143
+#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:207
+#: en/fetch-options.txt:219
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:208 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:298 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:318 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:139
-#, no-wrap, priority:300
+#: en/fetch-options.txt:220 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:300 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
+#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:209 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:299 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:319 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:140
-#, no-wrap, priority:300
+#: en/fetch-options.txt:221 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:301 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
+#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:211 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:142
+#: en/fetch-options.txt:223 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:213 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:326 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:258 en/git-switch.txt:144 en/merge-options.txt:143
-#, no-wrap, priority:300
+#: en/fetch-options.txt:225 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:328 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:259 en/git-switch.txt:144 en/merge-options.txt:151
+#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:218 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:230 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:219 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:231 en/git-ls-remote.txt:73 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:220 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:232 en/git-clone.txt:135 en/git-ls-remote.txt:74
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-clone.txt:142
+#: en/fetch-options.txt:239 en/git-clone.txt:142
#, priority:300
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:228
-#, no-wrap, priority:220
+#: en/fetch-options.txt:240
+#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:233
+#: en/fetch-options.txt:245
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:234
-#, no-wrap, priority:220
+#: en/fetch-options.txt:246
+#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:240
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:241 en/git-push.txt:398
-#, no-wrap, priority:220
+#: en/fetch-options.txt:253 en/git-push.txt:398
+#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:242 en/git-push.txt:399
-#, no-wrap, priority:220
+#: en/fetch-options.txt:254 en/git-push.txt:399
+#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:244 en/git-push.txt:401
+#: en/fetch-options.txt:256 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:245 en/git-push.txt:402
-#, no-wrap, priority:220
+#: en/fetch-options.txt:257 en/git-push.txt:402
+#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:246 en/git-push.txt:403
-#, no-wrap, priority:220
+#: en/fetch-options.txt:258 en/git-push.txt:403
+#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:247 en/git-push.txt:405
+#: en/fetch-options.txt:259 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
#. type: Title =
#: en/git-add.txt:2
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "git-add(1)"
msgstr ""
@@ -5638,7 +5662,7 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:15
-#, no-wrap, priority:300
+#, ignore-ellipsis, no-wrap, priority:300
msgid ""
"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n"
"\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n"
@@ -5647,7 +5671,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:20 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:67 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
+#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr ""
@@ -5689,14 +5713,14 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr ""
#. type: Title -
-#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:83 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:85 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:115 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:253 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:86 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:254 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:52 en/git-grep.txt:308 en/git-status.txt:148
-#, no-wrap, priority:300
+#: en/git-add.txt:52 en/git-grep.txt:325 en/git-status.txt:152
+#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
@@ -5707,7 +5731,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:67 en/git-grep.txt:314
+#: en/git-add.txt:67 en/git-grep.txt:331
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -5725,14 +5749,14 @@ msgid "Allow adding otherwise ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:42 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:394 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
-#, no-wrap, priority:300
+#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:43 en/git-rebase.txt:395 en/git-rebase.txt:536 en/git-svn.txt:297
-#, no-wrap, priority:300
+#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
+#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr ""
@@ -5755,14 +5779,14 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:275 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
-#, no-wrap, priority:300
+#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr ""
#. type: Labeled list
#: en/git-add.txt:100 en/git-cherry-pick.txt:54 en/git-commit.txt:220 en/git-config.txt:248 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--edit"
msgstr ""
@@ -5780,7 +5804,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:112
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--update"
msgstr ""
@@ -5804,7 +5828,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:124
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--no-ignore-removal"
msgstr ""
@@ -5822,13 +5846,13 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:135
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--no-all"
msgstr ""
#. type: Labeled list
#: en/git-add.txt:136
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--ignore-removal"
msgstr ""
@@ -5840,19 +5864,19 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:145
-#, priority:300
+#, ignore-ellipsis, priority:300
msgid "This option is primarily to help users who are used to older versions of Git, whose \"git add <pathspec>...\" was a synonym for \"git add --no-all <pathspec>...\", i.e. ignored removed files."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:146 en/git-format-patch.txt:101 en/git-submodule.txt:340
+#: en/git-add.txt:146 en/git-format-patch.txt:102 en/git-submodule.txt:341
#, no-wrap, priority:300
msgid "-N"
msgstr ""
#. type: Labeled list
#: en/git-add.txt:147 en/git-apply.txt:77
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--intent-to-add"
msgstr ""
@@ -5864,7 +5888,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:154 en/git-update-index.txt:54
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--refresh"
msgstr ""
@@ -5876,7 +5900,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:158
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--ignore-errors"
msgstr ""
@@ -5888,7 +5912,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:165 en/git-notes.txt:169 en/git-update-index.txt:72 en/rev-list-options.txt:201
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--ignore-missing"
msgstr ""
@@ -5900,7 +5924,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:171
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--no-warn-embedded-repo"
msgstr ""
@@ -5912,7 +5936,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:178
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--renormalize"
msgstr ""
@@ -5935,7 +5959,7 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:343 en/git-grep.txt:304 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
+#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:345 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr ""
@@ -5947,7 +5971,7 @@ msgid "This option can be used to separate command-line options from the list of
msgstr ""
#. type: Title -
-#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:357 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:153 en/git-fetch.txt:242 en/git-filter-branch.txt:234 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:634 en/git-grep.txt:316 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:206 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:359 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:638 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr ""
@@ -5989,7 +6013,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:221 en/git-rebase.txt:591
+#: en/git-add.txt:221 en/git-rebase.txt:613
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr ""
@@ -6001,7 +6025,7 @@ msgid "When the command enters the interactive mode, it shows the output of the
msgstr ""
#. type: Plain text
-#: en/git-add.txt:230 en/git-clean.txt:83
+#: en/git-add.txt:230 en/git-clean.txt:85
#, priority:300
msgid "The command loop shows the list of subcommands available, and gives a prompt \"What now> \". In general, when the prompt ends with a single '>', you can pick only one of the choices given and type return, like this:"
msgstr ""
@@ -6059,7 +6083,7 @@ msgstr ""
#: en/git-add.txt:267 en/git-update-ref.txt:94
#, ignore-same, no-wrap, priority:300
msgid "update"
-msgstr "update"
+msgstr ""
#. type: Plain text
#: en/git-add.txt:276
@@ -6170,7 +6194,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:336
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "diff"
msgstr ""
@@ -6301,32 +6325,32 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:135 en/git-commit-tree.txt:118 en/git-commit.txt:487 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:241 en/git-fast-import.txt:1503 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:679 en/git-gc.txt:154 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:112 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:247 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:519 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:292 en/git-status.txt:434 en/git-submodule.txt:436 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
+#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:489 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1526 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:683 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:437 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
#: en/git-add.txt:421
-#, priority:300
+#, ignore-same, priority:300
msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
msgstr ""
#. type: Title -
-#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:139 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:495 en/git-config.txt:492 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:245 en/git-fast-import.txt:1507 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:480 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:683 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:334 en/git-gui.txt:126 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:116 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:230 en/git-merge-file.txt:94 en/git-merge-index.txt:78 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1052 en/git-receive-pack.txt:251 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:123 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:523 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:300 en/git-status.txt:438 en/git-stripspace.txt:93 en/git-submodule.txt:440 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
+#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:497 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1530 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:693 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:687 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:441 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
#, no-wrap, priority:300
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:140 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:496 en/git-config.txt:493 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:246 en/git-fast-import.txt:1508 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:481 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:684 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:335 en/git-gui.txt:127 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:117 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:231 en/git-merge-file.txt:95 en/git-merge-index.txt:79 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1053 en/git-receive-pack.txt:252 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:124 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:524 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:301 en/git-status.txt:439 en/git-stripspace.txt:94 en/git-submodule.txt:441 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
+#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:498 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1531 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:694 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:688 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:442 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
#. type: Title =
#: en/git-am.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-am(1)"
msgstr ""
@@ -6338,7 +6362,7 @@ msgstr ""
#. type: Plain text
#: en/git-am.txt:20
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n"
"\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n"
@@ -6358,7 +6382,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:29
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "(<mbox>|<Maildir>)..."
msgstr ""
@@ -6369,8 +6393,8 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:118 en/git-rebase.txt:387 en/git-revert.txt:98 en/merge-options.txt:73
-#, no-wrap, priority:280
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:119 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
+#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr ""
@@ -6388,7 +6412,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:44 en/git-quiltimport.txt:59
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--keep-non-patch"
msgstr ""
@@ -6400,7 +6424,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:47
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]keep-cr"
msgstr ""
@@ -6411,14 +6435,14 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:969
-#, no-wrap, priority:260
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:985
+#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr ""
#. type: Labeled list
#: en/git-am.txt:54 en/git-mailinfo.txt:74
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--scissors"
msgstr ""
@@ -6430,7 +6454,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:59 en/git-mailinfo.txt:90
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-scissors"
msgstr ""
@@ -6441,14 +6465,14 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:267 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:989
-#, no-wrap, priority:260
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1005
+#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr ""
#. type: Labeled list
#: en/git-am.txt:63 en/git-mailinfo.txt:70
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--message-id"
msgstr ""
@@ -6460,7 +6484,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:69
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-message-id"
msgstr ""
@@ -6478,7 +6502,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:78
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--utf8"
msgstr ""
@@ -6498,7 +6522,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:88
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-utf8"
msgstr ""
@@ -6510,19 +6534,19 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:92 en/git-apply.txt:85
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "-3"
msgstr ""
#. type: Labeled list
#: en/git-am.txt:93 en/git-apply.txt:86
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--3way"
msgstr ""
#. type: Labeled list
#: en/git-am.txt:94
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-3way"
msgstr ""
@@ -6533,37 +6557,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:303 en/git-revert.txt:112
-#, no-wrap, priority:240
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
+#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:304 en/git-revert.txt:113
-#, no-wrap, priority:240
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
+#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:307 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:373 en/git-rebase.txt:524
-#, no-wrap, priority:100
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
+#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:374
+#: en/git-am.txt:109 en/git-rebase.txt:396
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:337
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6594,7 +6618,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:115 en/git-apply.txt:108
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--reject"
msgstr ""
@@ -6606,7 +6630,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:120
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--patch-format"
msgstr ""
@@ -6623,8 +6647,8 @@ msgid "Run interactively."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:380 en/git-rebase.txt:521
-#, no-wrap, priority:100
+#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
+#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr ""
@@ -6635,8 +6659,8 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:381 en/git-rebase.txt:522
-#, no-wrap, priority:100
+#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
+#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr ""
@@ -6647,8 +6671,8 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:256 en/sequencer.txt:6
-#, no-wrap, priority:100
+#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
+#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr ""
@@ -6659,38 +6683,38 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:333 en/git-rebase.txt:308 en/git-revert.txt:91 en/merge-options.txt:58
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:335 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:334 en/git-rebase.txt:309 en/git-revert.txt:92 en/merge-options.txt:59
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:336 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:338 en/git-rebase.txt:313 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:340 en/git-rebase.txt:331 en/git-revert.txt:96
#, priority:280
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:228 en/sequencer.txt:1
-#, no-wrap, priority:240
+#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:246 en/sequencer.txt:1
+#, ignore-same, no-wrap, priority:240
msgid "--continue"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:406 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:997
-#, no-wrap, priority:280
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1013
+#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr ""
#. type: Labeled list
#: en/git-am.txt:157
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--resolved"
msgstr ""
@@ -6713,8 +6737,8 @@ msgid "When a patch failure occurs, <msg> will be printed to the screen before e
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:231 en/sequencer.txt:15
-#, no-wrap, priority:240
+#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:249 en/sequencer.txt:15
+#, ignore-same, no-wrap, priority:240
msgid "--abort"
msgstr ""
@@ -6725,8 +6749,8 @@ msgid "Restore the original branch and abort the patching operation."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:238 en/sequencer.txt:10
-#, no-wrap, priority:240
+#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:256 en/sequencer.txt:10
+#, ignore-same, no-wrap, priority:240
msgid "--quit"
msgstr ""
@@ -6737,8 +6761,8 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:262
-#, no-wrap, priority:100
+#: en/git-am.txt:179 en/git-rebase.txt:280
+#, ignore-same, no-wrap, priority:100
msgid "--show-current-patch"
msgstr ""
@@ -6749,7 +6773,7 @@ msgid "Show the patch being applied when \"git am\" is stopped because of confli
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:451 en/git-format-patch.txt:351 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:188 en/git-tag.txt:231
+#: en/git-am.txt:184 en/git-commit.txt:453 en/git-format-patch.txt:355 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
@@ -6833,7 +6857,7 @@ msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the curren
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:471 en/git-gc.txt:147
+#: en/git-am.txt:234 en/git-commit.txt:473 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
@@ -6848,11 +6872,11 @@ msgstr ""
#: en/git-am.txt:242
#, ignore-same, priority:100
msgid "linkgit:git-apply[1]."
-msgstr "linkgit:git-apply[1]."
+msgstr ""
#. type: Title =
#: en/git-annotate.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-annotate(1)"
msgstr ""
@@ -6882,7 +6906,7 @@ msgstr ""
#. type: Title =
#: en/git-apply.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-apply(1)"
msgstr ""
@@ -6894,7 +6918,7 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:20
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git apply' [--stat] [--numstat] [--summary] [--check] [--index | --intent-to-add] [--3way]\n"
"\t [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]\n"
@@ -6920,7 +6944,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:37
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<patch>..."
msgstr ""
@@ -6931,8 +6955,8 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:322 en/merge-options.txt:84
-#, no-wrap, priority:240
+#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
+#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr ""
@@ -6962,7 +6986,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--index"
msgstr ""
@@ -6973,8 +6997,8 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:291
-#, no-wrap, priority:280
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:292
+#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr ""
@@ -7016,7 +7040,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:105 en/rev-list-options.txt:676
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--reverse"
msgstr ""
@@ -7045,14 +7069,14 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:342
+#: en/git-apply.txt:134 en/git-rebase.txt:360
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:135
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--unidiff-zero"
msgstr ""
@@ -7070,7 +7094,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:145
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--apply"
msgstr ""
@@ -7082,7 +7106,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:152
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-add"
msgstr ""
@@ -7094,7 +7118,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:159
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--allow-binary-replacement"
msgstr ""
@@ -7196,7 +7220,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:217
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--inaccurate-eof"
msgstr ""
@@ -7214,7 +7238,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:230
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--recount"
msgstr ""
@@ -7244,7 +7268,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:243
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--unsafe-paths"
msgstr ""
@@ -7261,14 +7285,14 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:330 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:398 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:332 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:256
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "apply.ignoreWhitespace"
msgstr ""
@@ -7280,7 +7304,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:260
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "apply.whitespace"
msgstr ""
@@ -7318,11 +7342,11 @@ msgstr ""
#: en/git-apply.txt:282
#, ignore-same, priority:100
msgid "linkgit:git-am[1]."
-msgstr "linkgit:git-am[1]."
+msgstr ""
#. type: Title =
#: en/git-archimport.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-archimport(1)"
msgstr ""
@@ -7334,7 +7358,7 @@ msgstr ""
#. type: Plain text
#: en/git-archimport.txt:14
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]\n"
" <archive/branch>[:<git-branch>] ...\n"
@@ -7432,7 +7456,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archimport.txt:86 en/git-commit.txt:267 en/git-grep.txt:211 en/git-ls-files.txt:47 en/git-merge-index.txt:29
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "-o"
msgstr ""
@@ -7486,7 +7510,7 @@ msgstr ""
#. type: Title =
#: en/git-archive.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-archive(1)"
msgstr ""
@@ -7498,7 +7522,7 @@ msgstr ""
#. type: Plain text
#: en/git-archive.txt:16
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git archive' [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]\n"
"\t [-o <file> | --output=<file>] [--worktree-attributes]\n"
@@ -7532,7 +7556,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:165 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--list"
msgstr ""
@@ -7574,7 +7598,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:58
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--worktree-attributes"
msgstr ""
@@ -7658,7 +7682,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "-0"
msgstr ""
@@ -7670,7 +7694,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:92
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "-9"
msgstr ""
@@ -7856,13 +7880,13 @@ msgstr ""
#. type: Plain text
#: en/git-archive.txt:194
-#, priority:100
+#, ignore-same, priority:100
msgid "linkgit:gitattributes[5]"
msgstr ""
#. type: Title =
#: en/git-bisect.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-bisect(1)"
msgstr ""
@@ -7886,7 +7910,7 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:31
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>]\n"
"\t\t [--no-checkout] [<bad> [<good>...]] [--] [<paths>...]\n"
@@ -8081,7 +8105,7 @@ msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:158
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "git bisect new [<rev>...]\n"
msgstr ""
@@ -8111,7 +8135,7 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:175
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "If you would like to use your own terms instead of \"bad\"/\"good\" or \"new\"/\"old\", you can choose any names you like (except existing bisect subcommands like `reset`, `start`, ...) by starting the bisection using"
msgstr ""
@@ -8391,7 +8415,7 @@ msgstr ""
#. type: Labeled list
#: en/git-bisect.txt:357 en/git-clone.txt:144
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--no-checkout"
msgstr ""
@@ -8551,7 +8575,7 @@ msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:463
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git bisect start HEAD <known-good-commit> [ <boundary-commit> ... ] --no-checkout\n"
"$ git bisect run sh -c '\n"
@@ -8625,7 +8649,7 @@ msgstr ""
#. type: Title =
#: en/git-blame.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-blame(1)"
msgstr ""
@@ -8693,7 +8717,7 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:56
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--score-debug"
msgstr ""
@@ -8705,7 +8729,7 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:66
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--show-name"
msgstr ""
@@ -8717,7 +8741,7 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:72
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--show-number"
msgstr ""
@@ -8735,7 +8759,7 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:79
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--show-email"
msgstr ""
@@ -9007,7 +9031,7 @@ msgstr ""
#. type: Title =
#: en/git-branch.txt:2
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "git-branch(1)"
msgstr ""
@@ -9019,7 +9043,7 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:26
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<length> | --no-abbrev]]\n"
@@ -9064,7 +9088,7 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:61
-#, priority:240
+#, ignore-ellipsis, priority:240
msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
@@ -9106,13 +9130,13 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:97 en/git-clean.txt:28 en/git-cvsexportcommit.txt:49 en/git-difftool.txt:22 en/git-http-push.txt:44 en/git-instaweb.txt:27 en/git-ls-files.txt:39 en/git-ls-tree.txt:41 en/git-push.txt:181 en/git-repack.txt:60 en/git-replace.txt:65 en/git-show-ref.txt:47 en/git-switch.txt:81 en/git-symbolic-ref.txt:35 en/git-tag.txt:83
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "-d"
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--delete"
msgstr ""
@@ -9130,7 +9154,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--create-reflog"
msgstr ""
@@ -9148,7 +9172,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:126
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--move"
msgstr ""
@@ -9172,7 +9196,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:133
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--copy"
msgstr ""
@@ -9183,7 +9207,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:525
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9208,7 +9232,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:113 en/git-tag.txt:131
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--ignore-case"
msgstr ""
@@ -9219,14 +9243,14 @@ msgid "Sorting and filtering branches are case insensitive."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:153 en/git-status.txt:126 en/git-tag.txt:134
+#: en/git-branch.txt:153 en/git-status.txt:130 en/git-tag.txt:134
#, no-wrap, priority:280
msgid "--column[=<options>]"
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:154 en/git-status.txt:127 en/git-tag.txt:135
-#, no-wrap, priority:280
+#: en/git-branch.txt:154 en/git-status.txt:131 en/git-tag.txt:135
+#, ignore-same, no-wrap, priority:280
msgid "--no-column"
msgstr ""
@@ -9244,7 +9268,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:162 en/git-show-branch.txt:44
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--remotes"
msgstr ""
@@ -9262,13 +9286,13 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:176
-#, priority:240
+#, ignore-ellipsis, priority:240
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:177
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--show-current"
msgstr ""
@@ -9280,7 +9304,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:182
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "-vv"
msgstr ""
@@ -9310,7 +9334,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:202
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--no-abbrev"
msgstr ""
@@ -9322,7 +9346,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:206 en/git-checkout.txt:159 en/git-switch.txt:152
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--track"
msgstr ""
@@ -9340,7 +9364,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:221 en/git-checkout.txt:173 en/git-switch.txt:167
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--no-track"
msgstr ""
@@ -9350,12 +9374,6 @@ msgstr ""
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
-#. type: Labeled list
-#: en/git-branch.txt:225 en/git-push.txt:349
-#, no-wrap, priority:240
-msgid "--set-upstream"
-msgstr ""
-
#. type: Plain text
#: en/git-branch.txt:228
#, priority:240
@@ -9382,7 +9400,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:235
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--unset-upstream"
msgstr ""
@@ -9394,7 +9412,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:239
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--edit-description"
msgstr ""
@@ -9508,7 +9526,7 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:291
-#, priority:240
+#, ignore-ellipsis, priority:240
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. You may use the --sort=<key> option multiple times, in which case the last key becomes the primary key. The keys supported are the same as those in `git for-each-ref`. Sort order defaults to the value configured for the `branch.sort` variable if exists, or to sorting based on the full refname (including `refs/...` prefix). This lists detached HEAD (if present) first, then local branches and finally remote-tracking branches. See linkgit:git-config[1]."
msgstr ""
@@ -9550,7 +9568,7 @@ msgstr ""
#. type: delimited block -
#: en/git-branch.txt:317
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -9572,7 +9590,7 @@ msgstr ""
#. type: delimited block -
#: en/git-branch.txt:329
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -9625,7 +9643,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-filter-branch.txt:449 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -9674,7 +9692,7 @@ msgstr ""
#. type: Title =
#: en/git-bundle.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-bundle(1)"
msgstr ""
@@ -9686,7 +9704,7 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:16
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git bundle' create <file> <git-rev-list-args>\n"
"'git bundle' verify <file>\n"
@@ -9762,7 +9780,7 @@ msgstr ""
#. type: Labeled list
#: en/git-bundle.txt:71
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "[<refname>...]"
msgstr ""
@@ -9959,7 +9977,7 @@ msgstr ""
#. type: Title =
#: en/git-cat-file.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-cat-file(1)"
msgstr ""
@@ -10045,7 +10063,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:66
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--filters"
msgstr ""
@@ -10069,7 +10087,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:77 en/git-mktree.txt:32
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--batch"
msgstr ""
@@ -10087,7 +10105,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:85
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--batch-check"
msgstr ""
@@ -10105,7 +10123,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:93
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--batch-all-objects"
msgstr ""
@@ -10117,7 +10135,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:100
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--buffer"
msgstr ""
@@ -10129,7 +10147,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:107
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--unordered"
msgstr ""
@@ -10141,7 +10159,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:117
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--allow-unknown-type"
msgstr ""
@@ -10153,7 +10171,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:120
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--follow-symlinks"
msgstr ""
@@ -10245,7 +10263,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:152 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10300,7 +10318,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:202
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`objectname`"
msgstr ""
@@ -10312,7 +10330,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:205
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`objecttype`"
msgstr ""
@@ -10324,7 +10342,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:208
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`objectsize`"
msgstr ""
@@ -10348,7 +10366,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:216
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`deltabase`"
msgstr ""
@@ -10360,7 +10378,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:221
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`rest`"
msgstr ""
@@ -10526,7 +10544,7 @@ msgstr ""
#. type: Title =
#: en/git-check-attr.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-check-attr(1)"
msgstr ""
@@ -10538,7 +10556,7 @@ msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:14
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git check-attr' [-a | --all | <attr>...] [--] <pathname>...\n"
"'git check-attr' --stdin [-z] [-a | --all | <attr>...]\n"
@@ -10570,7 +10588,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:148 en/rev-list-options.txt:213
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--stdin"
msgstr ""
@@ -10620,7 +10638,7 @@ msgstr ""
#: en/git-check-attr.txt:60
#, ignore-same, no-wrap, priority:100
msgid "'unspecified'"
-msgstr "'unspecified'"
+msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:61
@@ -10632,7 +10650,7 @@ msgstr ""
#: en/git-check-attr.txt:61
#, ignore-same, no-wrap, priority:100
msgid "'unset'"
-msgstr "'unset'"
+msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:62
@@ -10644,7 +10662,7 @@ msgstr ""
#: en/git-check-attr.txt:62
#, ignore-same, no-wrap, priority:100
msgid "'set'"
-msgstr "'set'"
+msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:63
@@ -10763,11 +10781,11 @@ msgstr ""
#: en/git-check-attr.txt:117
#, ignore-same, priority:100
msgid "linkgit:gitattributes[5]."
-msgstr "linkgit:gitattributes[5]."
+msgstr ""
#. type: Title =
#: en/git-check-ignore.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-check-ignore(1)"
msgstr ""
@@ -10779,7 +10797,7 @@ msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:14
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git check-ignore' [<options>] <pathname>...\n"
"'git check-ignore' [<options>] --stdin\n"
@@ -10841,7 +10859,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ignore.txt:52 en/git-grep.txt:79
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-index"
msgstr ""
@@ -10894,7 +10912,7 @@ msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will al
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:226
+#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
@@ -10937,13 +10955,13 @@ msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:117
-#, priority:100
+#, ignore-same, priority:100
msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
msgstr ""
#. type: Title =
#: en/git-check-mailmap.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-check-mailmap(1)"
msgstr ""
@@ -10955,7 +10973,7 @@ msgstr ""
#. type: Plain text
#: en/git-check-mailmap.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git check-mailmap' [<options>] <contact>...\n"
msgstr ""
@@ -10979,7 +10997,7 @@ msgstr ""
#. type: Title =
#: en/git-checkout-index.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-checkout-index(1)"
msgstr ""
@@ -10991,7 +11009,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:17
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]\n"
"\t\t [--stage=<number>|all]\n"
@@ -11032,7 +11050,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout-index.txt:44
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-create"
msgstr ""
@@ -11068,7 +11086,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout-index.txt:57
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--temp"
msgstr ""
@@ -11091,7 +11109,7 @@ msgid "Only meaningful with `--stdin`; paths are separated with NUL character in
msgstr ""
#. type: Plain text
-#: en/git-checkout-index.txt:73 en/git-commit.txt:345 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
+#: en/git-checkout-index.txt:73 en/git-commit.txt:347 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
#, priority:280
msgid "Do not interpret any more arguments as options."
msgstr ""
@@ -11254,7 +11272,7 @@ msgstr ""
#. type: Title =
#: en/git-checkout.txt:2
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "git-checkout(1)"
msgstr ""
@@ -11266,7 +11284,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:18
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git checkout' [-q] [-f] [-m] [<branch>]\n"
"'git checkout' [-q] [-f] [-m] --detach [<branch>]\n"
@@ -11377,7 +11395,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:82
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git checkout' [<tree-ish>] [--] <pathspec>..."
msgstr ""
@@ -11395,7 +11413,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:98
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]"
msgstr ""
@@ -11412,8 +11430,8 @@ msgid "Quiet, suppress feedback messages."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:144
-#, no-wrap, priority:240
+#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:152
+#, ignore-same, no-wrap, priority:240
msgid "--no-progress"
msgstr ""
@@ -11437,13 +11455,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:128 en/git-merge-file.txt:73 en/git-restore.txt:75
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--ours"
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:129 en/git-merge-file.txt:74 en/git-restore.txt:76
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--theirs"
msgstr ""
@@ -11509,13 +11527,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:177 en/git-switch.txt:87
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--guess"
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:178 en/git-switch.txt:88
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--no-guess"
msgstr ""
@@ -11545,7 +11563,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:202 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--detach"
msgstr ""
@@ -11587,7 +11605,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:234 en/git-restore.txt:102
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--ignore-skip-worktree-bits"
msgstr ""
@@ -11598,8 +11616,8 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:241 en/git-rebase.txt:268 en/git-rebase.txt:529 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:354 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
-#, no-wrap, priority:280
+#: en/git-checkout.txt:241 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:355 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
+#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr ""
@@ -11659,7 +11677,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:282 en/git-switch.txt:175
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--ignore-other-worktrees"
msgstr ""
@@ -11671,13 +11689,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:288 en/git-merge.txt:90
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--overwrite-ignore"
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:289 en/git-merge.txt:91
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--no-overwrite-ignore"
msgstr ""
@@ -11689,7 +11707,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:294 en/git-grep.txt:95 en/git-ls-files.txt:150 en/git-switch.txt:181
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--recurse-submodules"
msgstr ""
@@ -11701,13 +11719,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:304 en/git-restore.txt:109
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--overlay"
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:305 en/git-restore.txt:110
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--no-overlay"
msgstr ""
@@ -11718,7 +11736,7 @@ msgid "In the default overlay mode, `git checkout` never removes files from the
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:312 en/git-rebase.txt:225 en/git-switch.txt:36
+#: en/git-checkout.txt:312 en/git-rebase.txt:243 en/git-switch.txt:36
#, no-wrap, priority:240
msgid "<branch>"
msgstr ""
@@ -11737,7 +11755,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:326 en/git-switch.txt:58
-#, priority:240
+#, ignore-ellipsis, priority:240
msgid "As a special case, you may use `A...B` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
@@ -11767,7 +11785,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:337
-#, priority:240
+#, ignore-ellipsis, priority:240
msgid "As a special case, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
@@ -12122,13 +12140,13 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:581
-#, priority:240
+#, ignore-same, priority:240
msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
msgstr ""
#. type: Title =
#: en/git-check-ref-format.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-check-ref-format(1)"
msgstr ""
@@ -12264,7 +12282,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:101
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]allow-onelevel"
msgstr ""
@@ -12276,7 +12294,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:106
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--refspec-pattern"
msgstr ""
@@ -12288,7 +12306,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:113
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--normalize"
msgstr ""
@@ -12326,7 +12344,7 @@ msgstr ""
#. type: Title =
#: en/git-cherry-pick.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-cherry-pick(1)"
msgstr ""
@@ -12338,7 +12356,7 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:14
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]\n"
"\t\t [-S[<keyid>]] <commit>...\n"
@@ -12395,13 +12413,13 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:43 en/git-merge.txt:116 en/git-revert.txt:36 en/git-verify-commit.txt:27
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid "<commit>..."
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:52
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Commits to cherry-pick. For a more complete list of ways to spell commits, see linkgit:gitrevisions[7]. Sets of commits can be passed but no traversal is done by default, as if the `--no-walk` option was specified, see linkgit:git-rev-list[1]. Note that specifying a range will feed all <commit>... arguments to a single revision walk (see a later example that uses 'maint master..next')."
msgstr ""
@@ -12424,14 +12442,14 @@ msgid "This option determines how the commit message will be cleaned up before b
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:65 en/git-clean.txt:61
-#, no-wrap, priority:100
+#: en/git-cherry-pick.txt:65 en/git-clean.txt:63
+#, ignore-same, no-wrap, priority:100
msgid "-x"
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:78
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "When recording the commit, append a line that says \"(cherry picked from commit ...)\" to the original commit message in order to indicate which commit this change was cherry-picked from. This is done only for cherry picks without conflicts. Do not use this option if you are cherry-picking from your private branch because the information is useless to the recipient. If on the other hand you are cherry-picking between two publicly visible branches (e.g. backporting a fix to a maintenance branch for an older release from a development branch), adding this information can be useful."
msgstr ""
@@ -12461,7 +12479,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:93 en/git-revert.txt:78 en/merge-options.txt:2
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--no-commit"
msgstr ""
@@ -12485,7 +12503,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:116 en/merge-options.txt:42
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--ff"
msgstr ""
@@ -12497,7 +12515,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:121 en/git-commit.txt:179 en/git-notes.txt:158
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--allow-empty"
msgstr ""
@@ -12508,8 +12526,8 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:249 en/git-rebase.txt:532
-#, no-wrap, priority:280
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:267 en/git-rebase.txt:554
+#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr ""
@@ -12521,7 +12539,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:139
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--keep-redundant-commits"
msgstr ""
@@ -12532,7 +12550,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:282 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:109
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12550,7 +12568,7 @@ msgid "-X<option>"
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:125
#, no-wrap, priority:240
msgid "--strategy-option=<option>"
msgstr ""
@@ -12705,7 +12723,7 @@ msgstr ""
#. type: Title =
#: en/git-cherry.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-cherry(1)"
msgstr ""
@@ -12746,7 +12764,7 @@ msgid "Show the commit subjects next to the SHA1s."
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:32 en/git-rebase.txt:220
+#: en/git-cherry.txt:32 en/git-rebase.txt:238
#, no-wrap, priority:100
msgid "<upstream>"
msgstr ""
@@ -12764,7 +12782,7 @@ msgid "<head>"
msgstr ""
#. type: Plain text
-#: en/git-cherry.txt:38 en/git-rebase.txt:227
+#: en/git-cherry.txt:38 en/git-rebase.txt:245
#, priority:100
msgid "Working branch; defaults to HEAD."
msgstr ""
@@ -12789,7 +12807,7 @@ msgstr ""
#. type: delimited block -
#: en/git-cherry.txt:58
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git checkout -b topic origin/master\n"
"# work and create some commits\n"
@@ -12825,7 +12843,7 @@ msgstr ""
#. type: delimited block -
#: en/git-cherry.txt:86
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git log --graph --oneline --decorate --boundary origin/master...topic\n"
"* 7654321 (origin/master) upstream tip commit\n"
@@ -12848,7 +12866,7 @@ msgstr ""
#. type: delimited block -
#: en/git-cherry.txt:96
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git cherry origin/master topic\n"
"- cccc000... commit C\n"
@@ -12876,7 +12894,7 @@ msgstr ""
#. type: delimited block -
#: en/git-cherry.txt:126
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git log --graph --oneline --decorate --boundary origin/master...topic\n"
"* 7654321 (origin/master) upstream tip commit\n"
@@ -12902,7 +12920,7 @@ msgstr ""
#. type: delimited block -
#: en/git-cherry.txt:136
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git cherry origin/master topic base\n"
"- cccc000... commit C\n"
@@ -12912,7 +12930,7 @@ msgstr ""
#. type: Title =
#: en/git-citool.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-citool(1)"
msgstr ""
@@ -12942,7 +12960,7 @@ msgstr ""
#. type: Title =
#: en/git-clean.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-clean(1)"
msgstr ""
@@ -12954,7 +12972,7 @@ msgstr ""
#. type: Plain text
#: en/git-clean.txt:12
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <path>...\n"
msgstr ""
@@ -12972,90 +12990,90 @@ msgstr ""
#. type: Plain text
#: en/git-clean.txt:25
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "If any optional `<path>...` arguments are given, only those paths are affected."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:33
+#: en/git-clean.txt:35
#, priority:100
-msgid "Remove untracked directories in addition to untracked files. If an untracked directory is managed by a different Git repository, it is not removed by default. Use -f option twice if you really want to remove such a directory."
+msgid "Normally, when no <path> is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. If any paths are specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under `--force`) will be removed."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:41
+#: en/git-clean.txt:43
#, priority:100
-msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f, -n or -i. Git will refuse to delete directories with .git sub directory or file unless a second -f is given."
+msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f or -i. Git will refuse to modify untracked nested git repositories (directories with a .git subdirectory) unless a second -f is given."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:46
+#: en/git-clean.txt:48
#, priority:100
msgid "Show what would be done and clean files interactively. See ``Interactive mode'' for details."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:50
+#: en/git-clean.txt:52
#, priority:100
msgid "Don't actually remove anything, just show what would be done."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:55
+#: en/git-clean.txt:57
#, priority:100
msgid "Be quiet, only report errors, but not the files that are successfully removed."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:56
+#: en/git-clean.txt:58
#, no-wrap, priority:100
msgid "-e <pattern>"
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:57 en/git-ls-files.txt:85 en/git-name-rev.txt:33
+#: en/git-clean.txt:59 en/git-ls-files.txt:85 en/git-name-rev.txt:33
#, no-wrap, priority:100
msgid "--exclude=<pattern>"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:60
+#: en/git-clean.txt:62
#, priority:100
msgid "Use the given exclude pattern in addition to the standard ignore rules (see linkgit:gitignore[5])."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:68
+#: en/git-clean.txt:70
#, priority:100
msgid "Don't use the standard ignore rules (see linkgit:gitignore[5]), but still use the ignore rules given with `-e` options from the command line. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git restore' or 'git reset') to create a pristine working directory to test a clean build."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:69
+#: en/git-clean.txt:71
#, no-wrap, priority:100
msgid "-X"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:72
+#: en/git-clean.txt:74
#, priority:100
msgid "Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files."
msgstr ""
#. type: Title -
-#: en/git-clean.txt:74
+#: en/git-clean.txt:76
#, no-wrap, priority:100
msgid "Interactive mode"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:78
+#: en/git-clean.txt:80
#, priority:100
msgid "When the command enters the interactive mode, it shows the files and directories to be cleaned, and goes into its interactive command loop."
msgstr ""
#. type: delimited block -
-#: en/git-clean.txt:89
+#: en/git-clean.txt:91
#, no-wrap, priority:100
msgid ""
" *** Commands ***\n"
@@ -13065,98 +13083,98 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:92
+#: en/git-clean.txt:94
#, priority:100
msgid "You also could say `c` or `clean` above as long as the choice is unique."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:94
+#: en/git-clean.txt:96
#, priority:100
msgid "The main command loop has 6 subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:95
+#: en/git-clean.txt:97
#, no-wrap, priority:100
msgid "clean"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:98
+#: en/git-clean.txt:100
#, priority:100
msgid "Start cleaning files and directories, and then quit."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:99
+#: en/git-clean.txt:101
#, no-wrap, priority:100
msgid "filter by pattern"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:107
+#: en/git-clean.txt:109
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Input ignore patterns>>\" prompt. You can input space-separated patterns to exclude files and directories from deletion. E.g. \"*.c *.h\" will excludes files end with \".c\" and \".h\" from deletion. When you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:108
+#: en/git-clean.txt:110
#, no-wrap, priority:100
msgid "select by numbers"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:119
+#: en/git-clean.txt:121
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Select items to delete>>\" prompt. When the prompt ends with double '>>' like this, you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything. Also when you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:120
+#: en/git-clean.txt:122
#, no-wrap, priority:100
msgid "ask each"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:125
+#: en/git-clean.txt:127
#, priority:100
msgid "This will start to clean, and you must confirm one by one in order to delete items. Please note that this action is not as efficient as the above two actions."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:126
+#: en/git-clean.txt:128
#, no-wrap, priority:100
msgid "quit"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:129
+#: en/git-clean.txt:131
#, priority:100
msgid "This lets you quit without do cleaning."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:130
+#: en/git-clean.txt:132
#, no-wrap, priority:100
msgid "help"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:133
+#: en/git-clean.txt:135
#, priority:100
msgid "Show brief usage of interactive git-clean."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:137 en/git-status.txt:436
-#, priority:280
+#: en/git-clean.txt:139 en/git-status.txt:440
+#, ignore-same, priority:280
msgid "linkgit:gitignore[5]"
msgstr ""
#. type: Title =
#: en/git-clone.txt:2
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "git-clone(1)"
msgstr ""
@@ -13200,7 +13218,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:45 en/git-config.txt:127 en/git-instaweb.txt:24 en/git-pack-objects.txt:142 en/git-svn.txt:245
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--local"
msgstr ""
@@ -13218,7 +13236,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:60
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--no-hardlinks"
msgstr ""
@@ -13230,7 +13248,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:67
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--shared"
msgstr ""
@@ -13288,8 +13306,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:108 en/git-submodule.txt:392
-#, no-wrap, priority:300
+#: en/git-clone.txt:108 en/git-submodule.txt:393
+#, ignore-same, no-wrap, priority:300
msgid "--dissociate"
msgstr ""
@@ -13325,7 +13343,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:135
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--bare"
msgstr ""
@@ -13337,7 +13355,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:159 en/git-push.txt:161
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--mirror"
msgstr ""
@@ -13457,7 +13475,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:223
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--[no-]single-branch"
msgstr ""
@@ -13499,7 +13517,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:261
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--[no-]shallow-submodules"
msgstr ""
@@ -13511,7 +13529,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:264
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "--[no-]remote-submodules"
msgstr ""
@@ -13534,13 +13552,13 @@ msgid "Instead of placing the cloned repository where it is supposed to be, plac
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:277 en/git-submodule.txt:416
+#: en/git-clone.txt:277 en/git-submodule.txt:417
#, no-wrap, priority:300
msgid "-j <n>"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:278 en/git-submodule.txt:417
+#: en/git-clone.txt:278 en/git-submodule.txt:418
#, no-wrap, priority:300
msgid "--jobs <n>"
msgstr ""
@@ -13583,7 +13601,7 @@ msgstr ""
#. type: delimited block -
#: en/git-clone.txt:306
-#, no-wrap, priority:300
+#, ignore-ellipsis, no-wrap, priority:300
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux.git my-linux\n"
"$ cd my-linux\n"
@@ -13613,7 +13631,7 @@ msgstr ""
#. type: delimited block -
#: en/git-clone.txt:325
-#, no-wrap, priority:300
+#, ignore-ellipsis, no-wrap, priority:300
msgid ""
"$ git clone --reference /git/linux.git \\\n"
"\tgit://git.kernel.org/pub/scm/.../linux.git \\\n"
@@ -13635,7 +13653,7 @@ msgstr ""
#. type: Title =
#: en/git-column.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-column(1)"
msgstr ""
@@ -13794,7 +13812,7 @@ msgstr ""
#. type: Title =
#: en/git-commit-tree.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-commit-tree(1)"
msgstr ""
@@ -13806,7 +13824,7 @@ msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:15
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git commit-tree' <tree> [(-p <parent>)...]\n"
"'git commit-tree' [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n"
@@ -13898,8 +13916,8 @@ msgid "Read the commit log message from the given file. Use `-` to read from the
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:68 en/git-commit.txt:339
-#, no-wrap, priority:280
+#: en/git-commit-tree.txt:68 en/git-commit.txt:341
+#, ignore-same, no-wrap, priority:280
msgid "--no-gpg-sign"
msgstr ""
@@ -13982,7 +14000,7 @@ msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:477 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:428 en/git-svn.txt:1156
+#: en/git-commit-tree.txt:114 en/git-commit.txt:479 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:429 en/git-svn.txt:1156
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
@@ -13995,7 +14013,7 @@ msgstr ""
#. type: Title =
#: en/git-commit.txt:2
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "git-commit(1)"
msgstr ""
@@ -14007,7 +14025,7 @@ msgstr ""
#. type: Plain text
#: en/git-commit.txt:17
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n"
"\t [--dry-run] [(-c | -C | --fixup | --squash) <commit>]\n"
@@ -14145,7 +14163,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:100
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--reset-author"
msgstr ""
@@ -14157,7 +14175,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:106 en/git-status.txt:28 en/git-symbolic-ref.txt:45
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--short"
msgstr ""
@@ -14169,7 +14187,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:110 en/git-status.txt:32
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--branch"
msgstr ""
@@ -14187,7 +14205,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:118 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--long"
msgstr ""
@@ -14199,7 +14217,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:123 en/git-config.txt:207 en/git-grep.txt:207
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--null"
msgstr ""
@@ -14288,14 +14306,14 @@ msgid "When editing the commit message, start the editor with the contents in th
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:173 en/merge-options.txt:81
+#: en/git-commit.txt:173 en/merge-options.txt:85
#, priority:280
msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:175 en/git-rebase.txt:330
-#, no-wrap, priority:280
+#: en/git-commit.txt:175 en/git-rebase.txt:348 en/merge-options.txt:112
+#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr ""
@@ -14397,7 +14415,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:226 en/git-revert.txt:66 en/merge-options.txt:17
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--no-edit"
msgstr ""
@@ -14409,7 +14427,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:231
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--amend"
msgstr ""
@@ -14427,7 +14445,7 @@ msgstr ""
#. type: delimited block -
#: en/git-commit.txt:248
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"\t$ git reset --soft HEAD^\n"
"\t$ ... do something else to come up with the right tree ...\n"
@@ -14448,7 +14466,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:257
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--no-post-rewrite"
msgstr ""
@@ -14460,7 +14478,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:261
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--include"
msgstr ""
@@ -14472,7 +14490,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:268
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--only"
msgstr ""
@@ -14501,115 +14519,115 @@ msgid "Show untracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:288
+#: en/git-commit.txt:289
#, priority:280
msgid "The mode parameter is optional (defaults to 'all'), and is used to specify the handling of untracked files; when -u is not used, the default is 'normal', i.e. show untracked files and directories."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:290 en/git-status.txt:67 en/git-status.txt:107
+#: en/git-commit.txt:291 en/git-status.txt:68 en/git-status.txt:110
#, priority:280
msgid "The possible options are:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:292
+#: en/git-commit.txt:293
#, no-wrap, priority:280
msgid "'no' - Show no untracked files\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:293
+#: en/git-commit.txt:294
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:294 en/git-status.txt:71
+#: en/git-commit.txt:295 en/git-status.txt:72
#, no-wrap, priority:280
msgid "'all' - Also shows individual files in untracked directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:297 en/git-status.txt:84
+#: en/git-commit.txt:298 en/git-status.txt:85
#, priority:280
msgid "The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:308
+#: en/git-commit.txt:310
#, priority:280
msgid "Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template to help the user describe the commit by reminding what changes the commit has. Note that this diff output doesn't have its lines prefixed with '#'. This diff will not be a part of the commit message. See the `commit.verbose` configuration variable in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:312
+#: en/git-commit.txt:314
#, priority:280
msgid "If specified twice, show in addition the unified diff between what would be committed and the worktree files, i.e. the unstaged changes to tracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:316
+#: en/git-commit.txt:318
#, priority:280
msgid "Suppress commit summary message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:321
+#: en/git-commit.txt:323
#, priority:280
msgid "Do not create a commit, but show a list of paths that are to be committed, paths with local changes that will be left uncommitted and paths that are untracked."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:322
-#, no-wrap, priority:280
+#: en/git-commit.txt:324
+#, ignore-same, no-wrap, priority:280
msgid "--status"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:327
+#: en/git-commit.txt:329
#, priority:280
msgid "Include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the commit message. Defaults to on, but can be used to override configuration variable commit.status."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:328
-#, no-wrap, priority:280
+#: en/git-commit.txt:330
+#, ignore-same, no-wrap, priority:280
msgid "--no-status"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:332
+#: en/git-commit.txt:334
#, priority:280
msgid "Do not include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the default commit message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:342
+#: en/git-commit.txt:344
#, priority:280
msgid "Countermand `commit.gpgSign` configuration variable that is set to force each and every commit to be signed."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:346 en/git-rm.txt:29
-#, no-wrap, priority:280
+#: en/git-commit.txt:348 en/git-rm.txt:29
+#, ignore-ellipsis, no-wrap, priority:280
msgid "<file>..."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:352
+#: en/git-commit.txt:354
#, priority:280
msgid "When files are given on the command line, the command commits the contents of the named files, without recording the changes already staged. The contents of these files are also staged for the next commit on top of what have been staged before."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:369
+#: en/git-commit.txt:371
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:375
+#: en/git-commit.txt:377
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14619,13 +14637,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:383
+#: en/git-commit.txt:385
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:388
+#: en/git-commit.txt:390
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14634,19 +14652,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:393
+#: en/git-commit.txt:395
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:398
+#: en/git-commit.txt:400
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:404
+#: en/git-commit.txt:406
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14656,31 +14674,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:411
+#: en/git-commit.txt:413
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:414 en/git-commit.txt:440
+#: en/git-commit.txt:416 en/git-commit.txt:442
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:418
+#: en/git-commit.txt:420
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:426
+#: en/git-commit.txt:428
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:432
+#: en/git-commit.txt:434
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14690,62 +14708,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:437
+#: en/git-commit.txt:439
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:448
+#: en/git-commit.txt:450
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:460
+#: en/git-commit.txt:462
#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:464
+#: en/git-commit.txt:466
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:469
+#: en/git-commit.txt:471
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:475
+#: en/git-commit.txt:477
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:479
+#: en/git-commit.txt:481
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:485
+#: en/git-commit.txt:487
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:493
-#, priority:280
+#: en/git-commit.txt:495
+#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr ""
#. type: Title =
#: en/git-config.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-config(1)"
msgstr ""
@@ -14862,7 +14880,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:74
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--replace-all"
msgstr ""
@@ -14874,7 +14892,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:78 en/git-update-index.txt:44
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--add"
msgstr ""
@@ -14886,7 +14904,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:83
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--get"
msgstr ""
@@ -14898,7 +14916,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:88
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--get-all"
msgstr ""
@@ -14910,7 +14928,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:91
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--get-regexp"
msgstr ""
@@ -14934,7 +14952,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:106
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--global"
msgstr ""
@@ -14958,7 +14976,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:117
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--system"
msgstr ""
@@ -14988,7 +15006,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:136 en/git-restore.txt:57
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--worktree"
msgstr ""
@@ -15030,7 +15048,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:152
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--remove-section"
msgstr ""
@@ -15042,7 +15060,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:155
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--rename-section"
msgstr ""
@@ -15054,7 +15072,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:158
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--unset"
msgstr ""
@@ -15066,7 +15084,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:161
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--unset-all"
msgstr ""
@@ -15138,31 +15156,31 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:193
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--bool"
msgstr ""
#. type: Labeled list
#: en/git-config.txt:194
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--int"
msgstr ""
#. type: Labeled list
#: en/git-config.txt:195
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--bool-or-int"
msgstr ""
#. type: Labeled list
#: en/git-config.txt:196 en/git-hash-object.txt:39
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--path"
msgstr ""
#. type: Labeled list
#: en/git-config.txt:197
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--expiry-date"
msgstr ""
@@ -15174,7 +15192,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:201
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-type"
msgstr ""
@@ -15198,7 +15216,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:219
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--show-origin"
msgstr ""
@@ -15246,7 +15264,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:252
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]includes"
msgstr ""
@@ -15378,7 +15396,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:324
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG"
msgstr ""
@@ -15390,7 +15408,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:329
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG_NOSYSTEM"
msgstr ""
@@ -15406,211 +15424,211 @@ msgstr ""
msgid "Given a .git/config like this:"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:347
+#. type: delimited block -
+#: en/git-config.txt:348
#, no-wrap, priority:100
msgid ""
-"\t#\n"
-"\t# This is the config file, and\n"
-"\t# a '#' or ';' character indicates\n"
-"\t# a comment\n"
-"\t#\n"
+"#\n"
+"# This is the config file, and\n"
+"# a '#' or ';' character indicates\n"
+"# a comment\n"
+"#\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:352
+#. type: delimited block -
+#: en/git-config.txt:353 en/git.txt:310
#, no-wrap, priority:100
msgid ""
-"\t; core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"; core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:357
+#. type: delimited block -
+#: en/git-config.txt:358
#, no-wrap, priority:100
msgid ""
-"\t; Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"; Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:362
+#. type: delimited block -
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
-"\t; Proxy settings\n"
-"\t[core]\n"
-"\t\tgitproxy=proxy-command for kernel.org\n"
-"\t\tgitproxy=default-proxy ; for all the rest\n"
+"; Proxy settings\n"
+"[core]\n"
+"\tgitproxy=proxy-command for kernel.org\n"
+"\tgitproxy=default-proxy ; for all the rest\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:369
+#. type: delimited block -
+#: en/git-config.txt:370
#, no-wrap, priority:100
msgid ""
-"\t; HTTP\n"
-"\t[http]\n"
-"\t\tsslVerify\n"
-"\t[http \"https://weak.example.com\"]\n"
-"\t\tsslVerify = false\n"
-"\t\tcookieFile = /tmp/cookie.txt\n"
+"; HTTP\n"
+"[http]\n"
+"\tsslVerify\n"
+"[http \"https://weak.example.com\"]\n"
+"\tsslVerify = false\n"
+"\tcookieFile = /tmp/cookie.txt\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:371
+#: en/git-config.txt:373
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:374
+#: en/git-config.txt:376
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:379
+#: en/git-config.txt:381
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:382
+#: en/git-config.txt:384
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:385
+#: en/git-config.txt:387
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:389
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:390
+#: en/git-config.txt:392
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:394
+#: en/git-config.txt:396
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:398
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:399
+#: en/git-config.txt:401
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:402 en/git-gui.txt:120 en/git-merge-index.txt:64
+#: en/git-config.txt:404 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:407
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:410
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:413
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:414
+#: en/git-config.txt:416
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:417
+#: en/git-config.txt:419
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:421
+#: en/git-config.txt:423
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:424
+#: en/git-config.txt:426
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:428
-#, priority:100
+#: en/git-config.txt:430
+#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:431
+#: en/git-config.txt:433
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:434
+#: en/git-config.txt:436
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:437
+#: en/git-config.txt:439
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:440
+#: en/git-config.txt:442
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:443
+#: en/git-config.txt:445
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:447
+#: en/git-config.txt:449
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:453
+#: en/git-config.txt:455
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15620,13 +15638,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:457
+#: en/git-config.txt:459
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:466
+#: en/git-config.txt:468
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15639,19 +15657,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:471 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1029 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
+#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:476
+#: en/git-config.txt:478
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:482
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15659,13 +15677,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:483
+#: en/git-config.txt:485
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:488
+#: en/git-config.txt:490
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15675,7 +15693,7 @@ msgstr ""
#. type: Title =
#: en/git-count-objects.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-count-objects(1)"
msgstr ""
@@ -15759,7 +15777,7 @@ msgstr ""
#. type: Labeled list
#: en/git-count-objects.txt:48
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--human-readable"
msgstr ""
@@ -15771,7 +15789,7 @@ msgstr ""
#. type: Title =
#: en/git-credential-cache--daemon.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-credential-cache--daemon(1)"
msgstr ""
@@ -15807,7 +15825,7 @@ msgstr ""
#. type: Title =
#: en/git-credential-cache.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-credential-cache(1)"
msgstr ""
@@ -15916,7 +15934,7 @@ msgstr ""
#. type: Title =
#: en/git-credential-store.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-credential-store(1)"
msgstr ""
@@ -16055,7 +16073,7 @@ msgstr ""
#. type: Title =
#: en/git-credential.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-credential(1)"
msgstr ""
@@ -16200,7 +16218,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:120
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`protocol`"
msgstr ""
@@ -16212,7 +16230,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:125
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`host`"
msgstr ""
@@ -16224,7 +16242,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:129
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`path`"
msgstr ""
@@ -16236,7 +16254,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:135
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`username`"
msgstr ""
@@ -16248,7 +16266,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:140
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`password`"
msgstr ""
@@ -16260,7 +16278,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:144
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`url`"
msgstr ""
@@ -16272,7 +16290,7 @@ msgstr ""
#. type: Title =
#: en/git-cvsexportcommit.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-cvsexportcommit(1)"
msgstr ""
@@ -16449,7 +16467,7 @@ msgstr ""
#. type: Title =
#: en/git-cvsimport.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-cvsimport(1)"
msgstr ""
@@ -16883,7 +16901,7 @@ msgstr ""
#. type: Title =
#: en/git-cvsserver.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-cvsserver(1)"
msgstr ""
@@ -16927,7 +16945,7 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:26
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
msgstr ""
@@ -16951,7 +16969,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:37 en/git-daemon.txt:49
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--strict-paths"
msgstr ""
@@ -16963,7 +16981,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:40 en/git-daemon.txt:78
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--export-all"
msgstr ""
@@ -16981,7 +16999,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:45 en/git.txt:42
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--version"
msgstr ""
@@ -16993,7 +17011,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:50 en/git.txt:45
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--help"
msgstr ""
@@ -17028,7 +17046,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
msgstr ""
#. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:234
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
#, no-wrap, priority:100
msgid "LIMITATIONS"
msgstr ""
@@ -17373,7 +17391,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:293
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "%G"
msgstr ""
@@ -17385,7 +17403,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:295
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "%g"
msgstr ""
@@ -17397,7 +17415,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:300
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "%m"
msgstr ""
@@ -17409,7 +17427,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:302
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "%a"
msgstr ""
@@ -17421,7 +17439,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:304
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "%u"
msgstr ""
@@ -17613,7 +17631,7 @@ msgstr ""
#. type: Title =
#: en/git-daemon.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-daemon(1)"
msgstr ""
@@ -17625,7 +17643,7 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:25
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git daemon' [--verbose] [--syslog] [--export-all]\n"
"\t [--timeout=<n>] [--init-timeout=<n>] [--max-connections=<n>]\n"
@@ -17693,7 +17711,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:62
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--base-path-relaxed"
msgstr ""
@@ -17723,7 +17741,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:83
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--inetd"
msgstr ""
@@ -17795,7 +17813,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:114
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--syslog"
msgstr ""
@@ -17855,7 +17873,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:138
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--user-path"
msgstr ""
@@ -17879,7 +17897,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:151
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--reuseaddr"
msgstr ""
@@ -17975,7 +17993,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:196
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]informative-errors"
msgstr ""
@@ -18179,7 +18197,7 @@ msgstr ""
#. type: Title =
#: en/git-describe.txt:2
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "git-describe(1)"
msgstr ""
@@ -18191,7 +18209,7 @@ msgstr ""
#. type: Plain text
#: en/git-describe.txt:14
-#, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]\n"
"'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]\n"
@@ -18218,7 +18236,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:37
-#, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:260
msgid "<commit-ish>..."
msgstr ""
@@ -18260,7 +18278,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:60
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--contains"
msgstr ""
@@ -18290,7 +18308,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:78
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--exact-match"
msgstr ""
@@ -18302,7 +18320,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:82 en/git-ls-files.txt:159
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--debug"
msgstr ""
@@ -18314,7 +18332,7 @@ msgstr ""
#. type: Plain text
#: en/git-describe.txt:95
-#, priority:260
+#, ignore-ellipsis, priority:260
msgid "Always output the long format (the tag, the number of commits and the abbreviated commit name) even when it matches a tag. This is useful when you want to see parts of the commit object name in \"describe\" output, even when the commit in question happens to be a tagged version. Instead of just emitting the tag name, it will describe such a commit as v1.2-0-gdeadbee (0th commit since tag v1.2 that points at object deadbee....)."
msgstr ""
@@ -18344,7 +18362,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:118 en/git-diff-tree.txt:115 en/git-name-rev.txt:61
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--always"
msgstr ""
@@ -18356,7 +18374,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:121 en/rev-list-options.txt:124
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--first-parent"
msgstr ""
@@ -18480,7 +18498,7 @@ msgstr ""
#. type: Title =
#: en/git-diff-files.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-diff-files(1)"
msgstr ""
@@ -18492,7 +18510,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff-files.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...]\n"
msgstr ""
@@ -18533,8 +18551,8 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:976
-#, no-wrap, priority:260
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:992
+#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr ""
@@ -18552,7 +18570,7 @@ msgstr ""
#. type: Title =
#: en/git-diff-index.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-diff-index(1)"
msgstr ""
@@ -18564,7 +18582,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git diff-index' [-m] [--cached] [<common diff options>] <tree-ish> [<path>...]\n"
msgstr ""
@@ -18703,7 +18721,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:102
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" torvalds@ppc970:~/v2.6/linux> git diff-index --abbrev HEAD\n"
" :100644 100664 7476bb... 000000... kernel/sched.c\n"
@@ -18729,7 +18747,7 @@ msgstr ""
#. type: Title =
#: en/git-difftool.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-difftool(1)"
msgstr ""
@@ -18741,7 +18759,7 @@ msgstr ""
#. type: Plain text
#: en/git-difftool.txt:12
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
msgstr ""
@@ -18753,7 +18771,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:23
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--dir-diff"
msgstr ""
@@ -18765,13 +18783,13 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:28 en/git-mergetool.txt:70
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "-y"
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:29 en/git-mergetool.txt:71
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--no-prompt"
msgstr ""
@@ -18783,7 +18801,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:32 en/git-mergetool.txt:78
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--prompt"
msgstr ""
@@ -18837,7 +18855,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:69 en/git-mergetool.txt:67
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--tool-help"
msgstr ""
@@ -18849,7 +18867,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:72
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]symlinks"
msgstr ""
@@ -18885,13 +18903,13 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:88 en/git-help.txt:59 en/git-mergetool.txt:82 en/git-show-branch.txt:111 en/git-update-index.txt:122 en/rev-list-options.txt:264
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "-g"
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:89
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]gui"
msgstr ""
@@ -18903,7 +18921,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:97
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]trust-exit-code"
msgstr ""
@@ -18939,7 +18957,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:113
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "diff.tool"
msgstr ""
@@ -18951,7 +18969,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:116
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "diff.guitool"
msgstr ""
@@ -18993,7 +19011,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:128
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "difftool.prompt"
msgstr ""
@@ -19005,7 +19023,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:131
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "difftool.trustExitCode"
msgstr ""
@@ -19041,7 +19059,7 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-diff-tree(1)"
msgstr ""
@@ -19053,7 +19071,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root]\n"
@@ -19085,8 +19103,8 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:422
-#, no-wrap, priority:280
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:423
+#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -19158,7 +19176,7 @@ msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:84
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-commit-id"
msgstr ""
@@ -19181,13 +19199,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:982
-#, no-wrap, priority:260
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:998
+#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr ""
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:988
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1004
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -19200,7 +19218,7 @@ msgstr ""
#. type: Title =
#: en/git-diff.txt:2
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "git-diff(1)"
msgstr ""
@@ -19212,7 +19230,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:17
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git diff' [<options>] [<commit>] [--] [<path>...]\n"
"'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
@@ -19229,7 +19247,7 @@ msgstr ""
#. type: Labeled list
#: en/git-diff.txt:24
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] [--] [<path>...]"
msgstr ""
@@ -19253,7 +19271,7 @@ msgstr ""
#. type: Labeled list
#: en/git-diff.txt:41
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
msgstr ""
@@ -19265,7 +19283,7 @@ msgstr ""
#. type: Labeled list
#: en/git-diff.txt:51
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit> [--] [<path>...]"
msgstr ""
@@ -19277,7 +19295,7 @@ msgstr ""
#. type: Labeled list
#: en/git-diff.txt:59
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
msgstr ""
@@ -19289,7 +19307,7 @@ msgstr ""
#. type: Labeled list
#: en/git-diff.txt:64
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
msgstr ""
@@ -19301,13 +19319,13 @@ msgstr ""
#. type: Labeled list
#: en/git-diff.txt:70
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
msgstr ""
#. type: Plain text
#: en/git-diff.txt:77
-#, priority:280
+#, ignore-ellipsis, priority:280
msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>. \"git diff A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\". You can omit any one of <commit>, which has the same effect as using HEAD instead."
msgstr ""
@@ -19319,7 +19337,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:89
-#, priority:280
+#, ignore-ellipsis, priority:280
msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]. However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
msgstr ""
@@ -19427,7 +19445,7 @@ msgstr ""
#. type: delimited block -
#: en/git-diff.txt:160
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git diff topic master <1>\n"
"$ git diff topic..master <2>\n"
@@ -19519,7 +19537,7 @@ msgstr ""
#. type: Title =
#: en/git-fast-export.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-fast-export(1)"
msgstr ""
@@ -19542,9 +19560,9 @@ msgid "This program dumps the given revisions in a form suitable to be piped int
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:22
+#: en/git-fast-export.txt:23
#, priority:100
-msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a kind of an interactive 'git filter-branch'."
+msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
@@ -19631,146 +19649,158 @@ msgstr ""
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
+#. type: Labeled list
+#: en/git-fast-export.txt:79
+#, ignore-same, no-wrap, priority:100
+msgid "--mark-tags"
+msgstr ""
+
#. type: Plain text
-#: en/git-fast-export.txt:83
+#: en/git-fast-export.txt:87
#, priority:100
-msgid "Any commits that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
+msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:92
+#, priority:100
+msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:84
-#, no-wrap, priority:100
+#: en/git-fast-export.txt:93
+#, ignore-same, no-wrap, priority:100
msgid "--fake-missing-tagger"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:89
+#: en/git-fast-export.txt:98
#, priority:100
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:90
-#, no-wrap, priority:100
+#: en/git-fast-export.txt:99
+#, ignore-same, no-wrap, priority:100
msgid "--use-done-feature"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:93
+#: en/git-fast-export.txt:102
#, priority:100
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:94
-#, no-wrap, priority:100
+#: en/git-fast-export.txt:103
+#, ignore-same, no-wrap, priority:100
msgid "--no-data"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:101
+#: en/git-fast-export.txt:110
#, priority:100
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
-#, no-wrap, priority:100
+#: en/git-fast-export.txt:111 en/git-ls-tree.txt:72
+#, ignore-same, no-wrap, priority:100
msgid "--full-tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:107
+#: en/git-fast-export.txt:116
#, priority:100
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:108
-#, no-wrap, priority:100
+#: en/git-fast-export.txt:117
+#, ignore-same, no-wrap, priority:100
msgid "--anonymize"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:112
+#: en/git-fast-export.txt:121
#, priority:100
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:113
-#, no-wrap, priority:100
+#: en/git-fast-export.txt:122
+#, ignore-same, no-wrap, priority:100
msgid "--reference-excluded-parents"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:124
+#: en/git-fast-export.txt:133
#, priority:100
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:125
-#, no-wrap, priority:100
+#: en/git-fast-export.txt:134
+#, ignore-same, no-wrap, priority:100
msgid "--show-original-ids"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:131
+#: en/git-fast-export.txt:140
#, priority:100
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:132
+#: en/git-fast-export.txt:141
#, no-wrap, priority:100
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:138
+#: en/git-fast-export.txt:147
#, priority:100
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be reencoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:139
-#, no-wrap, priority:100
+#: en/git-fast-export.txt:148
+#, ignore-same, no-wrap, priority:100
msgid "--refspec"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:142
+#: en/git-fast-export.txt:151
#, priority:100
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:143
-#, no-wrap, priority:100
+#: en/git-fast-export.txt:152
+#, ignore-ellipsis, no-wrap, priority:100
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:160
#, priority:100
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:157
+#: en/git-fast-export.txt:166
#, no-wrap, priority:100
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:162
+#: en/git-fast-export.txt:171
#, priority:100
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:167
+#: en/git-fast-export.txt:176
#, no-wrap, priority:100
msgid ""
"$ git fast-export master~5..master |\n"
@@ -19779,56 +19809,56 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:180
#, priority:100
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:175
+#: en/git-fast-export.txt:184
#, priority:100
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
-#: en/git-fast-export.txt:178
+#: en/git-fast-export.txt:187
#, no-wrap, priority:100
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:186
+#: en/git-fast-export.txt:195
#, priority:100
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:198
+#: en/git-fast-export.txt:207
#, priority:100
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:201
+#: en/git-fast-export.txt:210
#, priority:100
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:204
+#: en/git-fast-export.txt:213
#, no-wrap, priority:100
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:209
+#: en/git-fast-export.txt:218
#, priority:100
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:215
-#, no-wrap, priority:100
+#: en/git-fast-export.txt:224
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -19837,32 +19867,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:222
+#: en/git-fast-export.txt:231
#, priority:100
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:225
+#: en/git-fast-export.txt:234
#, no-wrap, priority:100
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:240
#, priority:100
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:239
+#: en/git-fast-export.txt:248
#, priority:100
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-fast-import(1)"
msgstr ""
@@ -19910,7 +19940,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--stats"
msgstr ""
@@ -19952,7 +19982,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:69
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--done"
msgstr ""
@@ -19994,7 +20024,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:99
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]relative-marks"
msgstr ""
@@ -20078,7 +20108,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:140
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "fastimport.unpackLimit"
msgstr ""
@@ -20089,7 +20119,7 @@ msgid "See linkgit:git-config[1]"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:144 en/git-p4.txt:507
+#: en/git-fast-import.txt:144 en/git-filter-branch.txt:463 en/git-p4.txt:507
#, no-wrap, priority:100
msgid "PERFORMANCE"
msgstr ""
@@ -20204,7 +20234,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:239
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`raw`"
msgstr ""
@@ -20282,7 +20312,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:292
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`now`"
msgstr ""
@@ -20323,8 +20353,8 @@ msgid "fast-import accepts several commands to update the current repository and
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:319 en/git-fast-import.txt:381
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:319 en/git-fast-import.txt:388
+#, ignore-same, no-wrap, priority:100
msgid "`commit`"
msgstr ""
@@ -20335,8 +20365,8 @@ msgid "Creates a new branch or updates an existing branch by creating a new comm
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:324 en/git-fast-import.txt:771
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:324 en/git-fast-import.txt:778
+#, ignore-same, no-wrap, priority:100
msgid "`tag`"
msgstr ""
@@ -20347,8 +20377,8 @@ msgid "Creates an annotated tag object from an existing commit or branch. Light
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:330 en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:330 en/git-fast-import.txt:823
+#, ignore-same, no-wrap, priority:100
msgid "`reset`"
msgstr ""
@@ -20359,8 +20389,8 @@ msgid "Reset an existing branch (or a new branch) to a specific revision. This
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:335 en/git-fast-import.txt:844
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:335 en/git-fast-import.txt:852
+#, ignore-same, no-wrap, priority:100
msgid "`blob`"
msgstr ""
@@ -20371,109 +20401,121 @@ msgid "Convert raw file data into a blob, for future use in a `commit` command.
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:340 en/git-fast-import.txt:917
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:340 en/git-fast-import.txt:925
+#, ignore-same, no-wrap, priority:100
+msgid "`alias`"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:346
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
+msgstr ""
+
+#. type: Title ~
+#: en/git-fast-import.txt:347 en/git-fast-import.txt:940
+#, ignore-same, no-wrap, priority:100
msgid "`checkpoint`"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:345
+#: en/git-fast-import.txt:352
#, priority:100
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:346 en/git-fast-import.txt:945
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:353 en/git-fast-import.txt:968
+#, ignore-same, no-wrap, priority:100
msgid "`progress`"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:350
+#: en/git-fast-import.txt:357
#, priority:100
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:351 en/git-fast-import.txt:1152
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:358 en/git-fast-import.txt:1175
+#, ignore-same, no-wrap, priority:100
msgid "`done`"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:355
+#: en/git-fast-import.txt:362
#, priority:100
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:356 en/git-fast-import.txt:970
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:363 en/git-fast-import.txt:993
+#, ignore-same, no-wrap, priority:100
msgid "`get-mark`"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:360
+#: en/git-fast-import.txt:367
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:361 en/git-fast-import.txt:985
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:368 en/git-fast-import.txt:1008
+#, ignore-same, no-wrap, priority:100
msgid "`cat-blob`"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:365
+#: en/git-fast-import.txt:372
#, priority:100
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:366 en/git-fast-import.txt:1016
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:373 en/git-fast-import.txt:1039
+#, ignore-same, no-wrap, priority:100
msgid "`ls`"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:370
+#: en/git-fast-import.txt:377
#, priority:100
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:371 en/git-fast-import.txt:1069
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:378 en/git-fast-import.txt:1092
+#, ignore-same, no-wrap, priority:100
msgid "`feature`"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
#, priority:100
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:1124
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:1147
+#, ignore-same, no-wrap, priority:100
msgid "`option`"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:379
+#: en/git-fast-import.txt:386
#, priority:100
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:384
+#: en/git-fast-import.txt:391
#, priority:100
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
#, no-wrap, priority:100
msgid ""
"\t'commit' SP <ref> LF\n"
@@ -20484,247 +20526,247 @@ msgid ""
"\t('encoding' SP <encoding>)?\n"
"\tdata\n"
"\t('from' SP <commit-ish> LF)?\n"
-"\t('merge' SP <commit-ish> LF)?\n"
+"\t('merge' SP <commit-ish> LF)*\n"
"\t(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*\n"
"\tLF?\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:405
+#: en/git-fast-import.txt:412
#, priority:100
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:411
+#: en/git-fast-import.txt:418
#, priority:100
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:417
+#: en/git-fast-import.txt:424
#, priority:100
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:425
+#: en/git-fast-import.txt:432
#, priority:100
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:432
+#: en/git-fast-import.txt:439
#, priority:100
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:434
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:441
+#, ignore-same, no-wrap, priority:100
msgid "`author`"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:440
+#: en/git-fast-import.txt:447
#, priority:100
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:442
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:449
+#, ignore-same, no-wrap, priority:100
msgid "`committer`"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:445
+#: en/git-fast-import.txt:452
#, priority:100
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
#, priority:100
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:458
+#: en/git-fast-import.txt:465
#, priority:100
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:460
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:467
+#, ignore-same, no-wrap, priority:100
msgid "`encoding`"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:464
+#: en/git-fast-import.txt:471
#, priority:100
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:466
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:473
+#, ignore-same, no-wrap, priority:100
msgid "`from`"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:472
+#: en/git-fast-import.txt:479
#, priority:100
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
#, priority:100
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:485
+#: en/git-fast-import.txt:492
#, priority:100
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
#, priority:100
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:491
+#: en/git-fast-import.txt:498
#, priority:100
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:493
+#: en/git-fast-import.txt:500
#, priority:100
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:499
+#: en/git-fast-import.txt:506
#, priority:100
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:501
+#: en/git-fast-import.txt:508
#, priority:100
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:503
+#: en/git-fast-import.txt:510
#, priority:100
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
#, priority:100
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:509
+#: en/git-fast-import.txt:516
#, priority:100
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:512
+#: en/git-fast-import.txt:519
#, priority:100
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
#, no-wrap, priority:100
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:521
+#: en/git-fast-import.txt:528
#, priority:100
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:523
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:530
+#, ignore-same, no-wrap, priority:100
msgid "`merge`"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:531
+#: en/git-fast-import.txt:538
#, priority:100
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:534
+#: en/git-fast-import.txt:541
#, priority:100
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:536
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:543
+#, ignore-same, no-wrap, priority:100
msgid "`filemodify`"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:540
+#: en/git-fast-import.txt:547
#, priority:100
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:541 en/git-fast-import.txt:708
+#: en/git-fast-import.txt:548 en/git-fast-import.txt:715
#, no-wrap, priority:100
msgid "External data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:544
+#: en/git-fast-import.txt:551
#, priority:100
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:547
+#: en/git-fast-import.txt:554
#, no-wrap, priority:100
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
#, priority:100
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:555 en/git-fast-import.txt:721
+#: en/git-fast-import.txt:562 en/git-fast-import.txt:728
#, no-wrap, priority:100
msgid "Inline data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:559
+#: en/git-fast-import.txt:566
#, priority:100
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
#, no-wrap, priority:100
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -20732,259 +20774,259 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:566 en/git-fast-import.txt:732
+#: en/git-fast-import.txt:573 en/git-fast-import.txt:739
#, priority:100
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:569
+#: en/git-fast-import.txt:576
#, priority:100
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
#, priority:100
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:574
+#: en/git-fast-import.txt:581
#, priority:100
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:575
+#: en/git-fast-import.txt:582
#, priority:100
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
#, priority:100
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:580
+#: en/git-fast-import.txt:587
#, priority:100
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:583
+#: en/git-fast-import.txt:590
#, priority:100
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:587
+#: en/git-fast-import.txt:594
#, priority:100
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:594
+#: en/git-fast-import.txt:601
#, priority:100
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
#, priority:100
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:598
+#: en/git-fast-import.txt:605
#, priority:100
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:599
+#: en/git-fast-import.txt:606
#, priority:100
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:600
+#: en/git-fast-import.txt:607
#, priority:100
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:602
+#: en/git-fast-import.txt:609
#, priority:100
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:604
+#: en/git-fast-import.txt:611
#, priority:100
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:606
+#: en/git-fast-import.txt:613
#, priority:100
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:608
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:615
+#, ignore-same, no-wrap, priority:100
msgid "`filedelete`"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:614
+#: en/git-fast-import.txt:621
#, priority:100
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
#, no-wrap, priority:100
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
#, priority:100
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:624
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:631
+#, ignore-same, no-wrap, priority:100
msgid "`filecopy`"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
#, priority:100
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:632
+#: en/git-fast-import.txt:639
#, no-wrap, priority:100
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:638 en/git-fast-import.txt:658
+#: en/git-fast-import.txt:645 en/git-fast-import.txt:665
#, priority:100
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:643
+#: en/git-fast-import.txt:650
#, priority:100
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:645
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:652
+#, ignore-same, no-wrap, priority:100
msgid "`filerename`"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:649
+#: en/git-fast-import.txt:656
#, priority:100
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:652
+#: en/git-fast-import.txt:659
#, no-wrap, priority:100
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:663
+#: en/git-fast-import.txt:670
#, priority:100
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:672
+#: en/git-fast-import.txt:679
#, priority:100
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:674
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:681
+#, ignore-same, no-wrap, priority:100
msgid "`filedeleteall`"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:679
+#: en/git-fast-import.txt:686
#, priority:100
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:682
+#: en/git-fast-import.txt:689
#, no-wrap, priority:100
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:688
+#: en/git-fast-import.txt:695
#, priority:100
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:696
+#: en/git-fast-import.txt:703
#, priority:100
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:698
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:705
+#, ignore-same, no-wrap, priority:100
msgid "`notemodify`"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:707
+#: en/git-fast-import.txt:714
#, priority:100
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:712
+#: en/git-fast-import.txt:719
#, priority:100
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:715
+#: en/git-fast-import.txt:722
#, no-wrap, priority:100
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:720
+#: en/git-fast-import.txt:727
#, priority:100
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:725
+#: en/git-fast-import.txt:732
#, priority:100
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:729
+#: en/git-fast-import.txt:736
#, no-wrap, priority:100
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -20992,76 +21034,77 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:735
+#: en/git-fast-import.txt:742
#, priority:100
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:737
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:744
+#, ignore-same, no-wrap, priority:100
msgid "`mark`"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:743
+#: en/git-fast-import.txt:750
#, priority:100
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:746
+#: en/git-fast-import.txt:753
#, no-wrap, priority:100
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:752
+#: en/git-fast-import.txt:759
#, priority:100
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:756
+#: en/git-fast-import.txt:763
#, priority:100
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:758
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:765
+#, ignore-same, no-wrap, priority:100
msgid "`original-oid`"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:763
+#: en/git-fast-import.txt:770
#, priority:100
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:766
+#: en/git-fast-import.txt:773
#, no-wrap, priority:100
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:769
+#: en/git-fast-import.txt:776
#, priority:100
msgid "where `<object-identifer>` is any string not containing LF."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:774
+#: en/git-fast-import.txt:781
#, priority:100
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:781
+#: en/git-fast-import.txt:789
#, no-wrap, priority:100
msgid ""
"\t'tag' SP <name> LF\n"
+"\tmark?\n"
"\t'from' SP <commit-ish> LF\n"
"\toriginal-oid?\n"
"\t'tagger' (SP <name>)? SP LT <email> GT SP <when> LF\n"
@@ -21069,55 +21112,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:784
+#: en/git-fast-import.txt:792
#, priority:100
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:789
+#: en/git-fast-import.txt:797
#, priority:100
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:793
+#: en/git-fast-import.txt:801
#, priority:100
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:796
+#: en/git-fast-import.txt:804
#, priority:100
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:799
+#: en/git-fast-import.txt:807
#, priority:100
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:813
#, priority:100
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:813
+#: en/git-fast-import.txt:821
#, priority:100
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:820
+#: en/git-fast-import.txt:828
#, priority:100
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:825
+#: en/git-fast-import.txt:833
#, no-wrap, priority:100
msgid ""
"\t'reset' SP <ref> LF\n"
@@ -21126,25 +21169,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:829
+#: en/git-fast-import.txt:837
#, priority:100
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:831 en/git-fast-import.txt:943
+#: en/git-fast-import.txt:839 en/git-fast-import.txt:966
#, priority:100
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:834
+#: en/git-fast-import.txt:842
#, priority:100
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:838
+#: en/git-fast-import.txt:846
#, no-wrap, priority:100
msgid ""
"\treset refs/tags/938\n"
@@ -21152,19 +21195,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:850
#, priority:100
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:849
+#: en/git-fast-import.txt:857
#, priority:100
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:855
+#: en/git-fast-import.txt:863
#, no-wrap, priority:100
msgid ""
"\t'blob' LF\n"
@@ -21174,43 +21217,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:861
+#: en/git-fast-import.txt:869
#, priority:100
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:863
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:871
+#, ignore-same, no-wrap, priority:100
msgid "`data`"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:870
+#: en/git-fast-import.txt:878
#, priority:100
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:875
+#: en/git-fast-import.txt:883
#, priority:100
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:876
+#: en/git-fast-import.txt:884
#, no-wrap, priority:100
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:878
+#: en/git-fast-import.txt:886
#, priority:100
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:882
+#: en/git-fast-import.txt:890
#, no-wrap, priority:100
msgid ""
"\t'data' SP <count> LF\n"
@@ -21218,31 +21261,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:888
+#: en/git-fast-import.txt:896
#, priority:100
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:893
+#: en/git-fast-import.txt:901
#, priority:100
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:894
+#: en/git-fast-import.txt:902
#, no-wrap, priority:100
msgid "Delimited format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:899
+#: en/git-fast-import.txt:907
#, priority:100
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:905
+#: en/git-fast-import.txt:913
#, no-wrap, priority:100
msgid ""
"\t'data' SP '<<' <delim> LF\n"
@@ -21252,25 +21295,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:921
#, priority:100
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:915
+#: en/git-fast-import.txt:923
#, priority:100
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:920
+#: en/git-fast-import.txt:928
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object."
+msgstr ""
+
+#. type: delimited block .
+#: en/git-fast-import.txt:934
+#, no-wrap, priority:100
+msgid ""
+"\t'alias' LF\n"
+"\tmark\n"
+"\t'to' SP <commit-ish> LF\n"
+"\tLF?\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:937
+#, priority:100
+msgid "For a detailed description of `<commit-ish>` see above under `from`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:943
#, priority:100
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:924
+#: en/git-fast-import.txt:947
#, no-wrap, priority:100
msgid ""
"\t'checkpoint' LF\n"
@@ -21278,31 +21343,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:930
+#: en/git-fast-import.txt:953
#, priority:100
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:935
+#: en/git-fast-import.txt:958
#, priority:100
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:941
+#: en/git-fast-import.txt:964
#, priority:100
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:950
+#: en/git-fast-import.txt:973
#, priority:100
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:954
+#: en/git-fast-import.txt:977
#, no-wrap, priority:100
msgid ""
"\t'progress' SP <any> LF\n"
@@ -21310,67 +21375,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:960
+#: en/git-fast-import.txt:983
#, priority:100
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:986
#, no-wrap, priority:100
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:968
+#: en/git-fast-import.txt:991
#, priority:100
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:976
+#: en/git-fast-import.txt:999
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:979
+#: en/git-fast-import.txt:1002
#, no-wrap, priority:100
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:983 en/git-fast-import.txt:1014 en/git-fast-import.txt:1067
+#: en/git-fast-import.txt:1006 en/git-fast-import.txt:1037 en/git-fast-import.txt:1090
#, priority:100
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:991
+#: en/git-fast-import.txt:1014
#, priority:100
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:994
+#: en/git-fast-import.txt:1017
#, no-wrap, priority:100
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1022
#, priority:100
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:1024
#, priority:100
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1005
+#: en/git-fast-import.txt:1028
#, no-wrap, priority:100
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21378,283 +21443,283 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1011
+#: en/git-fast-import.txt:1034
#, priority:100
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1022
+#: en/git-fast-import.txt:1045
#, priority:100
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1025
+#: en/git-fast-import.txt:1048
#, priority:100
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1049
#, no-wrap, priority:100
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1030
+#: en/git-fast-import.txt:1053
#, priority:100
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1033
+#: en/git-fast-import.txt:1056
#, no-wrap, priority:100
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1035
+#: en/git-fast-import.txt:1058
#, no-wrap, priority:100
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1041
+#: en/git-fast-import.txt:1064
#, priority:100
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1044
+#: en/git-fast-import.txt:1067
#, no-wrap, priority:100
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1047
+#: en/git-fast-import.txt:1070
#, priority:100
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1072
#, priority:100
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1075
#, no-wrap, priority:100
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1080
#, priority:100
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1060
+#: en/git-fast-import.txt:1083
#, priority:100
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1086
#, no-wrap, priority:100
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1072
+#: en/git-fast-import.txt:1095
#, priority:100
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1075
+#: en/git-fast-import.txt:1098
#, no-wrap, priority:100
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1078
+#: en/git-fast-import.txt:1101
#, priority:100
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1079 en/git-fast-import.txt:1146
+#: en/git-fast-import.txt:1102 en/git-fast-import.txt:1169
#, no-wrap, priority:100
msgid "date-format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1080 en/git-fast-import.txt:1148
+#: en/git-fast-import.txt:1103 en/git-fast-import.txt:1171
#, no-wrap, priority:100
msgid "export-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1081
+#: en/git-fast-import.txt:1104
#, no-wrap, priority:100
msgid "relative-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1082
+#: en/git-fast-import.txt:1105
#, no-wrap, priority:100
msgid "no-relative-marks"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1083 en/git-fast-import.txt:1150
+#: en/git-fast-import.txt:1106 en/git-fast-import.txt:1173
#, no-wrap, priority:100
msgid "force"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1087
+#: en/git-fast-import.txt:1110
#, priority:100
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1088 en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1111 en/git-fast-import.txt:1170
#, no-wrap, priority:100
msgid "import-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1089
+#: en/git-fast-import.txt:1112
#, no-wrap, priority:100
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1097
+#: en/git-fast-import.txt:1120
#, priority:100
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1098
+#: en/git-fast-import.txt:1121
#, no-wrap, priority:100
msgid "get-mark"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1122
#, no-wrap, priority:100
msgid "cat-blob"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1100
+#: en/git-fast-import.txt:1123
#, no-wrap, priority:100
msgid "ls"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1108
+#: en/git-fast-import.txt:1131
#, priority:100
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1109
+#: en/git-fast-import.txt:1132
#, no-wrap, priority:100
msgid "notes"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1114
+#: en/git-fast-import.txt:1137
#, priority:100
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1138
#, no-wrap, priority:100
msgid "done"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1122
+#: en/git-fast-import.txt:1145
#, priority:100
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1129
+#: en/git-fast-import.txt:1152
#, priority:100
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1132
+#: en/git-fast-import.txt:1155
#, no-wrap, priority:100
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1137
+#: en/git-fast-import.txt:1160
#, priority:100
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1141
+#: en/git-fast-import.txt:1164
#, priority:100
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1144
+#: en/git-fast-import.txt:1167
#, priority:100
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1149
+#: en/git-fast-import.txt:1172
#, priority:100
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1178
#, priority:100
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1159
+#: en/git-fast-import.txt:1182
#, priority:100
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1161
+#: en/git-fast-import.txt:1184
#, no-wrap, priority:100
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1168
+#: en/git-fast-import.txt:1191
#, priority:100
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1175
+#: en/git-fast-import.txt:1198
#, priority:100
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1203
#, no-wrap, priority:100
msgid ""
"\tmkfifo fast-import-output\n"
@@ -21663,49 +21728,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1184
+#: en/git-fast-import.txt:1207
#, priority:100
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1188
+#: en/git-fast-import.txt:1211
#, priority:100
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1213
#, no-wrap, priority:100
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1196
+#: en/git-fast-import.txt:1219
#, priority:100
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1203
+#: en/git-fast-import.txt:1226
#, priority:100
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1211
+#: en/git-fast-import.txt:1234
#, priority:100
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1236
#, priority:100
msgid "An example crash:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1229
+#: en/git-fast-import.txt:1252
#, no-wrap, priority:100
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
@@ -21725,7 +21790,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1256
#, no-wrap, priority:100
msgid ""
"\t$ git fast-import <in\n"
@@ -21734,7 +21799,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1239
+#: en/git-fast-import.txt:1262
#, no-wrap, priority:100
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
@@ -21745,13 +21810,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1241
+#: en/git-fast-import.txt:1264
#, no-wrap, priority:100
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1251
+#: en/git-fast-import.txt:1274
#, no-wrap, priority:100
msgid ""
"\tMost Recent Commands Before Crash\n"
@@ -21766,13 +21831,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1252
+#: en/git-fast-import.txt:1275
#, no-wrap, priority:100
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1255
+#: en/git-fast-import.txt:1278
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
@@ -21780,25 +21845,25 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1256
+#: en/git-fast-import.txt:1279
#, no-wrap, priority:100
msgid "active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1259
+#: en/git-fast-import.txt:1282
#, priority:100
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1260
+#: en/git-fast-import.txt:1283
#, priority:100
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1264
+#: en/git-fast-import.txt:1287
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
@@ -21807,7 +21872,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1270
+#: en/git-fast-import.txt:1293
#, no-wrap, priority:100
msgid ""
"status : active loaded dirty\n"
@@ -21819,314 +21884,314 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1274
+#: en/git-fast-import.txt:1297
#, priority:100
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1277
+#: en/git-fast-import.txt:1300
#, no-wrap, priority:100
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1280
+#: en/git-fast-import.txt:1303
#, priority:100
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1282
+#: en/git-fast-import.txt:1305
#, no-wrap, priority:100
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1290
+#: en/git-fast-import.txt:1313
#, priority:100
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1294
+#: en/git-fast-import.txt:1317
#, priority:100
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1296
+#: en/git-fast-import.txt:1319
#, no-wrap, priority:100
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1301
+#: en/git-fast-import.txt:1324
#, priority:100
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1305
+#: en/git-fast-import.txt:1328
#, priority:100
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1307
+#: en/git-fast-import.txt:1330
#, no-wrap, priority:100
msgid "Handling Renames"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1312
+#: en/git-fast-import.txt:1335
#, priority:100
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1337
#, no-wrap, priority:100
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1341
#, priority:100
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1325
+#: en/git-fast-import.txt:1348
#, priority:100
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1331
+#: en/git-fast-import.txt:1354
#, priority:100
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1337
+#: en/git-fast-import.txt:1360
#, priority:100
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1363
#, priority:100
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1342
+#: en/git-fast-import.txt:1365
#, no-wrap, priority:100
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1346
+#: en/git-fast-import.txt:1369
#, priority:100
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1353
+#: en/git-fast-import.txt:1376
#, priority:100
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1358
+#: en/git-fast-import.txt:1381
#, priority:100
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1360
+#: en/git-fast-import.txt:1383
#, no-wrap, priority:100
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1367
+#: en/git-fast-import.txt:1390
#, priority:100
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1369
+#: en/git-fast-import.txt:1392
#, no-wrap, priority:100
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1399
#, priority:100
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1379
+#: en/git-fast-import.txt:1402
#, no-wrap, priority:100
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1385
+#: en/git-fast-import.txt:1408
#, priority:100
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1393
+#: en/git-fast-import.txt:1416
#, priority:100
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1423
#, priority:100
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1407
+#: en/git-fast-import.txt:1430
#, priority:100
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1415
+#: en/git-fast-import.txt:1438
#, priority:100
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1417
+#: en/git-fast-import.txt:1440
#, no-wrap, priority:100
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1423
+#: en/git-fast-import.txt:1446
#, priority:100
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1448
#, no-wrap, priority:100
msgid "per object"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1432
+#: en/git-fast-import.txt:1455
#, priority:100
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1438
+#: en/git-fast-import.txt:1461
#, priority:100
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1440
+#: en/git-fast-import.txt:1463
#, no-wrap, priority:100
msgid "per mark"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1446
+#: en/git-fast-import.txt:1469
#, priority:100
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1448
+#: en/git-fast-import.txt:1471
#, no-wrap, priority:100
msgid "per branch"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1474
#, priority:100
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1457
+#: en/git-fast-import.txt:1480
#, priority:100
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1464
+#: en/git-fast-import.txt:1487
#, priority:100
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1468
+#: en/git-fast-import.txt:1491
#, priority:100
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1496
#, priority:100
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1498
#, no-wrap, priority:100
msgid "per active tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1480
+#: en/git-fast-import.txt:1503
#, priority:100
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1482
+#: en/git-fast-import.txt:1505
#, no-wrap, priority:100
msgid "per active file entry"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1488
+#: en/git-fast-import.txt:1511
#, priority:100
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1493
+#: en/git-fast-import.txt:1516
#, priority:100
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1495
+#: en/git-fast-import.txt:1518
#, no-wrap, priority:100
msgid "SIGNALS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1501
+#: en/git-fast-import.txt:1524
#, priority:100
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
#. type: Title =
#: en/git-fetch-pack.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-fetch-pack(1)"
msgstr ""
@@ -22138,7 +22203,7 @@ msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:16
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git fetch-pack' [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag]\n"
"\t[--upload-pack=<git-upload-pack>]\n"
@@ -22196,7 +22261,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:60 en/git-pack-objects.txt:208 en/git-send-pack.txt:64
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--thin"
msgstr ""
@@ -22208,7 +22273,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:64 en/git-pack-objects.txt:83
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--include-tag"
msgstr ""
@@ -22250,7 +22315,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:99
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--deepen-relative"
msgstr ""
@@ -22268,7 +22333,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:107 en/git-index-pack.txt:77
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--check-self-contained-and-connected"
msgstr ""
@@ -22292,7 +22357,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:86
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<refs>..."
msgstr ""
@@ -22310,7 +22375,7 @@ msgstr ""
#. type: Title =
#: en/git-fetch.txt:2
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "git-fetch(1)"
msgstr ""
@@ -22322,7 +22387,7 @@ msgstr ""
#. type: Plain text
#: en/git-fetch.txt:16
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git fetch' [<options>] [<repository> [<refspec>...]]\n"
"'git fetch' [<options>] <group>\n"
@@ -22597,7 +22662,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:215 en/git-push.txt:435
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "`-`"
msgstr ""
@@ -22609,7 +22674,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:216
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "`t`"
msgstr ""
@@ -22663,7 +22728,7 @@ msgstr ""
#. type: Plain text
#: en/git-fetch.txt:226
-#, priority:220
+#, ignore-ellipsis, priority:220
msgid "For a successfully fetched ref, the summary shows the old and new values of the ref in a form suitable for using as an argument to `git log` (this is `<old>..<new>` in most cases, and `<old>...<new>` for forced non-fast-forward updates)."
msgstr ""
@@ -22680,7 +22745,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1041
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -22773,7 +22838,7 @@ msgstr ""
#. type: Title =
#: en/git-filter-branch.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-filter-branch(1)"
msgstr ""
@@ -22785,7 +22850,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:18
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git filter-branch' [--setup <command>] [--subdirectory-filter <directory>]\n"
"\t[--env-filter <command>] [--tree-filter <command>]\n"
@@ -22796,20 +22861,32 @@ msgid ""
"\t[--state-branch <branch>] [--] [<rev-list options>...]\n"
msgstr ""
+#. type: Title -
+#: en/git-filter-branch.txt:20
+#, no-wrap, priority:100
+msgid "WARNING"
+msgstr ""
+
#. type: Plain text
-#: en/git-filter-branch.txt:27
+#: en/git-filter-branch.txt:31
+#, priority:100
+msgid "'git filter-branch' has a plethora of pitfalls that can produce non-obvious manglings of the intended history rewrite (and can leave you with little time to investigate such problems since it has such abysmal performance). These safety and performance issues cannot be backward compatibly fixed and as such, its use is not recommended. Please use an alternative history filtering tool such as https://github.com/newren/git-filter-repo/[git filter-repo]. If you still need to use 'git filter-branch', please carefully read <<SAFETY>> (and <<PERFORMANCE>>) to learn about the land mines of filter-branch, and then vigilantly avoid as many of the hazards listed there as reasonably possible."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:40
#, priority:100
msgid "Lets you rewrite Git revision history by rewriting the branches mentioned in the <rev-list options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge information) will be preserved."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:34
+#: en/git-filter-branch.txt:47
#, priority:100
msgid "The command will only rewrite the _positive_ refs mentioned in the command line (e.g. if you pass 'a..b', only 'b' will be rewritten). If you specify no filters, the commits will be recommitted without any changes, which would normally have no effect. Nevertheless, this may be useful in the future for compensating for some Git bugs or such, therefore such a usage is permitted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:39
+#: en/git-filter-branch.txt:52
#, no-wrap, priority:100
msgid ""
"*NOTE*: This command honors `.git/info/grafts` file and refs in\n"
@@ -22819,7 +22896,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:48
+#: en/git-filter-branch.txt:61
#, no-wrap, priority:100
msgid ""
"*WARNING*! The rewritten history will have different object names for all\n"
@@ -22833,337 +22910,337 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:52
+#: en/git-filter-branch.txt:65
#, priority:100
msgid "Always verify that the rewritten version is correct: The original refs, if different from the rewritten ones, will be stored in the namespace 'refs/original/'."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:56
+#: en/git-filter-branch.txt:69
#, priority:100
msgid "Note that since this operation is very I/O expensive, it might be a good idea to redirect the temporary directory off-disk with the `-d` option, e.g. on tmpfs. Reportedly the speedup is very noticeable."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:59
+#: en/git-filter-branch.txt:72
#, no-wrap, priority:100
msgid "Filters"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:71
+#: en/git-filter-branch.txt:84
#, priority:100
msgid "The filters are applied in the order as listed below. The <command> argument is always evaluated in the shell context using the 'eval' command (with the notable exception of the commit filter, for technical reasons). Prior to that, the `$GIT_COMMIT` environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, and GIT_COMMITTER_DATE are taken from the current commit and exported to the environment, in order to affect the author and committer identities of the replacement commit created by linkgit:git-commit-tree[1] after the filters have run."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:74
+#: en/git-filter-branch.txt:87
#, priority:100
msgid "If any evaluation of <command> returns a non-zero exit status, the whole operation will be aborted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:80
+#: en/git-filter-branch.txt:93
#, priority:100
msgid "A 'map' function is available that takes an \"original sha1 id\" argument and outputs a \"rewritten sha1 id\" if the commit has been already rewritten, and \"original sha1 id\" otherwise; the 'map' function can return several ids on separate lines if your commit filter emitted multiple commits."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:85
+#: en/git-filter-branch.txt:98
#, no-wrap, priority:100
msgid "--setup <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:91
+#: en/git-filter-branch.txt:104
#, priority:100
msgid "This is not a real filter executed for each commit but a one time setup just before the loop. Therefore no commit-specific variables are defined yet. Functions or variables defined here can be used or modified in the following filter steps except the commit filter, for technical reasons."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:92
+#: en/git-filter-branch.txt:105
#, no-wrap, priority:100
msgid "--subdirectory-filter <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:96
+#: en/git-filter-branch.txt:109
#, priority:100
msgid "Only look at the history which touches the given subdirectory. The result will contain that directory (and only that) as its project root. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:97
+#: en/git-filter-branch.txt:110
#, no-wrap, priority:100
msgid "--env-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:102
+#: en/git-filter-branch.txt:115
#, priority:100
msgid "This filter may be used if you only need to modify the environment in which the commit will be performed. Specifically, you might want to rewrite the author/committer name/email/time environment variables (see linkgit:git-commit-tree[1] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:103
+#: en/git-filter-branch.txt:116
#, no-wrap, priority:100
msgid "--tree-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:110
+#: en/git-filter-branch.txt:123
#, priority:100
msgid "This is the filter for rewriting the tree and its contents. The argument is evaluated in shell with the working directory set to the root of the checked out tree. The new tree is then used as-is (new files are auto-added, disappeared files are auto-removed - neither .gitignore files nor any other ignore rules *HAVE ANY EFFECT*!)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:111
+#: en/git-filter-branch.txt:124
#, no-wrap, priority:100
msgid "--index-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:117
-#, priority:100
+#: en/git-filter-branch.txt:130
+#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the index. It is similar to the tree filter but does not check out the tree, which makes it much faster. Frequently used with `git rm --cached --ignore-unmatch ...`, see EXAMPLES below. For hairy cases, see linkgit:git-update-index[1]."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:118
+#: en/git-filter-branch.txt:131
#, no-wrap, priority:100
msgid "--parent-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:125
-#, priority:100
+#: en/git-filter-branch.txt:138
+#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the commit's parent list. It will receive the parent string on stdin and shall output the new parent string on stdout. The parent string is in the format described in linkgit:git-commit-tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and \"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:126
+#: en/git-filter-branch.txt:139
#, no-wrap, priority:100
msgid "--msg-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:131
+#: en/git-filter-branch.txt:144
#, priority:100
msgid "This is the filter for rewriting the commit messages. The argument is evaluated in the shell with the original commit message on standard input; its standard output is used as the new commit message."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:132
+#: en/git-filter-branch.txt:145
#, no-wrap, priority:100
msgid "--commit-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:138
-#, priority:100
+#: en/git-filter-branch.txt:151
+#, ignore-ellipsis, priority:100
msgid "This is the filter for performing the commit. If this filter is specified, it will be called instead of the 'git commit-tree' command, with arguments of the form \"<TREE_ID> [(-p <PARENT_COMMIT_ID>)...]\" and the log message on stdin. The commit id is expected on stdout."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:142
+#: en/git-filter-branch.txt:155
#, priority:100
msgid "As a special extension, the commit filter may emit multiple commit ids; in that case, the rewritten children of the original commit will have all of them as parents."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:147
+#: en/git-filter-branch.txt:160
#, priority:100
msgid "You can use the 'map' convenience function in this filter, and other convenience functions, too. For example, calling 'skip_commit \"$@\"' will leave out the current commit (but not its changes! If you want that, use 'git rebase' instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:151
+#: en/git-filter-branch.txt:164
#, priority:100
msgid "You can also use the `git_commit_non_empty_tree \"$@\"` instead of `git commit-tree \"$@\"` if you don't wish to keep commits with a single parent and that makes no change to the tree."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:152
+#: en/git-filter-branch.txt:165
#, no-wrap, priority:100
msgid "--tag-name-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:158
+#: en/git-filter-branch.txt:171
#, priority:100
msgid "This is the filter for rewriting tag names. When passed, it will be called for every tag ref that points to a rewritten object (or to a tag object which points to a rewritten object). The original tag name is passed via standard input, and the new tag name is expected on standard output."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:163
+#: en/git-filter-branch.txt:176
#, priority:100
msgid "The original tags are not deleted, but can be overwritten; use \"--tag-name-filter cat\" to simply update the tags. In this case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:174
+#: en/git-filter-branch.txt:187
#, priority:100
msgid "Nearly proper rewriting of tag objects is supported. If the tag has a message attached, a new tag object will be created with the same message, author, and timestamp. If the tag has a signature attached, the signature will be stripped. It is by definition impossible to preserve signatures. The reason this is \"nearly\" proper, is because ideally if the tag did not change (points to the same object, has the same name, etc.) it should retain any signature. That is not the case, signatures will always be removed, buyer beware. There is also no support for changing the author or timestamp (or the tag message for that matter). Tags which point to other tags will be rewritten to point to the underlying commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:175
-#, no-wrap, priority:100
+#: en/git-filter-branch.txt:188
+#, ignore-same, no-wrap, priority:100
msgid "--prune-empty"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:182
+#: en/git-filter-branch.txt:195
#, priority:100
msgid "Some filters will generate empty commits that leave the tree untouched. This option instructs git-filter-branch to remove such commits if they have exactly one or zero non-pruned parents; merge commits will therefore remain intact. This option cannot be used together with `--commit-filter`, though the same effect can be achieved by using the provided `git_commit_non_empty_tree` function in a commit filter."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:183
+#: en/git-filter-branch.txt:196
#, no-wrap, priority:100
msgid "--original <namespace>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:186
+#: en/git-filter-branch.txt:199
#, priority:100
msgid "Use this option to set the namespace where the original commits will be stored. The default value is 'refs/original'."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:187
+#: en/git-filter-branch.txt:200
#, no-wrap, priority:100
msgid "-d <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:194
+#: en/git-filter-branch.txt:207
#, priority:100
msgid "Use this option to set the path to the temporary directory used for rewriting. When applying a tree filter, the command needs to temporarily check out the tree to some directory, which may consume considerable space in case of large projects. By default it does this in the `.git-rewrite/` directory but you can override that choice by this parameter."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:200
+#: en/git-filter-branch.txt:213
#, priority:100
msgid "'git filter-branch' refuses to start with an existing temporary directory or when there are already refs starting with 'refs/original/', unless forced."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:201
+#: en/git-filter-branch.txt:214
#, no-wrap, priority:100
msgid "--state-branch <branch>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:206
+#: en/git-filter-branch.txt:219
#, priority:100
msgid "This option will cause the mapping from old to new objects to be loaded from named branch upon startup and saved as a new commit to that branch upon exit, enabling incremental of large trees. If '<branch>' does not exist it will be created."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:207
-#, no-wrap, priority:100
+#: en/git-filter-branch.txt:220
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<rev-list options>..."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:212
+#: en/git-filter-branch.txt:225
#, priority:100
msgid "Arguments for 'git rev-list'. All positive refs included by these options are rewritten. You may also specify options such as `--all`, but you must use `--` to separate them from the 'git filter-branch' options. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:216
+#: en/git-filter-branch.txt:229
#, no-wrap, priority:100
msgid "Remap to ancestor"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:223
+#: en/git-filter-branch.txt:236
#, priority:100
msgid "By using linkgit:git-rev-list[1] arguments, e.g., path limiters, you can limit the set of revisions which get rewritten. However, positive refs on the command line are distinguished: we don't let them be excluded by such limiters. For this purpose, they are instead rewritten to point at the nearest ancestor that was not excluded."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:231
+#: en/git-filter-branch.txt:244
#, priority:100
msgid "On success, the exit status is `0`. If the filter can't find any commits to rewrite, the exit status is `2`. On any other error, the exit status may be any other non-zero value."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:238
+#: en/git-filter-branch.txt:251
#, priority:100
msgid "Suppose you want to remove a file (containing confidential information or copyright violation) from all commits:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:241
+#: en/git-filter-branch.txt:254
#, no-wrap, priority:100
msgid "git filter-branch --tree-filter 'rm filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:246
+#: en/git-filter-branch.txt:259
#, priority:100
msgid "However, if the file is absent from the tree of some commit, a simple `rm filename` will fail for that tree and commit. Thus you may instead want to use `rm -f filename` as the script."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:252
+#: en/git-filter-branch.txt:265
#, priority:100
msgid "Using `--index-filter` with 'git rm' yields a significantly faster version. Like with using `rm filename`, `git rm --cached filename` will fail if the file is absent from the tree of a commit. If you want to \"completely forget\" a file, it does not matter when it entered history, so we also add `--ignore-unmatch`:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:255
+#: en/git-filter-branch.txt:268
#, no-wrap, priority:100
msgid "git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:258
+#: en/git-filter-branch.txt:271
#, priority:100
msgid "Now, you will get the rewritten history saved in HEAD."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:261
+#: en/git-filter-branch.txt:274
#, priority:100
msgid "To rewrite the repository to look as if `foodir/` had been its project root, and discard all other history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:264
+#: en/git-filter-branch.txt:277
#, no-wrap, priority:100
msgid "git filter-branch --subdirectory-filter foodir -- --all\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:269
+#: en/git-filter-branch.txt:282
#, priority:100
msgid "Thus you can, e.g., turn a library subdirectory into a repository of its own. Note the `--` that separates 'filter-branch' options from revision options, and the `--all` to rewrite all branches and tags."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:273
+#: en/git-filter-branch.txt:286
#, priority:100
msgid "To set a commit (which typically is at the tip of another history) to be the parent of the current initial commit, in order to paste the other history behind the current history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:276
+#: en/git-filter-branch.txt:289
#, no-wrap, priority:100
msgid "git filter-branch --parent-filter 'sed \"s/^\\$/-p <graft-id>/\"' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:282
+#: en/git-filter-branch.txt:295
#, priority:100
msgid "(if the parent string is empty - which happens when we are dealing with the initial commit - add graftcommit as a parent). Note that this assumes history with a single root (that is, no merge without common ancestors happened). If this is not the case, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:286
+#: en/git-filter-branch.txt:299
#, no-wrap, priority:100
msgid ""
"git filter-branch --parent-filter \\\n"
@@ -23171,13 +23248,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:289
+#: en/git-filter-branch.txt:302
#, priority:100
msgid "or even simpler:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:293
+#: en/git-filter-branch.txt:306
#, no-wrap, priority:100
msgid ""
"git replace --graft $commit-id $graft-id\n"
@@ -23185,13 +23262,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:296
+#: en/git-filter-branch.txt:309
#, priority:100
msgid "To remove commits authored by \"Darl McBribe\" from the history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:305
+#: en/git-filter-branch.txt:318
#, no-wrap, priority:100
msgid ""
"git filter-branch --commit-filter '\n"
@@ -23204,13 +23281,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:308
+#: en/git-filter-branch.txt:321
#, priority:100
msgid "The function 'skip_commit' is defined as follows:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:320
+#: en/git-filter-branch.txt:333
#, no-wrap, priority:100
msgid ""
"skip_commit()\n"
@@ -23226,13 +23303,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:327
+#: en/git-filter-branch.txt:340
#, priority:100
msgid "The shift magic first throws away the tree id and then the -p parameters. Note that this handles merges properly! In case Darl committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 as their parents instead of the merge commit."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:332
+#: en/git-filter-branch.txt:345
#, no-wrap, priority:100
msgid ""
"*NOTE* the changes introduced by the commits, and which are not reverted\n"
@@ -23242,13 +23319,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:336
+#: en/git-filter-branch.txt:349
#, priority:100
msgid "You can rewrite the commit log messages using `--msg-filter`. For example, 'git svn-id' strings in a repository created by 'git svn' can be removed this way:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:341
+#: en/git-filter-branch.txt:354
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23257,13 +23334,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:345
+#: en/git-filter-branch.txt:358
#, priority:100
msgid "If you need to add 'Acked-by' lines to, say, the last 10 commits (none of which is a merge), use this command:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:351
+#: en/git-filter-branch.txt:364
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23273,13 +23350,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:357
+#: en/git-filter-branch.txt:370
#, priority:100
msgid "The `--env-filter` option can be used to modify committer and/or author identity. For example, if you found out that your commits have the wrong identity due to a misconfigured user.email, you can make a correction, before publishing the project, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:369
+#: en/git-filter-branch.txt:382
#, no-wrap, priority:100
msgid ""
"git filter-branch --env-filter '\n"
@@ -23295,19 +23372,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:375
+#: en/git-filter-branch.txt:388
#, priority:100
msgid "To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will point to the top-most revision that a 'git rev-list' of this range will print."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:377
+#: en/git-filter-branch.txt:390
#, priority:100
msgid "Consider this history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:382
+#: en/git-filter-branch.txt:395
#, no-wrap, priority:100
msgid ""
" D--E--F--G--H\n"
@@ -23316,39 +23393,39 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:385
+#: en/git-filter-branch.txt:398
#, priority:100
msgid "To rewrite only commits D,E,F,G,H, but leave A, B and C alone, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:388
-#, no-wrap, priority:100
+#: en/git-filter-branch.txt:401
+#, ignore-ellipsis, no-wrap, priority:100
msgid "git filter-branch ... C..H\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:391
+#: en/git-filter-branch.txt:404
#, priority:100
msgid "To rewrite commits E,F,G,H, use one of these:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:395
-#, no-wrap, priority:100
+#: en/git-filter-branch.txt:408
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"git filter-branch ... C..H --not D\n"
"git filter-branch ... D..H --not C\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:398
+#: en/git-filter-branch.txt:411
#, priority:100
msgid "To move the whole tree into a subdirectory, or remove it from there:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:405
+#: en/git-filter-branch.txt:418
#, no-wrap, priority:100
msgid ""
"git filter-branch --index-filter \\\n"
@@ -23359,92 +23436,284 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-filter-branch.txt:410
+#: en/git-filter-branch.txt:423
#, no-wrap, priority:100
msgid "CHECKLIST FOR SHRINKING A REPOSITORY"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:418
+#: en/git-filter-branch.txt:431
#, priority:100
msgid "git-filter-branch can be used to get rid of a subset of files, usually with some combination of `--index-filter` and `--subdirectory-filter`. People expect the resulting repository to be smaller than the original, but you need a few more steps to actually make it smaller, because Git tries hard not to lose your objects until you tell it to. First make sure that:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:422
+#: en/git-filter-branch.txt:435
#, priority:100
msgid "You really removed all variants of a filename, if a blob was moved over its lifetime. `git log --name-only --follow --all -- filename` can help you find renames."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:425
+#: en/git-filter-branch.txt:438
#, priority:100
msgid "You really filtered all refs: use `--tag-name-filter cat -- --all` when calling git-filter-branch."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:428
+#: en/git-filter-branch.txt:441
#, priority:100
msgid "Then there are two ways to get a smaller repository. A safer way is to clone, that keeps your original intact."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:432
+#: en/git-filter-branch.txt:445
#, priority:100
msgid "Clone it with `git clone file:///path/to/repo`. The clone will not have the removed objects. See linkgit:git-clone[1]. (Note that cloning with a plain path just hardlinks everything!)"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:437
+#: en/git-filter-branch.txt:450
#, priority:100
msgid "If you really don't want to clone it, for whatever reasons, check the following points instead (in this order). This is a very destructive approach, so *make a backup* or go back to cloning it. You have been warned."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:441
+#: en/git-filter-branch.txt:454
#, priority:100
msgid "Remove the original refs backed up by git-filter-branch: say `git for-each-ref --format=\"%(refname)\" refs/original/ | xargs -n 1 git update-ref -d`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:443
+#: en/git-filter-branch.txt:456
#, priority:100
msgid "Expire all reflogs with `git reflog expire --expire=now --all`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:447
+#: en/git-filter-branch.txt:460
#, priority:100
msgid "Garbage collect all unreferenced objects with `git gc --prune=now` (or if your git-gc is not new enough to support arguments to `--prune`, use `git repack -ad; git prune` instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:459
+#: en/git-filter-branch.txt:467
#, priority:100
-msgid "git-filter-branch allows you to make complex shell-scripted rewrites of your Git history, but you probably don't need this flexibility if you're simply _removing unwanted data_ like large files or passwords. For those operations you may want to consider http://rtyley.github.io/bfg-repo-cleaner/[The BFG Repo-Cleaner], a JVM-based alternative to git-filter-branch, typically at least 10-50x faster for those use-cases, and with quite different characteristics:"
+msgid "The performance of git-filter-branch is glacially slow; its design makes it impossible for a backward-compatible implementation to ever be fast:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:467
+#: en/git-filter-branch.txt:473
#, priority:100
-msgid "Any particular version of a file is cleaned exactly _once_. The BFG, unlike git-filter-branch, does not give you the opportunity to handle a file differently based on where or when it was committed within your history. This constraint gives the core performance benefit of The BFG, and is well-suited to the task of cleansing bad data - you don't care _where_ the bad data is, you just want it _gone_."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:473
+#: en/git-filter-branch.txt:476
+#, priority:100
+msgid "If you try and cheat and try to make git-filter-branch only work on files modified in a commit, then two things happen"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:482
+#, priority:100
+msgid "you run into problems with deletions whenever the user is simply trying to rename files (because attempting to delete files that don't exist looks like a no-op; it takes some chicanery to remap deletes across file renames when the renames happen via arbitrary user-provided shell)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:488
+#, priority:100
+msgid "even if you succeed at the map-deletes-for-renames chicanery, you still technically violate backward compatibility because users are allowed to filter files in ways that depend upon topology of commits instead of filtering solely based on file contents or names (though this has not been observed in the wild)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:494
+#, priority:100
+msgid "Even if you don't need to edit files but only want to e.g. rename or remove some and thus can avoid checking out each file (i.e. you can use --index-filter), you still are passing shell snippets for your filters. This means that for every commit, you have to have a prepared git repo where those filters can be run. That's a significant setup."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:505
+#, priority:100
+msgid "Further, several additional files are created or updated per commit by git-filter-branch. Some of these are for supporting the convenience functions provided by git-filter-branch (such as map()), while others are for keeping track of internal state (but could have also been accessed by user filters; one of git-filter-branch's regression tests does so). This essentially amounts to using the filesystem as an IPC mechanism between git-filter-branch and the user-provided filters. Disks tend to be a slow IPC mechanism, and writing these files also effectively represents a forced synchronization point between separate processes that we hit with every commit."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:511
+#, priority:100
+msgid "The user-provided shell commands will likely involve a pipeline of commands, resulting in the creation of many processes per commit. Creating and running another process takes a widely varying amount of time between operating systems, but on any platform it is very slow relative to invoking a function."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:517
+#, priority:100
+msgid "git-filter-branch itself is written in shell, which is kind of slow. This is the one performance issue that could be backward-compatibly fixed, but compared to the above problems that are intrinsic to the design of git-filter-branch, the language of the tool itself is a relatively minor issue."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:528
#, priority:100
-msgid "By default The BFG takes full advantage of multi-core machines, cleansing commit file-trees in parallel. git-filter-branch cleans commits sequentially (i.e. in a single-threaded manner), though it _is_ possible to write filters that include their own parallelism, in the scripts executed against each commit."
+msgid "Side note: Unfortunately, people tend to fixate on the written-in-shell aspect and periodically ask if git-filter-branch could be rewritten in another language to fix the performance issues. Not only does that ignore the bigger intrinsic problems with the design, it'd help less than you'd expect: if git-filter-branch itself were not shell, then the convenience functions (map(), skip_commit(), etc) and the `--setup` argument could no longer be executed once at the beginning of the program but would instead need to be prepended to every user filter (and thus re-executed with every commit)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:478
+#: en/git-filter-branch.txt:539
#, priority:100
-msgid "The http://rtyley.github.io/bfg-repo-cleaner/#examples[command options] are much more restrictive than git-filter branch, and dedicated just to the tasks of removing unwanted data- e.g: `--strip-blobs-bigger-than 1M`."
+msgid "The https://github.com/newren/git-filter-repo/[git filter-repo] tool is an alternative to git-filter-branch which does not suffer from these performance problems or the safety problems (mentioned below). For those with existing tooling which relies upon git-filter-branch, 'git repo-filter' also provides https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], a drop-in git-filter-branch replacement (with a few caveats). While filter-lamely suffers from all the same safety issues as git-filter-branch, it at least ameloriates the performance issues a little."
+msgstr ""
+
+#. type: Title -
+#: en/git-filter-branch.txt:542
+#, no-wrap, priority:100
+msgid "SAFETY"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:547
+#, priority:100
+msgid "git-filter-branch is riddled with gotchas resulting in various ways to easily corrupt repos or end up with a mess worse than what you started with:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:560
+#, priority:100
+msgid "Someone can have a set of \"working and tested filters\" which they document or provide to a coworker, who then runs them on a different OS where the same commands are not working/tested (some examples in the git-filter-branch manpage are also affected by this). BSD vs. GNU userland differences can really bite. If lucky, error messages are spewed. But just as likely, the commands either don't do the filtering requested, or silently corrupt by making some unwanted change. The unwanted change may only affect a few commits, so it's not necessarily obvious either. (The fact that problems won't necessarily be obvious means they are likely to go unnoticed until the rewritten history is in use for quite a while, at which point it's really hard to justify another flag-day for another rewrite.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:570
+#, priority:100
+msgid "Filenames with spaces are often mishandled by shell snippets since they cause problems for shell pipelines. Not everyone is familiar with find -print0, xargs -0, git-ls-files -z, etc. Even people who are familiar with these may assume such flags are not relevant because someone else renamed any such files in their repo back before the person doing the filtering joined the project. And often, even those familiar with handling arguments with spaces may not do so just because they aren't in the mindset of thinking about everything that could possibly go wrong."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:580
+#, priority:100
+msgid "Non-ascii filenames can be silently removed despite being in a desired directory. Keeping only wanted paths is often done using pipelines like `git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`. ls-files will only quote filenames if needed, so folks may not notice that one of the files didn't match the regex (at least not until it's much too late). Yes, someone who knows about core.quotePath can avoid this (unless they have other special characters like \\t, \\n, or \"), and people who use ls-files -z with something other than grep can avoid this, but that doesn't mean they will."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:586
+#, priority:100
+msgid "Similarly, when moving files around, one can find that filenames with non-ascii or special characters end up in a different directory, one that includes a double quote character. (This is technically the same issue as above with quoting, but perhaps an interesting different way that it can and has manifested as a problem.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:594
+#, priority:100
+msgid "It's far too easy to accidentally mix up old and new history. It's still possible with any tool, but git-filter-branch almost invites it. If lucky, the only downside is users getting frustrated that they don't know how to shrink their repo and remove the old stuff. If unlucky, they merge old and new history and end up with multiple \"copies\" of each commit, some of which have unwanted or sensitive files and others which don't. This comes about in multiple different ways:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:597
+#, priority:100
+msgid "the default to only doing a partial history rewrite ('--all' is not the default and few examples show it)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:599
+#, priority:100
+msgid "the fact that there's no automatic post-run cleanup"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:602
+#, priority:100
+msgid "the fact that --tag-name-filter (when used to rename tags) doesn't remove the old tags but just adds new ones with the new name"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:611
+#, priority:100
+msgid "the fact that little educational information is provided to inform users of the ramifications of a rewrite and how to avoid mixing old and new history. For example, this man page discusses how users need to understand that they need to rebase their changes for all their branches on top of new history (or delete and reclone), but that's only one of multiple concerns to consider. See the \"DISCUSSION\" section of the git filter-repo manual page for more details."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:614
+#, priority:100
+msgid "Annotated tags can be accidentally converted to lightweight tags, due to either of two issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:619
+#, priority:100
+msgid "Someone can do a history rewrite, realize they messed up, restore from the backups in refs/original/, and then redo their git-filter-branch command. (The backup in refs/original/ is not a real backup; it dereferences tags first.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:624
+#, priority:100
+msgid "Running git-filter-branch with either --tags or --all in your <rev-list options>. In order to retain annotated tags as annotated, you must use --tag-name-filter (and must not have restored from refs/original/ in a previously botched rewrite)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:629
+#, priority:100
+msgid "Any commit messages that specify an encoding will become corrupted by the rewrite; git-filter-branch ignores the encoding, takes the original bytes, and feeds it to commit-tree without telling it the proper encoding. (This happens whether or not --msg-filter is used.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:633
+#, priority:100
+msgid "Commit messages (even if they are all UTF-8) by default become corrupted due to not being updated -- any references to other commit hashes in commit messages will now refer to no-longer-extant commits."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:644
+#, priority:100
+msgid "There are no facilities for helping users find what unwanted crud they should delete, which means they are much more likely to have incomplete or partial cleanups that sometimes result in confusion and people wasting time trying to understand. (For example, folks tend to just look for big files to delete instead of big directories or extensions, and once they do so, then sometime later folks using the new repository who are going through history will notice a build artifact directory that has some files but not others, or a cache of dependencies (node_modules or similar) which couldn't have ever been functional since it's missing some files.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:647
+#, priority:100
+msgid "If --prune-empty isn't specified, then the filtering process can create hoards of confusing empty commits"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:651
+#, priority:100
+msgid "If --prune-empty is specified, then intentionally placed empty commits from before the filtering operation are also pruned instead of just pruning commits that became empty due to filtering rules."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:654
+#, ignore-ellipsis, priority:100
+msgid "If --prune empty is specified, sometimes empty commits are missed and left around anyway (a somewhat rare bug, but it happens...)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:658
+#, priority:100
+msgid "A minor issue, but users who have a goal to update all names and emails in a repository may be led to --env-filter which will only update authors and committers, missing taggers."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:664
+#, priority:100
+msgid "If the user provides a --tag-name-filter that maps multiple tags to the same name, no warning or error is provided; git-filter-branch simply overwrites each tag in some undocumented pre-defined order resulting in only one tag at the end. (A git-filter-branch regression test requires this surprising behavior.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:667
+#, priority:100
+msgid "Also, the poor performance of git-filter-branch often leads to safety issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:683
+#, priority:100
+msgid "Coming up with the correct shell snippet to do the filtering you want is sometimes difficult unless you're just doing a trivial modification such as deleting a couple files. Unfortunately, people often learn if the snippet is right or wrong by trying it out, but the rightness or wrongness can vary depending on special circumstances (spaces in filenames, non-ascii filenames, funny author names or emails, invalid timezones, presence of grafts or replace objects, etc.), meaning they may have to wait a long time, hit an error, then restart. The performance of git-filter-branch is so bad that this cycle is painful, reducing the time available to carefully re-check (to say nothing about what it does to the patience of the person doing the rewrite even if they do technically have more time available). This problem is extra compounded because errors from broken filters may not be shown for a long time and/or get lost in a sea of output. Even worse, broken filters often just result in silent incorrect rewrites."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:691
+#, priority:100
+msgid "To top it all off, even when users finally find working commands, they naturally want to share them. But they may be unaware that their repo didn't have some special cases that someone else's does. So, when someone else with a different repository runs the same commands, they get hit by the problems above. Or, the user just runs commands that really were vetted for special cases, but they run it on a different OS where it doesn't work, as noted above."
msgstr ""
#. type: Title =
#: en/git-fmt-merge-msg.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-fmt-merge-msg(1)"
msgstr ""
@@ -23475,7 +23744,7 @@ msgid "This command is intended mostly for internal use by scripts automatically
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:64
+#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:68
#, no-wrap, priority:240
msgid "--log[=<n>]"
msgstr ""
@@ -23487,8 +23756,8 @@ msgid "In addition to branch names, populate the log message with one-line descr
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:65
-#, no-wrap, priority:240
+#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:69
+#, ignore-same, no-wrap, priority:240
msgid "--no-log"
msgstr ""
@@ -23500,7 +23769,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:38
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]summary"
msgstr ""
@@ -23536,7 +23805,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:56
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "merge.summary"
msgstr ""
@@ -23562,7 +23831,7 @@ msgstr ""
#. type: Title =
#: en/git-for-each-ref.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-for-each-ref(1)"
msgstr ""
@@ -23574,7 +23843,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:16
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git for-each-ref' [--count=<count>] [--shell|--perl|--python|--tcl]\n"
"\t\t [(--sort=<key>)...] [--format=<format>] [<pattern>...]\n"
@@ -23591,7 +23860,7 @@ msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:29 en/git-show-ref.txt:88
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<pattern>..."
msgstr ""
@@ -23639,25 +23908,25 @@ msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:65
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--shell"
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:66
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--perl"
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:67
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--python"
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:68
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--tcl"
msgstr ""
@@ -23879,7 +24148,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:197
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Left-, middle-, or right-align the content between %(align:...) and %(end). The \"align:\" is followed by `width=<width>` and `position=<position>` in any order separated by a comma, where the `<position>` is either left, right or middle, default being left and `<width>` is the total length of the content with alignment. For brevity, the \"width=\" and/or \"position=\" prefixes may be omitted, and bare <width> and <position> used instead. For instance, `%(align:<width>,<position>)`. If the contents length is more than the width then no alignment is performed. If used with `--quote` everything in between %(align:...) and %(end) is quoted, but if nested then only the topmost level performs quoting."
msgstr ""
@@ -23891,7 +24160,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:210
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Used as %(if)...%(then)...%(end) or %(if)...%(then)...%(else)...%(end). If there is an atom with value or string literal after the %(if) then everything after the %(then) is printed, else if the %(else) atom is used, then everything after %(else) is printed. We ignore space when evaluating the string before %(then), this is useful when we use the %(HEAD) atom which prints either \"*\" or \" \" and we want to apply the 'if' condition only on the 'HEAD' ref. Append \":equals=<string>\" or \":notequals=<string>\" to compare the value between the %(if:...) and %(then) atoms with the given string."
msgstr ""
@@ -24111,7 +24380,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:361
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "An example to show the usage of %(if)...%(then)...%(else)...%(end). This prefixes the current branch with a star."
msgstr ""
@@ -24123,7 +24392,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:369
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "An example to show the usage of %(if)...%(then)...%(end). This prints the authorname, if present."
msgstr ""
@@ -24135,7 +24404,7 @@ msgstr ""
#. type: Title =
#: en/git-format-patch.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-format-patch(1)"
msgstr ""
@@ -24157,9 +24426,9 @@ msgid ""
"\t\t [--signature-file=<file>]\n"
"\t\t [-n | --numbered | -N | --no-numbered]\n"
"\t\t [--start-number <n>] [--numbered-files]\n"
-"\t\t [--in-reply-to=Message-Id] [--suffix=.<sfx>]\n"
+"\t\t [--in-reply-to=<message id>] [--suffix=.<sfx>]\n"
"\t\t [--ignore-if-in-upstream]\n"
-"\t\t [--rfc] [--subject-prefix=Subject-Prefix]\n"
+"\t\t [--rfc] [--subject-prefix=<subject prefix>]\n"
"\t\t [(--reroll-count|-v) <n>]\n"
"\t\t [--to=<email>] [--cc=<email>]\n"
"\t\t [--[no-]cover-letter] [--quiet]\n"
@@ -24208,523 +24477,523 @@ msgid "By default, each output file is numbered sequentially from 1, and uses th
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:70
+#: en/git-format-patch.txt:71
#, priority:100
-msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`."
+msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`. All directory components will be created."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:74
+#: en/git-format-patch.txt:75
#, priority:100
msgid "By default, the subject of a single patch is \"[PATCH] \" followed by the concatenation of lines from the commit message up to the first blank line (see the DISCUSSION section of linkgit:git-commit[1])."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:78
+#: en/git-format-patch.txt:79
#, priority:100
msgid "When multiple patches are output, the subject prefix will instead be \"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. To omit patch numbers from the subject, use `-N`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:83
+#: en/git-format-patch.txt:84
#, priority:100
msgid "If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a `Message-Id` header to reference."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:89
+#: en/git-format-patch.txt:90
#, no-wrap, priority:100
msgid "-<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:91
+#: en/git-format-patch.txt:92
#, priority:100
msgid "Prepare patches from the topmost <n> commits."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:92
+#: en/git-format-patch.txt:93
#, no-wrap, priority:100
msgid "-o <dir>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:93
+#: en/git-format-patch.txt:94
#, no-wrap, priority:100
msgid "--output-directory <dir>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:96
+#: en/git-format-patch.txt:97
#, priority:100
msgid "Use <dir> to store the resulting files, instead of the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:98 en/git-shortlog.txt:30
-#, no-wrap, priority:260
+#: en/git-format-patch.txt:99 en/git-shortlog.txt:30
+#, ignore-same, no-wrap, priority:260
msgid "--numbered"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:100
+#: en/git-format-patch.txt:101
#, priority:100
msgid "Name output in '[PATCH n/m]' format, even with a single patch."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:102
-#, no-wrap, priority:100
+#: en/git-format-patch.txt:103
+#, ignore-same, no-wrap, priority:100
msgid "--no-numbered"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:104
+#: en/git-format-patch.txt:105
#, priority:100
msgid "Name output in '[PATCH]' format."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:105
+#: en/git-format-patch.txt:106
#, no-wrap, priority:100
msgid "--start-number <n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:107
+#: en/git-format-patch.txt:108
#, priority:100
msgid "Start numbering the patches at <n> instead of 1."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:108
-#, no-wrap, priority:100
+#: en/git-format-patch.txt:109
+#, ignore-same, no-wrap, priority:100
msgid "--numbered-files"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:111
+#: en/git-format-patch.txt:112
#, priority:100
msgid "Output file names will be a simple number sequence without the default first line of the commit appended."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:113
-#, no-wrap, priority:100
+#: en/git-format-patch.txt:114
+#, ignore-same, no-wrap, priority:100
msgid "--keep-subject"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:116
+#: en/git-format-patch.txt:117
#, priority:100
msgid "Do not strip/add '[PATCH]' from the first line of the commit log message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:122
+#: en/git-format-patch.txt:123
#, priority:100
msgid "Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:123 en/git-pack-objects.txt:59
-#, no-wrap, priority:100
+#: en/git-format-patch.txt:124 en/git-pack-objects.txt:59
+#, ignore-same, no-wrap, priority:100
msgid "--stdout"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:126
+#: en/git-format-patch.txt:127
#, priority:100
msgid "Print all commits to the standard output in mbox format, instead of creating a file for each one."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:127
+#: en/git-format-patch.txt:128
#, no-wrap, priority:100
msgid "--attach[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:131
+#: en/git-format-patch.txt:132
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: attachment`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:132
-#, no-wrap, priority:100
+#: en/git-format-patch.txt:133
+#, ignore-same, no-wrap, priority:100
msgid "--no-attach"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:135
+#: en/git-format-patch.txt:136
#, priority:100
msgid "Disable the creation of an attachment, overriding the configuration setting."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:136
+#: en/git-format-patch.txt:137
#, no-wrap, priority:100
msgid "--inline[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:140
+#: en/git-format-patch.txt:141
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: inline`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:141
+#: en/git-format-patch.txt:142
#, no-wrap, priority:100
msgid "--thread[=<style>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:142
-#, no-wrap, priority:100
+#: en/git-format-patch.txt:143
+#, ignore-same, no-wrap, priority:100
msgid "--no-thread"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:147
+#: en/git-format-patch.txt:148
#, priority:100
msgid "Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the first. Also controls generation of the `Message-Id` header to reference."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:153
+#: en/git-format-patch.txt:154
#, priority:100
msgid "The optional <style> argument can be either `shallow` or `deep`. 'shallow' threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order. 'deep' threading makes every mail a reply to the previous one."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:157
+#: en/git-format-patch.txt:158
#, priority:100
msgid "The default is `--no-thread`, unless the `format.thread` configuration is set. If `--thread` is specified without a style, it defaults to the style specified by `format.thread` if any, or else `shallow`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:161
+#: en/git-format-patch.txt:162
#, priority:100
msgid "Beware that the default for 'git send-email' is to thread emails itself. If you want `git format-patch` to take care of threading, you will want to ensure that threading is disabled for `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:162
+#: en/git-format-patch.txt:163
#, no-wrap, priority:100
-msgid "--in-reply-to=Message-Id"
+msgid "--in-reply-to=<message id>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:166
+#: en/git-format-patch.txt:167
#, priority:100
-msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given Message-Id, which avoids breaking threads to provide a new patch series."
+msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given <message id>, which avoids breaking threads to provide a new patch series."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:167
-#, no-wrap, priority:100
+#: en/git-format-patch.txt:168
+#, ignore-same, no-wrap, priority:100
msgid "--ignore-if-in-upstream"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:173
+#: en/git-format-patch.txt:174
#, priority:100
msgid "Do not include a patch that matches a commit in <until>..<since>. This will examine all patches reachable from <since> but not from <until> and compare them with the patches being generated, and any patch that matches is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:174
+#: en/git-format-patch.txt:175
#, no-wrap, priority:100
-msgid "--subject-prefix=<Subject-Prefix>"
+msgid "--subject-prefix=<subject prefix>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:179
+#: en/git-format-patch.txt:180
#, priority:100
-msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<Subject-Prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
+msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<subject prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:180
-#, no-wrap, priority:100
+#: en/git-format-patch.txt:181
+#, ignore-same, no-wrap, priority:100
msgid "--rfc"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:184
+#: en/git-format-patch.txt:185
#, priority:100
msgid "Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For Comments\"; use this when sending an experimental patch for discussion rather than application."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:185
+#: en/git-format-patch.txt:186
#, no-wrap, priority:100
msgid "-v <n>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:186
+#: en/git-format-patch.txt:187
#, no-wrap, priority:100
msgid "--reroll-count=<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:193
+#: en/git-format-patch.txt:194
#, priority:100
msgid "Mark the series as the <n>-th iteration of the topic. The output filenames have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default, but configurable via the `--subject-prefix` option) has ` v<n>` appended to it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:194
+#: en/git-format-patch.txt:195
#, no-wrap, priority:100
msgid "--to=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:199
+#: en/git-format-patch.txt:200
#, priority:100
msgid "Add a `To:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-to` discards all `To:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:200
+#: en/git-format-patch.txt:201
#, no-wrap, priority:100
msgid "--cc=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:205
+#: en/git-format-patch.txt:206
#, priority:100
msgid "Add a `Cc:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-cc` discards all `Cc:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:206
-#, no-wrap, priority:100
+#: en/git-format-patch.txt:207
+#, ignore-same, no-wrap, priority:100
msgid "--from"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:207
+#: en/git-format-patch.txt:208
#, no-wrap, priority:100
msgid "--from=<ident>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:213
+#: en/git-format-patch.txt:214
#, priority:100
msgid "Use `ident` in the `From:` header of each commit email. If the author ident of the commit is not textually identical to the provided `ident`, place a `From:` header in the body of the message with the original author. If no `ident` is given, use the committer ident."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:220
+#: en/git-format-patch.txt:221
#, priority:100
msgid "Note that this option is only useful if you are actually sending the emails and want to identify yourself as the sender, but retain the original author (and `git am` will correctly pick up the in-body header). Note also that `git send-email` already handles this transformation for you, and this option should not be used if you are feeding the result to `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:221
+#: en/git-format-patch.txt:222
#, no-wrap, priority:100
msgid "--add-header=<header>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:228
+#: en/git-format-patch.txt:229
#, priority:100
msgid "Add an arbitrary header to the email headers. This is in addition to any configured headers, and may be used multiple times. For example, `--add-header=\"Organization: git-foo\"`. The negated form `--no-add-header` discards *all* (`To:`, `Cc:`, and custom) headers added so far from config or command line."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:229
-#, no-wrap, priority:100
+#: en/git-format-patch.txt:230
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]cover-letter"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:233
+#: en/git-format-patch.txt:234
#, priority:100
msgid "In addition to the patches, generate a cover letter file containing the branch description, shortlog and the overall diffstat. You can fill in a description in the file before sending it out."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:234
+#: en/git-format-patch.txt:235
#, no-wrap, priority:100
msgid "--interdiff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:242
+#: en/git-format-patch.txt:243
#, priority:100
msgid "As a reviewer aid, insert an interdiff into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` is a single revision naming the tip of the previous series which shares a common base with the series being formatted (for example `git format-patch --cover-letter --interdiff=feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:243
+#: en/git-format-patch.txt:244
#, no-wrap, priority:100
msgid "--range-diff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:254
+#: en/git-format-patch.txt:255
#, priority:100
msgid "As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1]) into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` can be a single revision naming the tip of the previous series if it shares a common base with the series being formatted (for example `git format-patch --cover-letter --range-diff=feature/v1 -3 feature/v2`), or a revision range if the two versions of the series are disjoint (for example `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:259
+#: en/git-format-patch.txt:260
#, priority:100
msgid "Note that diff options passed to the command affect how the primary product of `format-patch` is generated, and they are not passed to the underlying `range-diff` machinery used to generate the cover-letter material (this may change in the future)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:260
+#: en/git-format-patch.txt:261
#, no-wrap, priority:100
msgid "--creation-factor=<percent>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:265
+#: en/git-format-patch.txt:266
#, priority:100
msgid "Used with `--range-diff`, tweak the heuristic which matches up commits between the previous and current series of patches by adjusting the creation/deletion cost fudge factor. See linkgit:git-range-diff[1]) for details."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:266
+#: en/git-format-patch.txt:267
#, no-wrap, priority:100
msgid "--notes[=<ref>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:267 en/pretty-options.txt:81
-#, no-wrap, priority:260
+#: en/git-format-patch.txt:268 en/pretty-options.txt:81
+#, ignore-same, no-wrap, priority:260
msgid "--no-notes"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:270
+#: en/git-format-patch.txt:271
#, priority:100
msgid "Append the notes (see linkgit:git-notes[1]) for the commit after the three-dash line."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:278
+#: en/git-format-patch.txt:279
#, priority:100
msgid "The expected use case of this is to write supporting explanation for the commit that does not belong to the commit log message proper, and include it with the patch submission. While one can simply write these explanations after `format-patch` has run but before sending, keeping them as Git notes allows them to be maintained between versions of the patch series (but see the discussion of the `notes.rewrite` configuration options in linkgit:git-notes[1] to use this workflow)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:281
+#: en/git-format-patch.txt:282
#, priority:100
msgid "The default is `--no-notes`, unless the `format.notes` configuration is set."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:282
+#: en/git-format-patch.txt:283
#, no-wrap, priority:100
msgid "--[no-]signature=<signature>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:287
+#: en/git-format-patch.txt:288
#, priority:100
msgid "Add a signature to each message produced. Per RFC 3676 the signature is separated from the body by a line with '-- ' on it. If the signature option is omitted the signature defaults to the Git version number."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:288
+#: en/git-format-patch.txt:289
#, no-wrap, priority:100
msgid "--signature-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:290
+#: en/git-format-patch.txt:291
#, priority:100
msgid "Works just like --signature except the signature is read from a file."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:291
+#: en/git-format-patch.txt:292
#, no-wrap, priority:100
msgid "--suffix=.<sfx>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:296
+#: en/git-format-patch.txt:297
#, priority:100
msgid "Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is `--suffix=.txt`. Leaving this empty will remove the `.patch` suffix."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:299
+#: en/git-format-patch.txt:300
#, priority:100
msgid "Note that the leading character does not have to be a dot; for example, you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:303
+#: en/git-format-patch.txt:304
#, priority:100
msgid "Do not print the names of the generated files to standard output."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:304
-#, no-wrap, priority:100
+#: en/git-format-patch.txt:305
+#, ignore-same, no-wrap, priority:100
msgid "--no-binary"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:309
+#: en/git-format-patch.txt:310
#, priority:100
msgid "Do not output contents of changes in binary files, instead display a notice that those files changed. Patches generated using this option cannot be applied properly, but they are still useful for code review."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:310
-#, no-wrap, priority:100
+#: en/git-format-patch.txt:311
+#, ignore-same, no-wrap, priority:100
msgid "--zero-commit"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:313
+#: en/git-format-patch.txt:314
#, priority:100
msgid "Output an all-zero hash in each patch's From header instead of the hash of the commit."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:314
+#: en/git-format-patch.txt:315
#, no-wrap, priority:100
msgid "--base=<commit>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:318
+#: en/git-format-patch.txt:320
#, priority:100
-msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details."
+msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details. If <commit> is \"auto\", a base commit is automatically chosen."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:325
+#: en/git-format-patch.txt:327
#, priority:100
msgid "Treat the revision argument as a <revision range>, even if it is just a single commit (that would normally be treated as a <since>). Note that root commits included in the specified range are always formatted as creation patches, independently of this flag."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:328
+#: en/git-format-patch.txt:330
#, priority:100
msgid "Show progress reports on stderr as patches are generated."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:335
+#: en/git-format-patch.txt:338
#, priority:100
-msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To\" or \"Cc:\" headers, configure attachments, and sign off patches with configuration variables."
+msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To:\" or \"Cc:\" headers, configure attachments, change the patch output directory, and sign off patches with configuration variables."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:347
+#: en/git-format-patch.txt:351
#, no-wrap, priority:100
msgid ""
"[format]\n"
@@ -24736,17 +25005,18 @@ msgid ""
"\tcc = <email>\n"
"\tattach [ = mime-boundary-string ]\n"
"\tsignOff = true\n"
-"\tcoverletter = auto\n"
+"\toutputDirectory = <directory>\n"
+"\tcoverLetter = auto\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:356
+#: en/git-format-patch.txt:360
#, priority:100
msgid "The patch produced by 'git format-patch' is in UNIX mailbox format, with a fixed \"magic\" time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:366
+#: en/git-format-patch.txt:370
#, no-wrap, priority:100
msgid ""
"From 8f72bad1baf19a53459661343e21d6491c3908d3 Mon Sep 17 00:00:00 2001\n"
@@ -24760,7 +25030,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:369
+#: en/git-format-patch.txt:373
#, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -24768,41 +25038,41 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:372
-#, no-wrap, priority:100
+#: en/git-format-patch.txt:376
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"Do the same for ia64 so we can have sleek & trim looking\n"
"...\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:380
-#, priority:100
+#: en/git-format-patch.txt:384
+#, ignore-ellipsis, priority:100
msgid "Typically it will be placed in a MUA's drafts folder, edited to add timely commentary that should not go in the changelog after the three dashes, and then sent as a message whose body, in our example, starts with \"arch/arm config files were...\". On the receiving end, readers can save interesting patches in a UNIX mailbox and apply them with linkgit:git-am[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:386
+#: en/git-format-patch.txt:390
#, priority:100
msgid "When a patch is part of an ongoing discussion, the patch generated by 'git format-patch' can be tweaked to take advantage of the 'git am --scissors' feature. After your response to the discussion comes a line that consists solely of \"`-- >8 --`\" (scissors and perforation), followed by the patch with unnecessary header fields removed:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:390
-#, no-wrap, priority:100
+#: en/git-format-patch.txt:394
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"...\n"
"> So we should do such-and-such.\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:392
+#: en/git-format-patch.txt:396
#, no-wrap, priority:100
msgid "Makes sense to me. How about this patch?\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:395
+#: en/git-format-patch.txt:399
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
@@ -24810,69 +25080,69 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:398
-#, no-wrap, priority:100
+#: en/git-format-patch.txt:402
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
"...\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:406
+#: en/git-format-patch.txt:410
#, priority:100
msgid "When sending a patch this way, most often you are sending your own patch, so in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit `From:` and `Date:` lines from the patch file. The patch title is likely to be different from the subject of the discussion the patch is in response to, so it is likely that you would want to keep the Subject: line, like the example above."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:408
+#: en/git-format-patch.txt:412
#, no-wrap, priority:100
msgid "Checking for patch corruption"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:411
+#: en/git-format-patch.txt:415
#, priority:100
msgid "Many mailers if not set up properly will corrupt whitespace. Here are two common types of corruption:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:413
+#: en/git-format-patch.txt:417
#, priority:100
msgid "Empty context lines that do not have _any_ whitespace."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:416
+#: en/git-format-patch.txt:420
#, priority:100
msgid "Non-empty context lines that have one extra whitespace at the beginning."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:418
+#: en/git-format-patch.txt:422
#, priority:100
msgid "One way to test if your MUA is set up correctly is:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:422
+#: en/git-format-patch.txt:426
#, priority:100
msgid "Send the patch to yourself, exactly the way you would, except with To: and Cc: lines that do not contain the list and maintainer address."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:425
+#: en/git-format-patch.txt:429
#, priority:100
msgid "Save that patch to a file in UNIX mailbox format. Call it a.patch, say."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:427
+#: en/git-format-patch.txt:431
#, priority:100
msgid "Apply it:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:432
+#: en/git-format-patch.txt:436
#, no-wrap, priority:100
msgid ""
"$ git fetch <project> master:test-apply\n"
@@ -24882,175 +25152,175 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:434
+#: en/git-format-patch.txt:438
#, priority:100
msgid "If it does not apply correctly, there can be various reasons."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:439
+#: en/git-format-patch.txt:443
#, priority:100
msgid "The patch itself does not apply cleanly. That is _bad_ but does not have much to do with your MUA. You might want to rebase the patch with linkgit:git-rebase[1] before regenerating it in this case."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:444
+#: en/git-format-patch.txt:448
#, priority:100
msgid "The MUA corrupted your patch; \"am\" would complain that the patch does not apply. Look in the .git/rebase-apply/ subdirectory and see what 'patch' file contains and check for the common corruption patterns mentioned above."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:452
+#: en/git-format-patch.txt:456
#, priority:100
msgid "While at it, check the 'info' and 'final-commit' files as well. If what is in 'final-commit' is not exactly what you would want to see in the commit log message, it is very likely that the receiver would end up hand editing the log message when applying your patch. Things like \"Hi, this is my first patch.\\n\" in the patch e-mail should come after the three-dash line that signals the end of the commit message."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:454
+#: en/git-format-patch.txt:458
#, no-wrap, priority:100
msgid "MUA-SPECIFIC HINTS"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:457
+#: en/git-format-patch.txt:461
#, priority:100
msgid "Here are some hints on how to successfully submit patches inline using various mailers."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:459
+#: en/git-format-patch.txt:463
#, no-wrap, priority:100
msgid "GMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:465
+#: en/git-format-patch.txt:469
#, priority:100
msgid "GMail does not have any way to turn off line wrapping in the web interface, so it will mangle any emails that you send. You can however use \"git send-email\" and send your patches through the GMail SMTP server, or use any IMAP email client to connect to the google IMAP server and forward the emails through that."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:468
+#: en/git-format-patch.txt:472
#, priority:100
msgid "For hints on using 'git send-email' to send your patches through the GMail SMTP server, see the EXAMPLE section of linkgit:git-send-email[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:471
+#: en/git-format-patch.txt:475
#, priority:100
msgid "For hints on submission using the IMAP interface, see the EXAMPLE section of linkgit:git-imap-send[1]."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:473
+#: en/git-format-patch.txt:477
#, no-wrap, priority:100
msgid "Thunderbird"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:477
+#: en/git-format-patch.txt:481
#, priority:100
msgid "By default, Thunderbird will both wrap emails as well as flag them as being 'format=flowed', both of which will make the resulting email unusable by Git."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:481
+#: en/git-format-patch.txt:485
#, priority:100
msgid "There are three different approaches: use an add-on to turn off line wraps, configure Thunderbird to not mangle patches, or use an external editor to keep Thunderbird from mangling the patches."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:483
+#: en/git-format-patch.txt:487
#, no-wrap, priority:100
msgid "Approach #1 (add-on)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:491
+#: en/git-format-patch.txt:495
#, priority:100
msgid "Install the Toggle Word Wrap add-on that is available from https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you can tick off. Now you can compose the message as you otherwise do (cut + paste, 'git format-patch' | 'git imap-send', etc), but you have to insert line breaks manually in any text that you type."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:493
+#: en/git-format-patch.txt:497
#, no-wrap, priority:100
msgid "Approach #2 (configuration)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:495
+#: en/git-format-patch.txt:499
#, priority:100
msgid "Three steps:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:499
-#, priority:100
+#: en/git-format-patch.txt:503
+#, ignore-ellipsis, priority:100
msgid "Configure your mail server composition as plain text: Edit...Account Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:501
+#: en/git-format-patch.txt:505
#, priority:100
msgid "Configure your general composition window to not wrap."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:504
+#: en/git-format-patch.txt:508
#, priority:100
msgid "In Thunderbird 2: Edit..Preferences..Composition, wrap plain text messages at 0"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:510
+#: en/git-format-patch.txt:514
#, priority:100
msgid "In Thunderbird 3: Edit..Preferences..Advanced..Config Editor. Search for \"mail.wrap_long_lines\". Toggle it to make sure it is set to `false`. Also, search for \"mailnews.wraplength\" and set the value to 0."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:515
+#: en/git-format-patch.txt:519
#, priority:100
msgid "Disable the use of format=flowed: Edit..Preferences..Advanced..Config Editor. Search for \"mailnews.send_plaintext_flowed\". Toggle it to make sure it is set to `false`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:519
+#: en/git-format-patch.txt:523
#, priority:100
msgid "After that is done, you should be able to compose email as you otherwise would (cut + paste, 'git format-patch' | 'git imap-send', etc), and the patches will not be mangled."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:521
+#: en/git-format-patch.txt:525
#, no-wrap, priority:100
msgid "Approach #3 (external editor)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:526
+#: en/git-format-patch.txt:530
#, priority:100
msgid "The following Thunderbird extensions are needed: AboutConfig from http://aboutconfig.mozdev.org/ and External Editor from http://globs.org/articles.php?lng=en&pg=8"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:528
+#: en/git-format-patch.txt:532
#, priority:100
msgid "Prepare the patch as a text file using your method of choice."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:533
+#: en/git-format-patch.txt:537
#, priority:100
msgid "Before opening a compose window, use Edit->Account Settings to uncheck the \"Compose messages in HTML format\" setting in the \"Composition & Addressing\" panel of the account to be used to send the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:537
+#: en/git-format-patch.txt:541
#, priority:100
msgid "In the main Thunderbird window, 'before' you open the compose window for the patch, use Tools->about:config to set the following to the indicated values:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:541
+#: en/git-format-patch.txt:545
#, no-wrap, priority:100
msgid ""
"\tmailnews.send_plaintext_flowed => false\n"
@@ -25058,25 +25328,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:544
+#: en/git-format-patch.txt:548
#, priority:100
msgid "Open a compose window and click the external editor icon."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:547
+#: en/git-format-patch.txt:551
#, priority:100
msgid "In the external editor window, read in the patch file and exit the editor normally."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:550
+#: en/git-format-patch.txt:554
#, priority:100
msgid "Side note: it may be possible to do step 2 with about:config and the following settings but no one's tried yet."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:555
+#: en/git-format-patch.txt:559
#, no-wrap, priority:100
msgid ""
"\tmail.html_compose => false\n"
@@ -25085,91 +25355,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:560
+#: en/git-format-patch.txt:564
#, priority:100
msgid "There is a script in contrib/thunderbird-patch-inline which can help you include patches with Thunderbird in an easy way. To use it, do the steps above and then use the script as the external editor."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:562
+#: en/git-format-patch.txt:566
#, no-wrap, priority:100
msgid "KMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:564
+#: en/git-format-patch.txt:568
#, priority:100
msgid "This should help you to submit patches inline using KMail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:566
+#: en/git-format-patch.txt:570
#, priority:100
msgid "Prepare the patch as a text file."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:568
+#: en/git-format-patch.txt:572
#, priority:100
msgid "Click on New Mail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:571
+#: en/git-format-patch.txt:575
#, priority:100
msgid "Go under \"Options\" in the Composer window and be sure that \"Word wrap\" is not set."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:573
-#, priority:100
+#: en/git-format-patch.txt:577
+#, ignore-ellipsis, priority:100
msgid "Use Message -> Insert file... and insert the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:576
+#: en/git-format-patch.txt:580
#, priority:100
msgid "Back in the compose window: add whatever other text you wish to the message, complete the addressing and subject fields, and press send."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:578
+#: en/git-format-patch.txt:582
#, no-wrap, priority:100
msgid "BASE TREE INFORMATION"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:587
+#: en/git-format-patch.txt:591
#, priority:100
msgid "The base tree information block is used for maintainers or third party testers to know the exact state the patch series applies to. It consists of the 'base commit', which is a well-known commit that is part of the stable part of the project history everybody else works off of, and zero or more 'prerequisite patches', which are well-known patches in flight that is not yet part of the 'base commit' that need to be applied on top of 'base commit' in topological order before the patches can be applied."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:593
+#: en/git-format-patch.txt:597
#, priority:100
msgid "The 'base commit' is shown as \"base-commit: \" followed by the 40-hex of the commit object name. A 'prerequisite patch' is shown as \"prerequisite-patch-id: \" followed by the 40-hex 'patch id', which can be obtained by passing the patch through the `git patch-id --stable` command."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:597
+#: en/git-format-patch.txt:601
#, priority:100
msgid "Imagine that on top of the public commit P, you applied well-known patches X, Y and Z from somebody else, and then built your three-patch series A, B, C, the history would be like:"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:600
+#: en/git-format-patch.txt:604
#, no-wrap, priority:100
msgid "---P---X---Y---Z---A---B---C\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:607
+#: en/git-format-patch.txt:611
#, priority:100
msgid "With `git format-patch --base=P -3 C` (or variants thereof, e.g. with `--cover-letter` or using `Z..C` instead of `-3 C` to specify the range), the base tree information block is shown at the end of the first message the command outputs (either the first patch, or the cover letter), like this:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:613
+#: en/git-format-patch.txt:617
#, no-wrap, priority:100
msgid ""
"base-commit: P\n"
@@ -25179,13 +25449,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:616
+#: en/git-format-patch.txt:620
#, priority:100
msgid "For non-linear topology, such as"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:621
+#: en/git-format-patch.txt:625
#, no-wrap, priority:100
msgid ""
"---P---X---A---M---C\n"
@@ -25194,98 +25464,98 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:626
+#: en/git-format-patch.txt:630
#, priority:100
msgid "You can also use `git format-patch --base=P -3 C` to generate patches for A, B and C, and the identifiers for P, X, Y, Z are appended at the end of the first message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:632
+#: en/git-format-patch.txt:636
#, priority:100
msgid "If set `--base=auto` in cmdline, it will track base commit automatically, the base commit will be the merge base of tip commit of the remote-tracking branch and revision-range specified in cmdline. For a local branch, you need to track a remote branch by `git branch --set-upstream-to` before using this option."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:638
+#: en/git-format-patch.txt:642
#, priority:100
msgid "Extract commits between revisions R1 and R2, and apply them on top of the current branch using 'git am' to cherry-pick them:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:641
+#: en/git-format-patch.txt:645
#, no-wrap, priority:100
msgid "$ git format-patch -k --stdout R1..R2 | git am -3 -k\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:645
+#: en/git-format-patch.txt:649
#, priority:100
msgid "Extract all commits which are in the current branch but not in the origin branch:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:648
+#: en/git-format-patch.txt:652
#, no-wrap, priority:100
msgid "$ git format-patch origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:651
+#: en/git-format-patch.txt:655
#, priority:100
msgid "For each commit a separate file is created in the current directory."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:654
+#: en/git-format-patch.txt:658
#, priority:100
msgid "Extract all commits that lead to 'origin' since the inception of the project:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:657
+#: en/git-format-patch.txt:661
#, no-wrap, priority:100
msgid "$ git format-patch --root origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:660
+#: en/git-format-patch.txt:664
#, priority:100
msgid "The same as the previous one:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:663
+#: en/git-format-patch.txt:667
#, no-wrap, priority:100
msgid "$ git format-patch -M -B origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:670
+#: en/git-format-patch.txt:674
#, priority:100
msgid "Additionally, it detects and handles renames and complete rewrites intelligently to produce a renaming patch. A renaming patch reduces the amount of text output, and generally makes it easier to review. Note that non-Git \"patch\" programs won't understand renaming patches, so use it only when you know the recipient uses Git to apply your patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:673
+#: en/git-format-patch.txt:677
#, priority:100
msgid "Extract three topmost commits from the current branch and format them as e-mailable patches:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:676
+#: en/git-format-patch.txt:680
#, no-wrap, priority:100
msgid "$ git format-patch -3\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:681
-#, priority:100
+#: en/git-format-patch.txt:685
+#, ignore-same, priority:100
msgid "linkgit:git-am[1], linkgit:git-send-email[1]"
msgstr ""
#. type: Title =
#: en/git-fsck-objects.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-fsck-objects(1)"
msgstr ""
@@ -25297,7 +25567,7 @@ msgstr ""
#. type: Plain text
#: en/git-fsck-objects.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git fsck-objects' ...\n"
msgstr ""
@@ -25309,7 +25579,7 @@ msgstr ""
#. type: Title =
#: en/git-fsck.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-fsck(1)"
msgstr ""
@@ -25343,7 +25613,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:30
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--unreachable"
msgstr ""
@@ -25355,7 +25625,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:34
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]dangling"
msgstr ""
@@ -25379,7 +25649,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:44
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--cache"
msgstr ""
@@ -25391,7 +25661,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:48
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-reflogs"
msgstr ""
@@ -25403,7 +25673,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:54
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--full"
msgstr ""
@@ -25415,7 +25685,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:64
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--connectivity-only"
msgstr ""
@@ -25433,7 +25703,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:77 en/git-index-pack.txt:74 en/git-unpack-objects.txt:44
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--strict"
msgstr ""
@@ -25451,7 +25721,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:88
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--lost-found"
msgstr ""
@@ -25463,7 +25733,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:94
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--name-objects"
msgstr ""
@@ -25583,7 +25853,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:164
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "GIT_OBJECT_DIRECTORY"
msgstr ""
@@ -25595,7 +25865,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:167
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "GIT_INDEX_FILE"
msgstr ""
@@ -25607,7 +25877,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:170
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "GIT_ALTERNATE_OBJECT_DIRECTORIES"
msgstr ""
@@ -25619,7 +25889,7 @@ msgstr ""
#. type: Title =
#: en/git-gc.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-gc(1)"
msgstr ""
@@ -25655,7 +25925,7 @@ msgstr ""
#. type: Labeled list
#: en/git-gc.txt:37 en/git-read-tree.txt:72
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--aggressive"
msgstr ""
@@ -25667,7 +25937,7 @@ msgstr ""
#. type: Labeled list
#: en/git-gc.txt:44
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--auto"
msgstr ""
@@ -25685,7 +25955,7 @@ msgstr ""
#. type: Plain text
#: en/git-gc.txt:55
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Once housekeeping is triggered by exceeding the limits of configuration options such as `gc.auto` and `gc.autoPackLimit`, all other housekeeping tasks (e.g. rerere, working trees, reflog...) will be performed as well."
msgstr ""
@@ -25703,7 +25973,7 @@ msgstr ""
#. type: Labeled list
#: en/git-gc.txt:65 en/git-pack-refs.txt:57
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-prune"
msgstr ""
@@ -25727,7 +25997,7 @@ msgstr ""
#. type: Labeled list
#: en/git-gc.txt:75
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--keep-largest-pack"
msgstr ""
@@ -25774,50 +26044,50 @@ msgid "The below documentation is the same as what's found in linkgit:git-config
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:127
+#: en/git-gc.txt:126
#, priority:100
-msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, refs saved by 'git filter-branch' in refs/original/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
+msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, notes saved by 'git notes' under refs/notes/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:134
+#: en/git-gc.txt:133
#, priority:100
msgid "On the other hand, when 'git gc' runs concurrently with another process, there is a risk of it deleting an object that the other process is using but hasn't created a reference to. This may just cause the other process to fail or may corrupt the repository if the other process later adds a reference to the deleted object. Git has two features that significantly mitigate this problem:"
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:137
+#: en/git-gc.txt:136
#, priority:100
msgid "Any object with modification time newer than the `--prune` date is kept, along with everything reachable from it."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:141
+#: en/git-gc.txt:140
#, priority:100
msgid "Most operations that add an object to the database update the modification time of the object if it is already present so that #1 applies."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:145
+#: en/git-gc.txt:144
#, priority:100
msgid "However, these features fall short of a complete solution, so users who run commands concurrently have to live with some risk of corruption (which seems to be low in practice)."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:151
+#: en/git-gc.txt:150
#, priority:100
msgid "The 'git gc --auto' command will run the 'pre-auto-gc' hook. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:159
-#, priority:100
+#: en/git-gc.txt:158
+#, ignore-same, priority:100
msgid "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
msgstr ""
#. type: Title =
#: en/git-get-tar-commit-id.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-get-tar-commit-id(1)"
msgstr ""
@@ -25847,7 +26117,7 @@ msgstr ""
#. type: Title =
#: en/git-grep.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-grep(1)"
msgstr ""
@@ -25859,7 +26129,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:32
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git grep' [-a | --text] [-I] [--textconv] [-i | --ignore-case] [-w | --word-regexp]\n"
"\t [-v | --invert-match] [-h|-H] [--full-name]\n"
@@ -25987,7 +26257,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:82
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--untracked"
msgstr ""
@@ -25999,7 +26269,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:86
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-exclude-standard"
msgstr ""
@@ -26011,7 +26281,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:90 en/git-ls-files.txt:98
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--exclude-standard"
msgstr ""
@@ -26076,8 +26346,8 @@ msgid "For each <pathspec> given on command line, descend at most <depth> levels
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:399
-#, no-wrap, priority:220
+#: en/git-grep.txt:128 en/git-submodule.txt:400
+#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr ""
@@ -26089,7 +26359,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:131
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-recursive"
msgstr ""
@@ -26101,7 +26371,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:135
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--word-regexp"
msgstr ""
@@ -26113,7 +26383,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:141
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--invert-match"
msgstr ""
@@ -26131,7 +26401,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:152 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--full-name"
msgstr ""
@@ -26149,7 +26419,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:159 en/rev-list-options.txt:83
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--extended-regexp"
msgstr ""
@@ -26161,7 +26431,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:161 en/rev-list-options.txt:78
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--basic-regexp"
msgstr ""
@@ -26173,7 +26443,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:166 en/rev-list-options.txt:93
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--perl-regexp"
msgstr ""
@@ -26197,7 +26467,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:174 en/rev-list-options.txt:88
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--fixed-strings"
msgstr ""
@@ -26209,7 +26479,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:179
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--line-number"
msgstr ""
@@ -26221,7 +26491,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:182
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--column"
msgstr ""
@@ -26233,7 +26503,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:187
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--files-with-matches"
msgstr ""
@@ -26245,7 +26515,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:190
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--files-without-match"
msgstr ""
@@ -26281,7 +26551,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:212
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--only-matching"
msgstr ""
@@ -26292,8 +26562,8 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:951
-#, no-wrap, priority:260
+#: en/git-grep.txt:217 en/rev-list-options.txt:967
+#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr ""
@@ -26317,7 +26587,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:230
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--break"
msgstr ""
@@ -26329,7 +26599,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:233
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--heading"
msgstr ""
@@ -26341,7 +26611,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:238
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--show-function"
msgstr ""
@@ -26442,134 +26712,158 @@ msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:280
+#: en/git-grep.txt:277
+#, priority:100
+msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:282
+#, priority:100
+msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:287
+#, priority:100
+msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:291
+#, priority:100
+msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:297
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:281
-#, no-wrap, priority:100
+#: en/git-grep.txt:298
+#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:282
-#, no-wrap, priority:100
+#: en/git-grep.txt:299
+#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:283 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
-#, no-wrap, priority:260
+#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:284
-#, no-wrap, priority:100
+#: en/git-grep.txt:301
+#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:289
+#: en/git-grep.txt:306
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:290 en/rev-list-options.txt:65
-#, no-wrap, priority:260
+#: en/git-grep.txt:307 en/rev-list-options.txt:65
+#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:294
+#: en/git-grep.txt:311
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:299
+#: en/git-grep.txt:316
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:300
-#, no-wrap, priority:100
+#: en/git-grep.txt:317
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:303
+#: en/git-grep.txt:320
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:307
+#: en/git-grep.txt:324
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:328
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:318
+#: en/git-grep.txt:335
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:321
+#: en/git-grep.txt:338
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:322
+#: en/git-grep.txt:339
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:325
+#: en/git-grep.txt:342
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:326
+#: en/git-grep.txt:343
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:329
+#: en/git-grep.txt:346
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:330
+#: en/git-grep.txt:347
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:332
+#: en/git-grep.txt:349
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
#. type: Title =
#: en/git-gui.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-gui(1)"
msgstr ""
@@ -26780,30 +27074,18 @@ msgstr ""
#. type: Plain text
#: en/git-gui.txt:116
#, priority:100
-msgid "A 'git gui' development repository can be obtained from:"
+msgid "The official repository of the 'git gui' project can be found at:"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:118
#, no-wrap, priority:100
-msgid " git clone git://repo.or.cz/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:122
-#, no-wrap, priority:100
-msgid " git clone http://repo.or.cz/r/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:124
-#, priority:100
-msgid "or browsed online at http://repo.or.cz/w/git-gui.git/[]."
+msgid " https://github.com/prati0100/git-gui.git/\n"
msgstr ""
#. type: Title =
#: en/git-hash-object.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-hash-object(1)"
msgstr ""
@@ -26815,7 +27097,7 @@ msgstr ""
#. type: Plain text
#: en/git-hash-object.txt:14
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git hash-object' [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin [--literally]] [--] <file>...\n"
"'git hash-object' [-t <type>] [-w] --stdin-paths [--no-filters]\n"
@@ -26853,7 +27135,7 @@ msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:35
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--stdin-paths"
msgstr ""
@@ -26871,7 +27153,7 @@ msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:49
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-filters"
msgstr ""
@@ -26883,7 +27165,7 @@ msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:55
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--literally"
msgstr ""
@@ -26895,7 +27177,7 @@ msgstr ""
#. type: Title =
#: en/git-help.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-help(1)"
msgstr ""
@@ -26945,7 +27227,7 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:38
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Note that `git --help ...` is identical to `git help ...` because the former is internally converted into the latter."
msgstr ""
@@ -26975,7 +27257,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:55
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--config"
msgstr ""
@@ -26987,7 +27269,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:60
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--guides"
msgstr ""
@@ -26999,7 +27281,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:65
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--info"
msgstr ""
@@ -27011,7 +27293,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:70
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--man"
msgstr ""
@@ -27029,7 +27311,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:80
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--web"
msgstr ""
@@ -27053,7 +27335,7 @@ msgstr ""
#. type: Title ~
#: en/git-help.txt:94
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "help.format"
msgstr ""
@@ -27254,7 +27536,7 @@ msgstr ""
#. type: Title =
#: en/git-http-backend.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-http-backend(1)"
msgstr ""
@@ -27395,7 +27677,7 @@ msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:102
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\tAuthType Basic\n"
"\tAuthName \"Git Access\"\n"
@@ -27413,7 +27695,7 @@ msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:115
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"<LocationMatch \"^/git/.*/git-receive-pack$\">\n"
"\tAuthType Basic\n"
@@ -27437,7 +27719,7 @@ msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:136
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"<Location /git/private>\n"
"\tAuthType Basic\n"
@@ -27587,7 +27869,7 @@ msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:231
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"auth.require = (\n"
"\t\"/\" => (\n"
@@ -27682,7 +27964,7 @@ msgstr ""
#. type: Title =
#: en/git-http-fetch.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-http-fetch(1)"
msgstr ""
@@ -27766,7 +28048,7 @@ msgstr ""
#. type: Labeled list
#: en/git-http-fetch.txt:43
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--recover"
msgstr ""
@@ -27778,7 +28060,7 @@ msgstr ""
#. type: Title =
#: en/git-http-push.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-http-push(1)"
msgstr ""
@@ -27790,7 +28072,7 @@ msgstr ""
#. type: Plain text
#: en/git-http-push.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>...]\n"
msgstr ""
@@ -27859,7 +28141,7 @@ msgstr ""
#. type: Labeled list
#: en/git-http-push.txt:54 en/git-send-pack.txt:98
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<ref>..."
msgstr ""
@@ -27931,7 +28213,7 @@ msgstr ""
#. type: Title =
#: en/git-imap-send.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-imap-send(1)"
msgstr ""
@@ -27973,7 +28255,7 @@ msgstr ""
#. type: Labeled list
#: en/git-imap-send.txt:40
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--curl"
msgstr ""
@@ -27985,7 +28267,7 @@ msgstr ""
#. type: Labeled list
#: en/git-imap-send.txt:45
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-curl"
msgstr ""
@@ -28123,7 +28405,7 @@ msgstr ""
#. type: Title =
#: en/git-index-pack.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-index-pack(1)"
msgstr ""
@@ -28174,7 +28456,7 @@ msgstr ""
#. type: Labeled list
#: en/git-index-pack.txt:48
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--fix-thin"
msgstr ""
@@ -28228,7 +28510,7 @@ msgstr ""
#. type: Labeled list
#: en/git-index-pack.txt:80
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--fsck-objects"
msgstr ""
@@ -28282,7 +28564,7 @@ msgstr ""
#. type: Title =
#: en/git-init-db.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-init-db(1)"
msgstr ""
@@ -28306,7 +28588,7 @@ msgstr ""
#. type: Title =
#: en/git-init.txt:2
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "git-init(1)"
msgstr ""
@@ -28553,7 +28835,7 @@ msgstr ""
#. type: Title =
#: en/git-instaweb.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-instaweb(1)"
msgstr ""
@@ -28586,7 +28868,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:28
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--httpd"
msgstr ""
@@ -28598,7 +28880,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:37
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--module-path"
msgstr ""
@@ -28610,7 +28892,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:42
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--port"
msgstr ""
@@ -28622,7 +28904,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:46
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--browser"
msgstr ""
@@ -28640,7 +28922,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:54
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--start"
msgstr ""
@@ -28658,7 +28940,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:59
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--stop"
msgstr ""
@@ -28676,7 +28958,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:65
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--restart"
msgstr ""
@@ -28712,7 +28994,7 @@ msgstr ""
#. type: Title =
#: en/git-interpret-trailers.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-interpret-trailers(1)"
msgstr ""
@@ -28724,7 +29006,7 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git interpret-trailers' [<options>] [(--trailer <token>[(=|:)<value>])...] [<file>...]\n"
"'git interpret-trailers' [<options>] [--parse] [<file>...]\n"
@@ -28798,7 +29080,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:74
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--in-place"
msgstr ""
@@ -28810,7 +29092,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:77
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--trim-empty"
msgstr ""
@@ -28840,7 +29122,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:88
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-where"
msgstr ""
@@ -28858,7 +29140,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:96
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-if-exists"
msgstr ""
@@ -28876,7 +29158,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:105
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-if-missing"
msgstr ""
@@ -28888,7 +29170,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:113
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--only-trailers"
msgstr ""
@@ -28900,7 +29182,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:116
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--only-input"
msgstr ""
@@ -28912,7 +29194,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:121
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--unfold"
msgstr ""
@@ -28924,7 +29206,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:125
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--parse"
msgstr ""
@@ -28936,7 +29218,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:129
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-divider"
msgstr ""
@@ -29376,13 +29658,13 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:387
-#, priority:100
+#, ignore-same, priority:100
msgid "linkgit:git-commit[1], linkgit:git-format-patch[1], linkgit:git-config[1]"
msgstr ""
#. type: Title =
#: en/git-log.txt:2
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "git-log(1)"
msgstr ""
@@ -29394,7 +29676,7 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:13
-#, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:260
msgid "'git log' [<options>] [<revision range>] [[--] <path>...]\n"
msgstr ""
@@ -29412,7 +29694,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:27
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--follow"
msgstr ""
@@ -29424,7 +29706,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:31
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--no-decorate"
msgstr ""
@@ -29460,7 +29742,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:48
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--source"
msgstr ""
@@ -29472,7 +29754,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:52
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--[no-]use-mailmap"
msgstr ""
@@ -29484,13 +29766,13 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:57
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--full-diff"
msgstr ""
#. type: Plain text
#: en/git-log.txt:63
-#, priority:260
+#, ignore-ellipsis, priority:260
msgid "Without this flag, `git log -p <path>...` shows commits that touch the specified paths, and diffs about the same specified paths. With this, the full diff is shown for commits that touch the specified paths; this means that \"<path>...\" limits only commits, and doesn't limit diff for those commits."
msgstr ""
@@ -29502,7 +29784,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:67
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--log-size"
msgstr ""
@@ -29544,7 +29826,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:93 en/git-shortlog.txt:72
-#, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:260
msgid "[--] <path>..."
msgstr ""
@@ -29694,7 +29976,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:182
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "format.pretty"
msgstr ""
@@ -29706,7 +29988,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:186
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "i18n.logOutputEncoding"
msgstr ""
@@ -29718,7 +30000,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:191
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "log.date"
msgstr ""
@@ -29736,7 +30018,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:200
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "log.follow"
msgstr ""
@@ -29748,7 +30030,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:206
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "log.showRoot"
msgstr ""
@@ -29760,7 +30042,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:212
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "log.showSignature"
msgstr ""
@@ -29808,7 +30090,7 @@ msgstr ""
#. type: Title =
#: en/git-ls-files.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-ls-files(1)"
msgstr ""
@@ -29820,7 +30102,7 @@ msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:23
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git ls-files' [-z] [-t] [-v] [-f]\n"
"\t\t(--[cached|deleted|others|ignored|stage|unmerged|killed|modified])*\n"
@@ -29855,7 +30137,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:40
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--deleted"
msgstr ""
@@ -29867,7 +30149,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:44
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--modified"
msgstr ""
@@ -29879,7 +30161,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:48
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--others"
msgstr ""
@@ -29891,7 +30173,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:52
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--ignored"
msgstr ""
@@ -29903,7 +30185,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:60
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--stage"
msgstr ""
@@ -29915,7 +30197,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:63
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--directory"
msgstr ""
@@ -29927,7 +30209,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:67
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-empty-directory"
msgstr ""
@@ -29939,7 +30221,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:71 en/git-update-index.txt:67
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--unmerged"
msgstr ""
@@ -29951,7 +30233,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:75
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--killed"
msgstr ""
@@ -30017,7 +30299,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:102
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--error-unmatch"
msgstr ""
@@ -30167,7 +30449,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:165
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--eol"
msgstr ""
@@ -30283,13 +30565,13 @@ msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:247
-#, priority:100
+#, ignore-same, priority:100
msgid "linkgit:git-read-tree[1], linkgit:gitignore[5]"
msgstr ""
#. type: Title =
#: en/git-ls-remote.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-ls-remote(1)"
msgstr ""
@@ -30301,7 +30583,7 @@ msgstr ""
#. type: Plain text
#: en/git-ls-remote.txt:15
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git ls-remote' [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
"\t [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n"
@@ -30316,7 +30598,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:25 en/git-show-ref.txt:40
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--heads"
msgstr ""
@@ -30328,7 +30610,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:33
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--refs"
msgstr ""
@@ -30364,7 +30646,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:52
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--get-url"
msgstr ""
@@ -30376,7 +30658,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:57
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--symref"
msgstr ""
@@ -30406,40 +30688,40 @@ msgstr ""
#. type: Plain text
#: en/git-ls-remote.txt:91
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
-#. type: Plain text
-#: en/git-ls-remote.txt:110
+#. type: delimited block -
+#: en/git-ls-remote.txt:111
#, no-wrap, priority:100
msgid ""
-"\t$ git ls-remote --tags ./.\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"\t$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
-"\t5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"\tc781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
-"\t$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
-"\t$ git ls-remote --tags korg v\\*\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"$ git ls-remote --tags ./.\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
+"$ git ls-remote --tags korg v\\*\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:114
+#: en/git-ls-remote.txt:116
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
-msgstr "linkgit:git-check-ref-format[1]."
+msgstr ""
#. type: Title =
#: en/git-ls-tree.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-ls-tree(1)"
msgstr ""
@@ -30451,7 +30733,7 @@ msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:15
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git ls-tree' [-d] [-r] [-t] [-l] [-z]\n"
"\t [--name-only] [--name-status] [--full-name] [--full-tree] [--abbrev[=<n>]]\n"
@@ -30532,7 +30814,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-tree.txt:76
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "[<path>...]"
msgstr ""
@@ -30580,7 +30862,7 @@ msgstr ""
#. type: Title =
#: en/git-mailinfo.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-mailinfo(1)"
msgstr ""
@@ -30730,7 +31012,7 @@ msgstr ""
#. type: Title =
#: en/git-mailsplit.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-mailsplit(1)"
msgstr ""
@@ -30742,7 +31024,7 @@ msgstr ""
#. type: Plain text
#: en/git-mailsplit.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git mailsplit' [-b] [-f<nn>] [-d<prec>] [--keep-cr] [--mboxrd]\n"
"\t\t-o<directory> [--] [(<mbox>|<Maildir>)...]\n"
@@ -30828,7 +31110,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mailsplit.txt:48
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--keep-cr"
msgstr ""
@@ -30840,7 +31122,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mailsplit.txt:51
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--mboxrd"
msgstr ""
@@ -30852,7 +31134,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-base.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-merge-base(1)"
msgstr ""
@@ -30864,7 +31146,7 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:17
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git merge-base' [-a|--all] <commit> <commit>...\n"
"'git merge-base' [-a|--all] --octopus <commit>...\n"
@@ -30905,7 +31187,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:43
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--octopus"
msgstr ""
@@ -30917,7 +31199,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:48 en/git-show-branch.txt:90
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--independent"
msgstr ""
@@ -30929,7 +31211,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:55
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--is-ancestor"
msgstr ""
@@ -30940,8 +31222,8 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:358
-#, no-wrap, priority:100
+#: en/git-merge-base.txt:60 en/git-rebase.txt:376
+#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr ""
@@ -30969,242 +31251,242 @@ msgstr ""
msgid "For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:86
+#. type: delimited block .
+#: en/git-merge-base.txt:87
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---B\n"
-"\t /\n"
-"\t---o---1---o---o---o---A\n"
+"\t o---o---o---B\n"
+"\t/\n"
+"---o---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:88
+#: en/git-merge-base.txt:90
#, priority:100
msgid "the merge base between 'A' and 'B' is '1'."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:92
+#: en/git-merge-base.txt:94
#, priority:100
msgid "Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the merge base between 'A' and a hypothetical commit 'M', which is a merge between 'B' and 'C'. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:98
+#. type: delimited block .
+#: en/git-merge-base.txt:101
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---C\n"
-"\t /\n"
-"\t / o---o---o---B\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---C\n"
+" /\n"
+" / o---o---o---B\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:101
+#: en/git-merge-base.txt:105
#, priority:100
msgid "the result of `git merge-base A B C` is '1'. This is because the equivalent topology with a merge commit 'M' between 'B' and 'C' is:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:108
+#. type: delimited block .
+#: en/git-merge-base.txt:113
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---o\n"
-"\t / \\\n"
-"\t / o---o---o---o---M\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---o\n"
+" / \\\n"
+" / o---o---o---o---M\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:112
+#: en/git-merge-base.txt:118
#, priority:100
msgid "and the result of `git merge-base A M` is '1'. Commit '2' is also a common ancestor between 'A' and 'M', but '1' is a better common ancestor, because '2' is an ancestor of '1'. Hence, '2' is not a merge base."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:115
+#: en/git-merge-base.txt:121
#, priority:100
msgid "The result of `git merge-base --octopus A B C` is '2', because '2' is the best common ancestor of all commits."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:118
+#: en/git-merge-base.txt:124
#, priority:100
msgid "When the history involves criss-cross merges, there can be more than one 'best' common ancestor for two commits. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:124
+#. type: delimited block .
+#: en/git-merge-base.txt:131
#, no-wrap, priority:100
msgid ""
-"\t---1---o---A\n"
-"\t \\ /\n"
-"\t X\n"
-"\t / \\\n"
-"\t---2---o---o---B\n"
+"---1---o---A\n"
+" \\ /\n"
+" X\n"
+" / \\\n"
+"---2---o---o---B\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:128
+#: en/git-merge-base.txt:136
#, priority:100
msgid "both '1' and '2' are merge-bases of A and B. Neither one is better than the other (both are 'best' merge bases). When the `--all` option is not given, it is unspecified which best one is output."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:133
+#: en/git-merge-base.txt:141
#, priority:100
msgid "A common idiom to check \"fast-forward-ness\" between two commits A and B is (or at least used to be) to compute the merge base between A and B, and check if it is the same as A, in which case, A is an ancestor of B. You will see this idiom used often in older scripts."
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:139
-#, no-wrap, priority:100
+#. type: delimited block .
+#: en/git-merge-base.txt:148
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tA=$(git rev-parse --verify A)\n"
-"\tif test \"$A\" = \"$(git merge-base A B)\"\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"A=$(git rev-parse --verify A)\n"
+"if test \"$A\" = \"$(git merge-base A B)\"\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:141
+#: en/git-merge-base.txt:151
#, priority:100
msgid "In modern git, you can say this in a more direct way:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:146
-#, no-wrap, priority:100
+#. type: delimited block .
+#: en/git-merge-base.txt:157
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tif git merge-base --is-ancestor A B\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"if git merge-base --is-ancestor A B\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:148
+#: en/git-merge-base.txt:160
#, priority:100
msgid "instead."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:150
+#: en/git-merge-base.txt:162
#, no-wrap, priority:100
msgid "Discussion on fork-point mode"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:156
+#: en/git-merge-base.txt:168
#, priority:100
msgid "After working on the `topic` branch created with `git switch -c topic origin/master`, the history of remote-tracking branch `origin/master` may have been rewound and rebuilt, leading to a history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:164
+#. type: delimited block .
+#: en/git-merge-base.txt:177
#, no-wrap, priority:100
msgid ""
-"\t o---B2\n"
-"\t /\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t \\\n"
-"\t B0\n"
-"\t \\\n"
-"\t D0---D1---D (topic)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\\n"
+"\t B0\n"
+"\t \\\n"
+"\t D0---D1---D (topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:170
+#: en/git-merge-base.txt:184
#, priority:100
msgid "where `origin/master` used to point at commits B0, B1, B2 and now it points at B, and your `topic` branch was started on top of it back when `origin/master` was at B0, and you built three commits, D0, D1, and D, on top of it. Imagine that you now want to rebase the work you did on the topic on top of the updated origin/master."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:176
+#: en/git-merge-base.txt:190
#, priority:100
msgid "In such a case, `git merge-base origin/master topic` would return the parent of B0 in the above picture, but B0^..D is *not* the range of commits you would want to replay on top of B (it includes B0, which is not what you wrote; it is a commit the other side discarded when it moved its tip from B0 to B1)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:184
+#: en/git-merge-base.txt:198
#, priority:100
msgid "`git merge-base --fork-point origin/master topic` is designed to help in such a case. It takes not only B but also B0, B1, and B2 (i.e. old tips of the remote-tracking branches your repository's reflog knows about) into account to see on which commit your topic branch was built and finds B0, allowing you to replay only the commits on your topic, excluding the commits the other side later discarded."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:186
+#: en/git-merge-base.txt:200
#, priority:100
msgid "Hence"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:188
+#: en/git-merge-base.txt:202
#, no-wrap, priority:100
msgid " $ fork_point=$(git merge-base --fork-point origin/master topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:190
+#: en/git-merge-base.txt:204
#, priority:100
msgid "will find B0, and"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:192
+#: en/git-merge-base.txt:206
#, no-wrap, priority:100
msgid " $ git rebase --onto origin/master $fork_point topic\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:195
+#: en/git-merge-base.txt:209
#, priority:100
msgid "will replay D0, D1 and D on top of B to create a new history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:203
+#. type: delimited block .
+#: en/git-merge-base.txt:218
#, no-wrap, priority:100
msgid ""
-"\t\t\t o---B2\n"
-"\t\t\t/\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t\t\\ \\\n"
-"\t\t B0 D0'--D1'--D' (topic - updated)\n"
-"\t\t \\\n"
-"\t\t D0---D1---D (topic - old)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\ \\\n"
+"\t B0 D0'--D1'--D' (topic - updated)\n"
+"\t \\\n"
+"\t D0---D1---D (topic - old)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:210
+#: en/git-merge-base.txt:226
#, priority:100
msgid "A caveat is that older reflog entries in your repository may be expired by `git gc`. If B0 no longer appears in the reflog of the remote-tracking branch `origin/master`, the `--fork-point` mode obviously cannot find it and fails, avoiding to give a random and useless result (such as the parent of B0, like the same command without the `--fork-point` option gives)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:221
+#: en/git-merge-base.txt:237
#, priority:100
msgid "Also, the remote-tracking branch you use the `--fork-point` mode with must be the one your topic forked from its tip. If you forked from an older commit than the tip, this mode would not find the fork point (imagine in the above sample history B0 did not exist, origin/master started at B1, moved to B2 and then B, and you forked your topic at origin/master^ when origin/master was B1; the shape of the history would be the same as above, without B0, and the parent of B1 is what `git merge-base origin/master topic` correctly finds, but the `--fork-point` mode will not, because it is not one of the commits that used to be at the tip of origin/master)."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:224
+#: en/git-merge-base.txt:240
#, no-wrap, priority:100
msgid "See also"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:228
-#, priority:100
+#: en/git-merge-base.txt:244
+#, ignore-same, priority:100
msgid "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
msgstr ""
#. type: Title =
#: en/git-merge-file.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-merge-file(1)"
msgstr ""
@@ -31290,7 +31572,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-file.txt:70
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--diff3"
msgstr ""
@@ -31302,7 +31584,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-file.txt:75
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--union"
msgstr ""
@@ -31338,7 +31620,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-index.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-merge-index(1)"
msgstr ""
@@ -31408,38 +31690,38 @@ msgstr ""
msgid "Examples:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:62
+#. type: delimited block -
+#: en/git-merge-index.txt:63
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
-" This is MM from the original tree.\t\t\t# original\n"
-" This is modified MM in the branch A.\t\t\t# merge1\n"
-" This is modified MM in the branch B.\t\t\t# merge2\n"
-" This is modified MM in the branch B.\t\t\t# current contents\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
+"This is MM from the original tree.\t\t# original\n"
+"This is modified MM in the branch A.\t\t# merge1\n"
+"This is modified MM in the branch B.\t\t# merge2\n"
+"This is modified MM in the branch B.\t\t# current contents\n"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:71
+#. type: delimited block -
+#: en/git-merge-index.txt:74
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
-" cat: : No such file or directory\n"
-" This is added AA in the branch A.\n"
-" This is added AA in the branch B.\n"
-" This is added AA in the branch B.\n"
-" fatal: merge program failed\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
+"cat: : No such file or directory\n"
+"This is added AA in the branch A.\n"
+"This is added AA in the branch B.\n"
+"This is added AA in the branch B.\n"
+"fatal: merge program failed\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-index.txt:76
+#: en/git-merge-index.txt:80
#, priority:100
msgid "where the latter example shows how 'git merge-index' will stop trying to merge once anything has returned an error (i.e., `cat` returned an error for the AA file, because it didn't exist in the original, and thus 'git merge-index' didn't even try to merge the MM thing)."
msgstr ""
#. type: Title =
#: en/git-merge-one-file.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-merge-one-file(1)"
msgstr ""
@@ -31553,7 +31835,7 @@ msgstr ""
#. type: Title =
#: en/git-mergetool.txt:2
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "git-mergetool(1)"
msgstr ""
@@ -31565,7 +31847,7 @@ msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:12
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
msgstr ""
@@ -31637,7 +31919,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mergetool.txt:83
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--gui"
msgstr ""
@@ -31649,7 +31931,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mergetool.txt:90
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--no-gui"
msgstr ""
@@ -31685,7 +31967,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-tree.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-merge-tree(1)"
msgstr ""
@@ -31715,7 +31997,7 @@ msgstr ""
#. type: Title =
#: en/git-merge.txt:2
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "git-merge(1)"
msgstr ""
@@ -31727,10 +32009,10 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:17
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n"
-"\t[-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
+"\t[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
"\t[--[no-]allow-unrelated-histories]\n"
"\t[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]\n"
"'git merge' (--continue | --abort | --quit)\n"
@@ -32196,13 +32478,13 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:369
-#, priority:240
+#, ignore-same, priority:240
msgid "linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5], linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]"
msgstr ""
#. type: Title =
#: en/git-mktag.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-mktag(1)"
msgstr ""
@@ -32260,7 +32542,7 @@ msgstr ""
#. type: Title =
#: en/git-mktree.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-mktree(1)"
msgstr ""
@@ -32290,7 +32572,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mktree.txt:26
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--missing"
msgstr ""
@@ -32308,7 +32590,7 @@ msgstr ""
#. type: Title =
#: en/git-mv.txt:2
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "git-mv(1)"
msgstr ""
@@ -32320,7 +32602,7 @@ msgstr ""
#. type: Plain text
#: en/git-mv.txt:13
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "'git mv' <options>... <args>...\n"
msgstr ""
@@ -32332,7 +32614,7 @@ msgstr ""
#. type: Plain text
#: en/git-mv.txt:20
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
" git mv [-v] [-f] [-n] [-k] <source> <destination>\n"
" git mv [-v] [-f] [-n] [-k] <source> ... <destination directory>\n"
@@ -32388,7 +32670,7 @@ msgstr ""
#. type: Title =
#: en/git-name-rev.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-name-rev(1)"
msgstr ""
@@ -32400,7 +32682,7 @@ msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:14
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git name-rev' [--tags] [--refs=<pattern>]\n"
"\t ( --all | --stdin | <commit-ish>... )\n"
@@ -32456,7 +32738,7 @@ msgstr ""
#. type: Labeled list
#: en/git-name-rev.txt:57
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-undefined"
msgstr ""
@@ -32506,7 +32788,7 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-notes(1)"
msgstr ""
@@ -32518,7 +32800,7 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:23
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git notes' [list [<object>]]\n"
"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -32580,7 +32862,7 @@ msgstr ""
#: en/git-notes.txt:56 en/git-worktree.txt:81
#, ignore-same, no-wrap, priority:240
msgid "list"
-msgstr "list"
+msgstr ""
#. type: Plain text
#: en/git-notes.txt:61
@@ -32688,7 +32970,7 @@ msgstr ""
#: en/git-notes.txt:112 en/git-worktree.txt:105
#, ignore-same, no-wrap, priority:240
msgid "remove"
-msgstr "remove"
+msgstr ""
#. type: Plain text
#: en/git-notes.txt:117
@@ -32700,7 +32982,7 @@ msgstr ""
#: en/git-notes.txt:118 en/git-worktree.txt:101
#, ignore-same, no-wrap, priority:240
msgid "prune"
-msgstr "prune"
+msgstr ""
#. type: Plain text
#: en/git-notes.txt:120
@@ -32811,7 +33093,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:281 en/merge-options.txt:108
+#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -32824,7 +33106,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--commit"
msgstr ""
@@ -32854,7 +33136,7 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Commit notes are blobs containing extra information about an object (usually information to supplement a commit's message). These blobs are taken from notes refs. A notes ref is usually a branch which contains \"files\" whose paths are the object names for the objects they describe, with some directory separators included for performance reasons footnote:[Permitted pathnames have the form 'ab'`/`'cd'`/`'ef'`/`'...'`/`'abcdef...': a sequence of directory names of two hexadecimal digits each followed by a filename with the rest of the object ID.]."
msgstr ""
@@ -32920,7 +33202,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:288
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -32959,7 +33241,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:313
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "core.notesRef"
msgstr ""
@@ -33067,7 +33349,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOTES_REF`"
msgstr ""
@@ -33079,7 +33361,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr ""
@@ -33097,7 +33379,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:389
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr ""
@@ -33109,7 +33391,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr ""
@@ -33127,7 +33409,7 @@ msgstr ""
#. type: Title =
#: en/git-p4.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4(1)"
msgstr ""
@@ -33139,7 +33421,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:16
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git p4 clone' [<sync options>] [<clone options>] <p4 depot path>...\n"
"'git p4 sync' [<sync options>] [<p4 depot path>...]\n"
@@ -33522,7 +33804,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:236
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--detect-branches"
msgstr ""
@@ -33546,7 +33828,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:245
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--silent"
msgstr ""
@@ -33558,7 +33840,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:248
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--detect-labels"
msgstr ""
@@ -33570,7 +33852,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:253 en/git-p4.txt:389
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--import-labels"
msgstr ""
@@ -33582,7 +33864,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:256
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--import-local"
msgstr ""
@@ -33618,7 +33900,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:280
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--keep-path"
msgstr ""
@@ -33630,7 +33912,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:288
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--use-client-spec"
msgstr ""
@@ -33714,7 +33996,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:323
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--preserve-user"
msgstr ""
@@ -33726,7 +34008,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:327
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--export-labels"
msgstr ""
@@ -33744,7 +34026,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:336
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--prepare-p4-only"
msgstr ""
@@ -33756,7 +34038,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:343
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--shelve"
msgstr ""
@@ -33791,7 +34073,7 @@ msgid "Conflicts can occur when applying a commit to p4. When this happens, the
msgstr ""
#. type: Labeled list
-#: en/git-p4.txt:359 en/git-submodule.txt:270
+#: en/git-p4.txt:359 en/git-submodule.txt:271
#, no-wrap, priority:220
msgid "--branch <branch>"
msgstr ""
@@ -33816,7 +34098,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:368
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--disable-rebase"
msgstr ""
@@ -33828,7 +34110,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:372
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--disable-p4sync"
msgstr ""
@@ -33882,7 +34164,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:395
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--origin"
msgstr ""
@@ -33972,7 +34254,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:445
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "The full syntax for a p4 view is documented in 'p4 help views'. 'git p4' knows only a subset of the view syntax. It understands multi-line mappings, overlays with '+', exclusions with '-' and double-quotes around whitespace. Of the possible wildcards, 'git p4' only handles '...', and only when it is at the end of the path. 'git p4' will complain if it encounters an unhandled wildcard."
msgstr ""
@@ -34014,7 +34296,7 @@ msgstr ""
#. type: delimited block -
#: en/git-p4.txt:475
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"//depot/main/...\n"
"//depot/branch1/...\n"
@@ -34028,7 +34310,7 @@ msgstr ""
#. type: delimited block -
#: en/git-p4.txt:480
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "//depot/main/... //depot/branch1/...\n"
msgstr ""
@@ -34086,7 +34368,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:521
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.user"
msgstr ""
@@ -34098,7 +34380,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:525
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.password"
msgstr ""
@@ -34110,7 +34392,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:530
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.port"
msgstr ""
@@ -34122,7 +34404,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:535
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.host"
msgstr ""
@@ -34134,7 +34416,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:540
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.client"
msgstr ""
@@ -34146,7 +34428,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:544
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.retries"
msgstr ""
@@ -34164,7 +34446,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:552
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.syncFromOrigin"
msgstr ""
@@ -34176,7 +34458,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:559
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.branchUser"
msgstr ""
@@ -34188,7 +34470,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:565
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.branchList"
msgstr ""
@@ -34220,7 +34502,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:580
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.importLabels"
msgstr ""
@@ -34232,7 +34514,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:583
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.labelImportRegexp"
msgstr ""
@@ -34244,7 +34526,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:587
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.useClientSpec"
msgstr ""
@@ -34256,7 +34538,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:593
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.pathEncoding"
msgstr ""
@@ -34268,7 +34550,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:600
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.largeFileSystem"
msgstr ""
@@ -34286,7 +34568,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:611
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.largeFileExtensions"
msgstr ""
@@ -34298,7 +34580,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:615
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.largeFileThreshold"
msgstr ""
@@ -34310,7 +34592,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:620
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.largeFileCompressedThreshold"
msgstr ""
@@ -34322,7 +34604,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:626
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.largeFilePush"
msgstr ""
@@ -34334,7 +34616,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:630
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.keepEmptyCommits"
msgstr ""
@@ -34346,7 +34628,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:634
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.mapUser"
msgstr ""
@@ -34376,7 +34658,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:647
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.detectRenames"
msgstr ""
@@ -34388,7 +34670,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:651
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.detectCopies"
msgstr ""
@@ -34400,7 +34682,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:655
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.detectCopiesHarder"
msgstr ""
@@ -34412,7 +34694,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:658
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.preserveUser"
msgstr ""
@@ -34436,7 +34718,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:667
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.skipSubmitEdit"
msgstr ""
@@ -34448,7 +34730,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:672
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.skipSubmitEditCheck"
msgstr ""
@@ -34460,7 +34742,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:677
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.allowSubmit"
msgstr ""
@@ -34472,7 +34754,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:684
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.skipUserNameCheck"
msgstr ""
@@ -34484,7 +34766,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:689
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.attemptRCSCleanup"
msgstr ""
@@ -34496,7 +34778,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:695
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.exportLabels"
msgstr ""
@@ -34508,7 +34790,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:698
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.labelExportRegexp"
msgstr ""
@@ -34520,7 +34802,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:702
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.conflict"
msgstr ""
@@ -34532,7 +34814,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:706
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-p4.disableRebase"
msgstr ""
@@ -34586,7 +34868,7 @@ msgstr ""
#. type: Title =
#: en/git-pack-objects.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-pack-objects(1)"
msgstr ""
@@ -34658,7 +34940,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:63
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--revs"
msgstr ""
@@ -34670,7 +34952,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:72 en/rev-list-options.txt:715
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--unpacked"
msgstr ""
@@ -34730,7 +35012,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:126
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--honor-pack-keep"
msgstr ""
@@ -34766,7 +35048,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:147
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--non-empty"
msgstr ""
@@ -34778,7 +35060,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:157
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--all-progress"
msgstr ""
@@ -34790,7 +35072,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:168
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--all-progress-implied"
msgstr ""
@@ -34808,7 +35090,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:177
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-reuse-delta"
msgstr ""
@@ -34820,7 +35102,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:184
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-reuse-object"
msgstr ""
@@ -34844,7 +35126,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:199 en/git-show-branch.txt:67 en/rev-list-options.txt:350 en/rev-list-options.txt:483
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--sparse"
msgstr ""
@@ -34868,7 +35150,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:218
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--shallow"
msgstr ""
@@ -34880,7 +35162,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:223
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--delta-base-offset"
msgstr ""
@@ -34904,7 +35186,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:254
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--keep-true-parents"
msgstr ""
@@ -34927,8 +35209,8 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:263 en/rev-list-options.txt:760
-#, no-wrap, priority:260
+#: en/git-pack-objects.txt:263 en/rev-list-options.txt:776
+#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr ""
@@ -34939,13 +35221,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:266 en/rev-list-options.txt:767
+#: en/git-pack-objects.txt:266 en/rev-list-options.txt:783
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:269 en/rev-list-options.txt:770
+#: en/git-pack-objects.txt:269 en/rev-list-options.txt:786
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -34957,7 +35239,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:276 en/rev-list-options.txt:777
+#: en/git-pack-objects.txt:276 en/rev-list-options.txt:793
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -34969,8 +35251,8 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:281 en/rev-list-options.txt:785
-#, no-wrap, priority:260
+#: en/git-pack-objects.txt:281 en/rev-list-options.txt:801
+#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr ""
@@ -34982,7 +35264,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:288 en/git-repack.txt:157
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--keep-unreachable"
msgstr ""
@@ -34994,7 +35276,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:294
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--pack-loose-unreachable"
msgstr ""
@@ -35006,7 +35288,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:298
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--unpack-unreachable"
msgstr ""
@@ -35018,7 +35300,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:301 en/git-repack.txt:164
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--delta-islands"
msgstr ""
@@ -35127,13 +35409,13 @@ msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:403
-#, priority:100
+#, ignore-same, priority:100
msgid "linkgit:git-rev-list[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
msgstr ""
#. type: Title =
#: en/git-pack-redundant.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-pack-redundant(1)"
msgstr ""
@@ -35145,7 +35427,7 @@ msgstr ""
#. type: Plain text
#: en/git-pack-redundant.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git pack-redundant' [ --verbose ] [ --alt-odb ] < --all | .pack filename ... >\n"
msgstr ""
@@ -35175,7 +35457,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-redundant.txt:35
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--alt-odb"
msgstr ""
@@ -35193,13 +35475,13 @@ msgstr ""
#. type: Plain text
#: en/git-pack-redundant.txt:47
-#, priority:100
+#, ignore-same, priority:100
msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
msgstr ""
#. type: Title =
#: en/git-pack-refs.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-pack-refs(1)"
msgstr ""
@@ -35259,7 +35541,7 @@ msgstr ""
#. type: Title =
#: en/git-parse-remote.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-parse-remote(1)"
msgstr ""
@@ -35283,7 +35565,7 @@ msgstr ""
#. type: Title =
#: en/git-patch-id.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-patch-id(1)"
msgstr ""
@@ -35325,7 +35607,7 @@ msgstr ""
#. type: Labeled list
#: en/git-patch-id.txt:33
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--stable"
msgstr ""
@@ -35355,7 +35637,7 @@ msgstr ""
#. type: Labeled list
#: en/git-patch-id.txt:50
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--unstable"
msgstr ""
@@ -35373,7 +35655,7 @@ msgstr ""
#. type: Title =
#: en/git-prune-packed.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-prune-packed(1)"
msgstr ""
@@ -35427,13 +35709,13 @@ msgstr ""
#. type: Plain text
#: en/git-prune-packed.txt:44
-#, priority:100
+#, ignore-same, priority:100
msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
msgstr ""
#. type: Title =
#: en/git-prune.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-prune(1)"
msgstr ""
@@ -35445,7 +35727,7 @@ msgstr ""
#. type: Plain text
#: en/git-prune.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
msgstr ""
@@ -35499,7 +35781,7 @@ msgstr ""
#. type: Labeled list
#: en/git-prune.txt:54
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<head>..."
msgstr ""
@@ -35535,13 +35817,13 @@ msgstr ""
#. type: Plain text
#: en/git-prune.txt:86
-#, priority:100
+#, ignore-same, priority:100
msgid "linkgit:git-fsck[1], linkgit:git-gc[1], linkgit:git-reflog[1]"
msgstr ""
#. type: Title =
#: en/git-pull.txt:2
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "git-pull(1)"
msgstr ""
@@ -35553,7 +35835,7 @@ msgstr ""
#. type: Plain text
#: en/git-pull.txt:13
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
msgstr ""
@@ -35717,7 +35999,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pull.txt:133 en/git-svn.txt:261
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--no-rebase"
msgstr ""
@@ -35728,14 +36010,14 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:502
-#, no-wrap, priority:220
+#: en/git-pull.txt:136 en/git-rebase.txt:524
+#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:503
-#, no-wrap, priority:220
+#: en/git-pull.txt:137 en/git-rebase.txt:525
+#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr ""
@@ -35883,13 +36165,13 @@ msgstr ""
#. type: Plain text
#: en/git-pull.txt:260
-#, priority:220
+#, ignore-same, priority:220
msgid "linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]"
msgstr ""
#. type: Title =
#: en/git-push.txt:2
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "git-push(1)"
msgstr ""
@@ -35901,7 +36183,7 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:18
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]\n"
"\t [--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]\n"
@@ -35931,7 +36213,7 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:39
-#, priority:220
+#, ignore-ellipsis, priority:220
msgid "When the command line does not specify what to push with `<refspec>...` arguments or `--all`, `--mirror`, `--tags` options, the command finds the default `<refspec>` by consulting `remote.*.push` configuration, and if it is not found, honors `push.default` configuration to decide what to push (See linkgit:git-config[1] for the meaning of `push.default`)."
msgstr ""
@@ -35955,7 +36237,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:56
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid "<refspec>..."
msgstr ""
@@ -36099,7 +36381,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:191
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--follow-tags"
msgstr ""
@@ -36111,7 +36393,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:199 en/git-send-pack.txt:73
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--[no-]signed"
msgstr ""
@@ -36129,7 +36411,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:210
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--[no-]atomic"
msgstr ""
@@ -36171,7 +36453,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:234
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--[no-]force-with-lease"
msgstr ""
@@ -36315,7 +36597,7 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:343
-#, priority:220
+#, ignore-ellipsis, priority:220
msgid "Note that `--force` applies to all the refs that are pushed, hence using it with `push.default` set to `matching` or with multiple push destinations configured with `remote.*.push` may overwrite refs other than the current branch (including local refs that are strictly behind their remote counterpart). To force a push to only one branch, use a `+` in front of the refspec to push (e.g `git push origin +master` to force a push to the `master` branch). See the `<refspec>...` section above for details."
msgstr ""
@@ -36339,7 +36621,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:355
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--[no-]thin"
msgstr ""
@@ -36369,7 +36651,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:393
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "--[no-]verify"
msgstr ""
@@ -36447,7 +36729,7 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:445
-#, priority:220
+#, ignore-ellipsis, priority:220
msgid "For a successfully pushed ref, the summary shows the old and new values of the ref in a form suitable for using as an argument to `git log` (this is `<old>..<new>` in most cases, and `<old>...<new>` for forced non-fast-forward updates)."
msgstr ""
@@ -36708,7 +36990,7 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:616
-#, priority:220
+#, ignore-ellipsis, priority:220
msgid "See the section describing `<refspec>...` above for a discussion of the matching semantics."
msgstr ""
@@ -36804,7 +37086,7 @@ msgstr ""
#. type: Title =
#: en/git-quiltimport.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-quiltimport(1)"
msgstr ""
@@ -36896,7 +37178,7 @@ msgstr ""
#. type: Title =
#: en/git-read-tree.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-read-tree(1)"
msgstr ""
@@ -36942,7 +37224,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:40
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--reset"
msgstr ""
@@ -36978,7 +37260,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:66
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--trivial"
msgstr ""
@@ -37050,7 +37332,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:118
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]recurse-submodules"
msgstr ""
@@ -37062,7 +37344,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:124
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-sparse-checkout"
msgstr ""
@@ -37074,7 +37356,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:128
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--empty"
msgstr ""
@@ -37409,7 +37691,7 @@ msgstr ""
#. type: delimited block -
#: en/git-read-tree.txt:357
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git fetch git://.... linus\n"
"$ LT=`git rev-parse FETCH_HEAD`\n"
@@ -37463,7 +37745,7 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:405
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "'git read-tree' and other merge-based commands ('git merge', 'git checkout'...) can help maintaining the skip-worktree bitmap and working directory update. `$GIT_DIR/info/sparse-checkout` is used to define the skip-worktree reference bitmap. When 'git read-tree' needs to update the working directory, it resets the skip-worktree bit in the index based on this file, which uses the same syntax as .gitignore files. If an entry matches a pattern in this file, skip-worktree will not be set on that entry. Otherwise, skip-worktree will be set."
msgstr ""
@@ -37507,13 +37789,13 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:440
-#, priority:100
+#, ignore-same, priority:100
msgid "linkgit:git-write-tree[1]; linkgit:git-ls-files[1]; linkgit:gitignore[5]"
msgstr ""
#. type: Title =
#: en/git-rebase.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-rebase(1)"
msgstr ""
@@ -37527,8 +37809,8 @@ msgstr ""
#: en/git-rebase.txt:16
#, no-wrap, priority:100
msgid ""
-"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
-"\t[<upstream> [<branch>]]\n"
+"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>]\n"
+"\t[--onto <newbase> | --keep-base] [<upstream> [<branch>]]\n"
"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
"\t--root [<branch>]\n"
"'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch)\n"
@@ -37843,516 +38125,546 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:219
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:220
+#, ignore-same, no-wrap, priority:100
+msgid "--keep-base"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:225
+#, ignore-ellipsis, priority:100
+msgid "Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running 'git rebase --keep-base <upstream> <branch>' is equivalent to running 'git rebase --onto <upstream>... <upstream>'."
+msgstr ""
+
#. type: Plain text
-#: en/git-rebase.txt:224
+#: en/git-rebase.txt:230
+#, priority:100
+msgid "This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:235
+#, priority:100
+msgid "Although both this option and --fork-point find the merge base between <upstream> and <branch>, this option uses the merge base as the _starting point_ on which new commits will be created, whereas --fork-point uses the merge base to determine the _set of commits_ which will be rebased."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#, priority:100
+msgid "See also INCOMPATIBLE OPTIONS below."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:242
#, priority:100
msgid "Upstream branch to compare against. May be any valid commit, not just an existing branch name. Defaults to the configured upstream for the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:230
+#: en/git-rebase.txt:248
#, priority:100
msgid "Restart the rebasing process after having resolved a merge conflict."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237
+#: en/git-rebase.txt:255
#, priority:100
msgid "Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:242
+#: en/git-rebase.txt:260
#, priority:100
msgid "Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:243 en/git-rebase.txt:538
-#, no-wrap, priority:100
+#: en/git-rebase.txt:261 en/git-rebase.txt:560
+#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:246
+#: en/git-rebase.txt:264
#, priority:100
msgid "Keep the commits that do not change anything from its parents in the result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:248 en/git-rebase.txt:255 en/git-rebase.txt:280 en/git-rebase.txt:293 en/git-rebase.txt:302 en/git-rebase.txt:344 en/git-rebase.txt:379 en/git-rebase.txt:386 en/git-rebase.txt:393 en/git-rebase.txt:405 en/git-rebase.txt:445 en/git-rebase.txt:470 en/git-rebase.txt:482 en/git-rebase.txt:501
-#, priority:100
-msgid "See also INCOMPATIBLE OPTIONS below."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rebase.txt:253
+#: en/git-rebase.txt:271
#, priority:100
msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:258
+#: en/git-rebase.txt:276
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:259 en/git-rebase.txt:539
-#, no-wrap, priority:100
+#: en/git-rebase.txt:277 en/git-rebase.txt:561
+#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:261
+#: en/git-rebase.txt:279
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:266
+#: en/git-rebase.txt:284
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:272
+#: en/git-rebase.txt:290
#, priority:100
msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:278
+#: en/git-rebase.txt:296
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:286
+#: en/git-rebase.txt:304
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:291
+#: en/git-rebase.txt:309
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:294
+#: en/git-rebase.txt:312
#, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:295
+#: en/git-rebase.txt:313
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:300
+#: en/git-rebase.txt:318
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:317
+#: en/git-rebase.txt:335
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:321
+#: en/git-rebase.txt:339
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:325
+#: en/git-rebase.txt:343
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:329
+#: en/git-rebase.txt:347
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:332
+#: en/git-rebase.txt:350
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:333 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
-#, no-wrap, priority:240
+#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:336
+#: en/git-rebase.txt:354
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:345 en/merge-options.txt:47
-#, no-wrap, priority:240
+#: en/git-rebase.txt:363 en/merge-options.txt:43
+#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:346
-#, no-wrap, priority:100
+#: en/git-rebase.txt:364
+#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:351
+#: en/git-rebase.txt:369
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:357
+#: en/git-rebase.txt:375
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:359
-#, no-wrap, priority:100
+#: en/git-rebase.txt:377
+#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:363
+#: en/git-rebase.txt:381
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:387
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:372
+#: en/git-rebase.txt:390
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:394
+#, priority:100
+msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:399
#, priority:100
msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:384
+#: en/git-rebase.txt:406
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:391
+#: en/git-rebase.txt:413
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:421
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:403
+#: en/git-rebase.txt:425
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:407
+#: en/git-rebase.txt:429
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:415
+#: en/git-rebase.txt:437
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:422
+#: en/git-rebase.txt:444
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:426
+#: en/git-rebase.txt:448
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges`, but in contrast to that option works well in interactive rebases: commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:430
-#, priority:100
+#: en/git-rebase.txt:452
+#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:432
+#: en/git-rebase.txt:454
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:434 en/git-rebase.txt:535 en/git-svn.txt:680
-#, no-wrap, priority:100
+#: en/git-rebase.txt:456 en/git-rebase.txt:557 en/git-svn.txt:680
+#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:439
+#: en/git-rebase.txt:461
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:443
+#: en/git-rebase.txt:465
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:446
+#: en/git-rebase.txt:468
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:447
+#: en/git-rebase.txt:469
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:474
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:455
+#: en/git-rebase.txt:477
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:457
-#, no-wrap, priority:100
+#: en/git-rebase.txt:479
+#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:459
+#: en/git-rebase.txt:481
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:461
-#, no-wrap, priority:100
+#: en/git-rebase.txt:483
+#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:487
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:490
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:480
+#: en/git-rebase.txt:502
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:483
-#, no-wrap, priority:100
+#: en/git-rebase.txt:505
+#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:484
-#, no-wrap, priority:100
+#: en/git-rebase.txt:506
+#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:495
-#, priority:100
+#: en/git-rebase.txt:517
+#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:499
+#: en/git-rebase.txt:521
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:509
+#: en/git-rebase.txt:531
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:510
-#, no-wrap, priority:100
+#: en/git-rebase.txt:532
+#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:511
-#, no-wrap, priority:100
+#: en/git-rebase.txt:533
+#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:514
+#: en/git-rebase.txt:536
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:516
+#: en/git-rebase.txt:538
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:519
+#: en/git-rebase.txt:541
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:523
-#, priority:100
+#: en/git-rebase.txt:545
+#, ignore-same, priority:100
msgid "--whitespace"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:527
+#: en/git-rebase.txt:549
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:530
-#, priority:100
+#: en/git-rebase.txt:552
+#, ignore-same, priority:100
msgid "--strategy"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:531
-#, priority:100
+#: en/git-rebase.txt:553
+#, ignore-same, priority:100
msgid "--strategy-option"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:533
-#, priority:100
+#: en/git-rebase.txt:555
+#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:534
-#, priority:100
+#: en/git-rebase.txt:556
+#, ignore-same, priority:100
msgid "--rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:537
-#, priority:100
+#: en/git-rebase.txt:559
+#, ignore-same, priority:100
msgid "--exec"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:540
+#: en/git-rebase.txt:562
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:542
+#: en/git-rebase.txt:564
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:544
+#: en/git-rebase.txt:566
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:567
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:546
+#: en/git-rebase.txt:568
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:547
+#: en/git-rebase.txt:569
#, priority:100
-msgid "--rebase-merges and --strategy"
+msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:548
+#: en/git-rebase.txt:570
#, priority:100
-msgid "--rebase-merges and --strategy-option"
+msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:550
+#: en/git-rebase.txt:572
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:575
#, no-wrap, priority:100
msgid "There are some subtle differences how the backends behave.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:556
+#: en/git-rebase.txt:578
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38360,7 +38672,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:561
+#: en/git-rebase.txt:583
#, no-wrap, priority:100
msgid ""
"The am backend drops any \"empty\" commits, regardless of whether the\n"
@@ -38370,7 +38682,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:588
#, no-wrap, priority:100
msgid ""
"The interactive backend drops commits by default that\n"
@@ -38380,7 +38692,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:591
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38388,7 +38700,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:573
+#: en/git-rebase.txt:595
#, no-wrap, priority:100
msgid ""
"Directory rename heuristics are enabled in the merge and interactive\n"
@@ -38397,146 +38709,146 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:597
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:577
+#: en/git-rebase.txt:599
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:582
+#: en/git-rebase.txt:604
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:587
+#: en/git-rebase.txt:609
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:589
+#: en/git-rebase.txt:611
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:596
+#: en/git-rebase.txt:618
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:598
+#: en/git-rebase.txt:620
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:600
+#: en/git-rebase.txt:622
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:601
+#: en/git-rebase.txt:623
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:602
+#: en/git-rebase.txt:624
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:603
+#: en/git-rebase.txt:625
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:605
+#: en/git-rebase.txt:627
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:607
+#: en/git-rebase.txt:629
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:631
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:610
+#: en/git-rebase.txt:632
#, priority:100
msgid "commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:612
+#: en/git-rebase.txt:634
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:614
+#: en/git-rebase.txt:636
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:615
+#: en/git-rebase.txt:637
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:616
+#: en/git-rebase.txt:638
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:644
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:646
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:626
+#: en/git-rebase.txt:648
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:653
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:636
-#, no-wrap, priority:100
+#: en/git-rebase.txt:658
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
"pick fa1afe1 The oneline of the next commit\n"
@@ -38544,73 +38856,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:641
+#: en/git-rebase.txt:663
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:668
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:649
+#: en/git-rebase.txt:671
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:652
+#: en/git-rebase.txt:674
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:655
+#: en/git-rebase.txt:677
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:685
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:667
+#: en/git-rebase.txt:689
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:693
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:696
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:699
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:680
+#: en/git-rebase.txt:702
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:687
+#: en/git-rebase.txt:709
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -38621,26 +38933,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:691
+#: en/git-rebase.txt:713
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:694
+#: en/git-rebase.txt:716
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:701
+#: en/git-rebase.txt:723
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:710
-#, no-wrap, priority:100
+#: en/git-rebase.txt:732
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
"fixup f1a5c00 Fix to feature XXX\n"
@@ -38652,31 +38964,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:715
+#: en/git-rebase.txt:737
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:720
-#, priority:100
+#: en/git-rebase.txt:742
+#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:745
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:727
+#: en/git-rebase.txt:749
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:759
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -38690,85 +39002,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:740
+#: en/git-rebase.txt:762
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:746
+#: en/git-rebase.txt:768
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:750
+#: en/git-rebase.txt:772
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:752
+#: en/git-rebase.txt:774
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:756
+#: en/git-rebase.txt:778
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:760
+#: en/git-rebase.txt:782
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:763
+#: en/git-rebase.txt:785
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:765
+#: en/git-rebase.txt:787
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:767
+#: en/git-rebase.txt:789
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:794
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:775
+#: en/git-rebase.txt:797
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:804
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:809
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:816
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38779,13 +39091,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:819
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:826
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38796,14 +39108,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:808
+#: en/git-rebase.txt:830
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:815
-#, no-wrap, priority:100
+#: en/git-rebase.txt:837
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
"\t \\\t\t\t \\\n"
@@ -38813,73 +39125,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:822
+#: en/git-rebase.txt:844
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:824
+#: en/git-rebase.txt:846
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:825
+#: en/git-rebase.txt:847
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:829
+#: en/git-rebase.txt:851
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:836
+#: en/git-rebase.txt:859
#, priority:100
-msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or `filter-branch`."
+msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:839
+#: en/git-rebase.txt:862
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:867
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:848
+#: en/git-rebase.txt:871
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:850
+#: en/git-rebase.txt:873
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:875
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:858
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38890,19 +39202,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:885
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:866
+#: en/git-rebase.txt:889
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:894
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -38912,67 +39224,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:876
+#: en/git-rebase.txt:899
#, priority:100
-msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge-base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
+msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:880
+#: en/git-rebase.txt:903
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:883
+#: en/git-rebase.txt:906
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:886
+#: en/git-rebase.txt:909
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:888
+#: en/git-rebase.txt:911
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:893
+#: en/git-rebase.txt:916
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:895
+#: en/git-rebase.txt:918
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:926
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:907
+#: en/git-rebase.txt:930
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:912
+#: en/git-rebase.txt:935
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:922
+#: en/git-rebase.txt:945
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -38986,25 +39298,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:929
+#: en/git-rebase.txt:952
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:932
+#: en/git-rebase.txt:955
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:935 en/git-rebase.txt:1012
+#: en/git-rebase.txt:958 en/git-rebase.txt:1035
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:941
+#: en/git-rebase.txt:964
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39015,7 +39327,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:946
+#: en/git-rebase.txt:969
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39025,7 +39337,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:950
+#: en/git-rebase.txt:973
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39034,55 +39346,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:954
+#: en/git-rebase.txt:977
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:962
+#: en/git-rebase.txt:985
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:992
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:975
+#: en/git-rebase.txt:998
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:978
+#: en/git-rebase.txt:1001
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1008
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:989
+#: en/git-rebase.txt:1012
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:996
+#: en/git-rebase.txt:1019
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1003
+#: en/git-rebase.txt:1026
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39093,13 +39405,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1009
+#: en/git-rebase.txt:1032
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1015
+#: en/git-rebase.txt:1038
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39107,7 +39419,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1022
+#: en/git-rebase.txt:1045
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39119,7 +39431,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1049
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39128,37 +39440,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1035
+#: en/git-rebase.txt:1058
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1037
+#: en/git-rebase.txt:1060
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1039
+#: en/git-rebase.txt:1062
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1043
+#: en/git-rebase.txt:1066
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1068
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1072
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -39168,7 +39480,7 @@ msgstr ""
#. type: Title =
#: en/git-receive-pack.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-receive-pack(1)"
msgstr ""
@@ -39258,7 +39570,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:66
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_PUSH_CERT_SIGNER`"
msgstr ""
@@ -39270,7 +39582,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:70
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_PUSH_CERT_KEY`"
msgstr ""
@@ -39282,7 +39594,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:73
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_PUSH_CERT_STATUS`"
msgstr ""
@@ -39294,7 +39606,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:78
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_PUSH_CERT_NONCE`"
msgstr ""
@@ -39306,13 +39618,13 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:85
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_PUSH_CERT_NONCE_STATUS`"
msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:86
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`UNSOLICITED`"
msgstr ""
@@ -39324,7 +39636,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:89
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`MISSING`"
msgstr ""
@@ -39336,7 +39648,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:91
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`BAD`"
msgstr ""
@@ -39348,7 +39660,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:93
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`OK`"
msgstr ""
@@ -39360,7 +39672,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:95
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`SLOP`"
msgstr ""
@@ -39372,7 +39684,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:100
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_PUSH_CERT_NONCE_SLOP`"
msgstr ""
@@ -39466,124 +39778,124 @@ msgstr ""
msgid "Using this hook, it is easy to generate mails describing the updates to the repository. This example script sends one mail message per ref listing the commits pushed to the repository, and logs the push certificates of signed pushes with good signatures to a logger service:"
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:191
+#. type: delimited block -
+#: en/git-receive-pack.txt:192
#, no-wrap, priority:100
msgid ""
-"\t#!/bin/sh\n"
-"\t# mail out commit update information.\n"
-"\twhile read oval nval ref\n"
-"\tdo\n"
-"\t\tif expr \"$oval\" : '0*$' >/dev/null\n"
-"\t\tthen\n"
-"\t\t\techo \"Created a new ref, with the following commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\"\n"
-"\t\telse\n"
-"\t\t\techo \"New commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
-"\t\tfi |\n"
-"\t\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
-"\tdone\n"
-"\t# log signed push certificate, if any\n"
-"\tif test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"#!/bin/sh\n"
+"# mail out commit update information.\n"
+"while read oval nval ref\n"
+"do\n"
+"\tif expr \"$oval\" : '0*$' >/dev/null\n"
"\tthen\n"
-"\t\t(\n"
-"\t\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
-"\t\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
-"\t\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
-"\tfi\n"
-"\texit 0\n"
+"\t\techo \"Created a new ref, with the following commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\"\n"
+"\telse\n"
+"\t\techo \"New commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
+"\tfi |\n"
+"\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
+"done\n"
+"# log signed push certificate, if any\n"
+"if test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"then\n"
+"\t(\n"
+"\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
+"\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
+"\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
+"fi\n"
+"exit 0\n"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:194
+#: en/git-receive-pack.txt:196
#, priority:100
msgid "The exit code from this hook invocation is ignored, however a non-zero exit code will generate an error message."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:200
+#: en/git-receive-pack.txt:202
#, priority:100
msgid "Note that it is possible for refname to not have sha1-new when this hook runs. This can easily occur if another user modifies the ref after it was updated by 'git-receive-pack', but before the hook was able to evaluate it. It is recommended that hooks rely on sha1-new rather than the current value of refname."
msgstr ""
#. type: Title -
-#: en/git-receive-pack.txt:202
+#: en/git-receive-pack.txt:204
#, no-wrap, priority:100
msgid "POST-UPDATE HOOK"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:207
+#: en/git-receive-pack.txt:209
#, priority:100
msgid "After all other processing, if at least one ref was updated, and if $GIT_DIR/hooks/post-update file exists and is executable, then post-update will be called with the list of refs that have been updated. This can be used to implement any repository wide cleanup tasks."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:211
+#: en/git-receive-pack.txt:213
#, priority:100
msgid "The exit code from this hook invocation is ignored; the only thing left for 'git-receive-pack' to do at that point is to exit itself anyway."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:214
+#: en/git-receive-pack.txt:216
#, priority:100
msgid "This hook can be used, for example, to run `git update-server-info` if the repository is packed and is served via a dumb transport."
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:217
+#. type: delimited block -
+#: en/git-receive-pack.txt:220
#, no-wrap, priority:100
msgid ""
-"\t#!/bin/sh\n"
-"\texec git update-server-info\n"
+"#!/bin/sh\n"
+"exec git update-server-info\n"
msgstr ""
#. type: Title -
-#: en/git-receive-pack.txt:220
+#: en/git-receive-pack.txt:224
#, no-wrap, priority:100
msgid "QUARANTINE ENVIRONMENT"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:227
+#: en/git-receive-pack.txt:231
#, priority:100
msgid "When `receive-pack` takes in objects, they are placed into a temporary \"quarantine\" directory within the `$GIT_DIR/objects` directory and migrated into the main object store only after the `pre-receive` hook has completed. If the push fails before then, the temporary directory is removed entirely."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:229
+#: en/git-receive-pack.txt:233
#, priority:100
msgid "This has a few user-visible effects and caveats:"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:235
+#: en/git-receive-pack.txt:239
#, priority:100
msgid "Pushes which fail due to problems with the incoming pack, missing objects, or due to the `pre-receive` hook will not leave any on-disk data. This is usually helpful to prevent repeated failed pushes from filling up your disk, but can make debugging more challenging."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:238
+#: en/git-receive-pack.txt:242
#, priority:100
msgid "Any objects created by the `pre-receive` hook will be created in the quarantine directory (and migrated only if it succeeds)."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:244
+#: en/git-receive-pack.txt:248
#, priority:100
msgid "The `pre-receive` hook MUST NOT update any refs to point to quarantined objects. Other programs accessing the repository will not be able to see the objects (and if the pre-receive hook fails, those refs would become corrupted). For safety, any ref updates from within `pre-receive` are automatically rejected."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:249
-#, priority:100
+#: en/git-receive-pack.txt:253
+#, ignore-same, priority:100
msgid "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
msgstr ""
#. type: Title =
#: en/git-reflog.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-reflog(1)"
msgstr ""
@@ -39601,7 +39913,7 @@ msgstr ""
#. type: Plain text
#: en/git-reflog.txt:27
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git reflog' ['show'] [log-options] [<ref>]\n"
"'git reflog expire' [--expire=<time>] [--expire-unreachable=<time>]\n"
@@ -39674,7 +39986,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:75 en/rev-list-options.txt:193
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--single-worktree"
msgstr ""
@@ -39710,7 +40022,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:98
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--updateref"
msgstr ""
@@ -39722,7 +40034,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:103
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--rewrite"
msgstr ""
@@ -39734,7 +40046,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:108
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--stale-fix"
msgstr ""
@@ -39776,7 +40088,7 @@ msgstr ""
#. type: Title =
#: en/git-remote-ext.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-remote-ext(1)"
msgstr ""
@@ -39788,7 +40100,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:12
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
msgstr ""
@@ -39842,7 +40154,7 @@ msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:34 en/pretty-formats.txt:189
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%s'"
msgstr ""
@@ -39854,7 +40166,7 @@ msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:38 en/pretty-formats.txt:186
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%S'"
msgstr ""
@@ -39902,7 +40214,7 @@ msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:61 en/git-remote-fd.txt:33
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "GIT_TRANSLOOP_DEBUG"
msgstr ""
@@ -39920,25 +40232,25 @@ msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:67
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "GIT_EXT_SERVICE"
msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:70
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Set to long name (git-upload-pack, etc...) of service helper needs to invoke."
msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:71
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "GIT_EXT_SERVICE_NOPREFIX"
msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:74
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Set to long name (upload-pack, etc...) of service helper needs to invoke."
msgstr ""
@@ -40022,13 +40334,13 @@ msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56
-#, priority:100
+#, ignore-same, priority:100
msgid "linkgit:gitremote-helpers[7]"
msgstr ""
#. type: Title =
#: en/git-remote-fd.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-remote-fd(1)"
msgstr ""
@@ -40106,7 +40418,7 @@ msgstr ""
#. type: Title =
#: en/git-remote.txt:2
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "git-remote(1)"
msgstr ""
@@ -40118,7 +40430,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:25
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git remote' [-v | --verbose]\n"
"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
@@ -40437,7 +40749,7 @@ msgstr ""
#. type: delimited block -
#: en/git-remote.txt:235
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"$ git remote\n"
"origin\n"
@@ -40483,13 +40795,13 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:253
-#, priority:220
+#, ignore-same, priority:220
msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgstr ""
#. type: Title =
#: en/git-repack.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-repack(1)"
msgstr ""
@@ -40597,7 +40909,7 @@ msgstr ""
#. type: Labeled list
#: en/git-repack.txt:127
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--write-bitmap-index"
msgstr ""
@@ -40609,7 +40921,7 @@ msgstr ""
#. type: Labeled list
#: en/git-repack.txt:134
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--pack-kept-objects"
msgstr ""
@@ -40663,13 +40975,13 @@ msgstr ""
#. type: Plain text
#: en/git-repack.txt:185
-#, priority:100
+#, ignore-same, priority:100
msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
msgstr ""
#. type: Title =
#: en/git-replace.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-replace(1)"
msgstr ""
@@ -40681,7 +40993,7 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:17
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git replace' [-f] <object> <replacement>\n"
"'git replace' [-f] --edit <object>\n"
@@ -40801,19 +41113,19 @@ msgstr ""
#. type: Labeled list
#: en/git-replace.txt:86
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "--graft <commit> [<parent>...]"
msgstr ""
#. type: Plain text
#: en/git-replace.txt:93
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Create a graft commit. A new commit is created with the same content as <commit> except that its parents will be [<parent>...] instead of <commit>'s parents. A replacement ref is then created to replace <commit> with the newly created commit. Use `--convert-graft-file` to convert a `$GIT_DIR/info/grafts` file and use replace refs instead."
msgstr ""
#. type: Labeled list
#: en/git-replace.txt:94
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--convert-graft-file"
msgstr ""
@@ -40904,7 +41216,7 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:131
#, priority:100
-msgid "linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and linkgit:git-rebase[1], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
+msgid "linkgit:git-hash-object[1], linkgit:git-rebase[1], and https://github.com/newren/git-filter-repo[git-filter-repo], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
msgstr ""
#. type: Plain text
@@ -40928,12 +41240,12 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:158
#, priority:100
-msgid "linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1]"
+msgid "linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] https://github.com/newren/git-filter-repo[git-filter-repo]"
msgstr ""
#. type: Title =
#: en/git-request-pull.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-request-pull(1)"
msgstr ""
@@ -41065,7 +41377,7 @@ msgstr ""
#. type: Title =
#: en/git-rerere.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-rerere(1)"
msgstr ""
@@ -41229,7 +41541,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rerere.txt:121
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git switch topic\n"
"\t$ git merge master\n"
@@ -41261,7 +41573,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rerere.txt:145
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git switch topic\n"
"\t$ git merge master\n"
@@ -41354,7 +41666,7 @@ msgstr ""
#. type: Title =
#: en/git-reset.txt:2
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "git-reset(1)"
msgstr ""
@@ -41366,7 +41678,7 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:14
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git reset' [-q] [<tree-ish>] [--] <paths>...\n"
"'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...]\n"
@@ -41381,7 +41693,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:22
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "'git reset' [-q] [<tree-ish>] [--] <paths>..."
msgstr ""
@@ -41393,7 +41705,7 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:30
-#, priority:280
+#, ignore-ellipsis, priority:280
msgid "This means that `git reset <paths>` is the opposite of `git add <paths>`. This command is equivalent to `git restore [--source=<tree-ish>] --staged <paths>...`."
msgstr ""
@@ -41405,7 +41717,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:38
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...]"
msgstr ""
@@ -41435,7 +41747,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:54
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--soft"
msgstr ""
@@ -41447,7 +41759,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:60
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--mixed"
msgstr ""
@@ -41465,7 +41777,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:68
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--hard"
msgstr ""
@@ -41501,7 +41813,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:99
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--no-quiet"
msgstr ""
@@ -41560,7 +41872,7 @@ msgstr ""
#. type: delimited block -
#: en/git-reset.txt:138
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git commit ...\n"
"$ git reset --soft HEAD^ <1>\n"
@@ -41633,7 +41945,7 @@ msgstr ""
#. type: delimited block -
#: en/git-reset.txt:170
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git commit ...\n"
"$ git reset --hard HEAD~3 <1>\n"
@@ -41653,7 +41965,7 @@ msgstr ""
#. type: delimited block -
#: en/git-reset.txt:190
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git pull <1>\n"
"Auto-merging nitfol\n"
@@ -41698,7 +42010,7 @@ msgstr ""
#. type: delimited block -
#: en/git-reset.txt:215
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git pull <1>\n"
"Auto-merging nitfol\n"
@@ -41721,7 +42033,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:228 en/git-stash.txt:229
+#: en/git-reset.txt:228 en/git-stash.txt:230
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -41824,7 +42136,7 @@ msgstr ""
#. type: delimited block -
#: en/git-reset.txt:289
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git tag start\n"
"$ git switch -c branch1\n"
@@ -41867,7 +42179,7 @@ msgstr ""
#. type: delimited block -
#: en/git-reset.txt:317
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git reset -N HEAD^ <1>\n"
"$ git add -p <2>\n"
@@ -42081,7 +42393,7 @@ msgstr ""
#. type: Title =
#: en/git-restore.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-restore(1)"
msgstr ""
@@ -42093,7 +42405,7 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] <pathspec>...\n"
"'git restore' (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [<pathspec>...]\n"
@@ -42167,7 +42479,7 @@ msgstr ""
#. type: Labeled list
#: en/git-restore.txt:59
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--staged"
msgstr ""
@@ -42203,7 +42515,7 @@ msgstr ""
#. type: Labeled list
#: en/git-restore.txt:96
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--ignore-unmerged"
msgstr ""
@@ -42327,13 +42639,13 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:182
-#, priority:100
+#, ignore-same, priority:100
msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
msgstr ""
#. type: Title =
#: en/git-revert.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-revert(1)"
msgstr ""
@@ -42345,7 +42657,7 @@ msgstr ""
#. type: Plain text
#: en/git-revert.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] <commit>...\n"
"'git revert' (--continue | --skip | --abort | --quit)\n"
@@ -42437,7 +42749,7 @@ msgstr ""
#. type: Title =
#: en/git-rev-list.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-rev-list(1)"
msgstr ""
@@ -42448,102 +42760,49 @@ msgid "git-rev-list - Lists commit objects in reverse chronological order"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:65
-#, no-wrap, priority:100
-msgid ""
-"'git rev-list' [ --max-count=<number> ]\n"
-"\t [ --skip=<number> ]\n"
-"\t [ --max-age=<timestamp> ]\n"
-"\t [ --min-age=<timestamp> ]\n"
-"\t [ --sparse ]\n"
-"\t [ --merges ]\n"
-"\t [ --no-merges ]\n"
-"\t [ --min-parents=<number> ]\n"
-"\t [ --no-min-parents ]\n"
-"\t [ --max-parents=<number> ]\n"
-"\t [ --no-max-parents ]\n"
-"\t [ --first-parent ]\n"
-"\t [ --remove-empty ]\n"
-"\t [ --full-history ]\n"
-"\t [ --not ]\n"
-"\t [ --all ]\n"
-"\t [ --branches[=<pattern>] ]\n"
-"\t [ --tags[=<pattern>] ]\n"
-"\t [ --remotes[=<pattern>] ]\n"
-"\t [ --glob=<glob-pattern> ]\n"
-"\t [ --ignore-missing ]\n"
-"\t [ --stdin ]\n"
-"\t [ --quiet ]\n"
-"\t [ --topo-order ]\n"
-"\t [ --parents ]\n"
-"\t [ --timestamp ]\n"
-"\t [ --left-right ]\n"
-"\t [ --left-only ]\n"
-"\t [ --right-only ]\n"
-"\t [ --cherry-mark ]\n"
-"\t [ --cherry-pick ]\n"
-"\t [ --encoding=<encoding> ]\n"
-"\t [ --(author|committer|grep)=<pattern> ]\n"
-"\t [ --regexp-ignore-case | -i ]\n"
-"\t [ --extended-regexp | -E ]\n"
-"\t [ --fixed-strings | -F ]\n"
-"\t [ --date=<format>]\n"
-"\t [ [ --objects | --objects-edge | --objects-edge-aggressive ]\n"
-"\t [ --unpacked ]\n"
-"\t [ --object-names | --no-object-names ]\n"
-"\t [ --filter=<filter-spec> [ --filter-print-omitted ] ] ]\n"
-"\t [ --missing=<missing-action> ]\n"
-"\t [ --pretty | --header ]\n"
-"\t [ --bisect ]\n"
-"\t [ --bisect-vars ]\n"
-"\t [ --bisect-all ]\n"
-"\t [ --merge ]\n"
-"\t [ --reverse ]\n"
-"\t [ --walk-reflogs ]\n"
-"\t [ --no-walk ] [ --do-walk ]\n"
-"\t [ --count ]\n"
-"\t [ --use-bitmap-index ]\n"
-"\t <commit>... [ \\-- <paths>... ]\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:73
+#: en/git-rev-list.txt:13
+#, ignore-ellipsis, no-wrap, priority:100
+msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rev-list.txt:21
#, priority:100
msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:80
+#: en/git-rev-list.txt:28
#, priority:100
msgid "You can think of this as a set operation. Commits given on the command line form a set of commits that are reachable from any of them, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:82
+#: en/git-rev-list.txt:30
#, priority:100
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:85
+#: en/git-rev-list.txt:33
#, no-wrap, priority:100
msgid "\t$ git rev-list foo bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:89
+#: en/git-rev-list.txt:37
#, priority:100
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:93
+#: en/git-rev-list.txt:41
#, priority:100
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:97
+#: en/git-rev-list.txt:45
#, no-wrap, priority:100
msgid ""
"\t$ git rev-list origin..HEAD\n"
@@ -42551,28 +42810,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:102
-#, priority:100
+#: en/git-rev-list.txt:50
+#, ignore-ellipsis, priority:100
msgid "Another special notation is \"'<commit1>'...'<commit2>'\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:106
-#, no-wrap, priority:100
+#: en/git-rev-list.txt:54
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git rev-list A B --not $(git merge-base --all A B)\n"
"\t$ git rev-list A...B\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:113
+#: en/git-rev-list.txt:61
#, priority:100
msgid "'rev-list' is a very essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For this reason, it has a lot of different options that enables it to be used by commands as different as 'git bisect' and 'git repack'."
msgstr ""
#. type: Title =
#: en/git-rev-parse.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-rev-parse(1)"
msgstr ""
@@ -42584,7 +42843,7 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git rev-parse' [<options>] <args>...\n"
msgstr ""
@@ -42608,7 +42867,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:33
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--parseopt"
msgstr ""
@@ -42620,7 +42879,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:36
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--sq-quote"
msgstr ""
@@ -42638,7 +42897,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:44
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--keep-dashdash"
msgstr ""
@@ -42650,7 +42909,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:48
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--stop-at-non-option"
msgstr ""
@@ -42662,7 +42921,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:53
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--stuck-long"
msgstr ""
@@ -42680,7 +42939,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:60
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--revs-only"
msgstr ""
@@ -42692,7 +42951,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:64
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-revs"
msgstr ""
@@ -42704,7 +42963,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:68
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--flags"
msgstr ""
@@ -42716,7 +42975,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:71
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-flags"
msgstr ""
@@ -42792,7 +43051,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:120
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--sq"
msgstr ""
@@ -42834,7 +43093,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:145
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--symbolic"
msgstr ""
@@ -42846,7 +43105,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:150
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--symbolic-full-name"
msgstr ""
@@ -42948,7 +43207,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:205
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--local-env-vars"
msgstr ""
@@ -42960,7 +43219,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:211
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--git-dir"
msgstr ""
@@ -42978,7 +43237,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:220
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--absolute-git-dir"
msgstr ""
@@ -42990,7 +43249,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:224
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--git-common-dir"
msgstr ""
@@ -43002,7 +43261,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:227
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--is-inside-git-dir"
msgstr ""
@@ -43014,7 +43273,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:231
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--is-inside-work-tree"
msgstr ""
@@ -43026,7 +43285,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:235
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--is-bare-repository"
msgstr ""
@@ -43038,7 +43297,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:238
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--is-shallow-repository"
msgstr ""
@@ -43068,13 +43327,13 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:253
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Resolve \"$GIT_DIR/<path>\" and takes other path relocation variables such as $GIT_OBJECT_DIRECTORY, $GIT_INDEX_FILE... into account. For example, if $GIT_OBJECT_DIRECTORY is set to /foo/bar then \"git rev-parse --git-path objects/abc\" returns /foo/bar/abc."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:254
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--show-cdup"
msgstr ""
@@ -43086,7 +43345,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:259
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--show-prefix"
msgstr ""
@@ -43098,7 +43357,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:264
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--show-toplevel"
msgstr ""
@@ -43110,7 +43369,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:267
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--show-superproject-working-tree"
msgstr ""
@@ -43122,7 +43381,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:273
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--shared-index-path"
msgstr ""
@@ -43176,7 +43435,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:290
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<args>..."
msgstr ""
@@ -43308,7 +43567,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:364
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"OPTS_SPEC=\"\\\n"
"some-command [<options>] <args>...\n"
@@ -43366,7 +43625,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:389
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "usage: some-command [<options>] <args>...\n"
msgstr ""
@@ -43378,7 +43637,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:397
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" -h, --help show the help\n"
" --foo some nifty option --foo\n"
@@ -43389,7 +43648,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:400
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"An option group Header\n"
" -C[...] option C with an optional argument\n"
@@ -43482,7 +43741,7 @@ msgstr ""
#. type: Title =
#: en/git-rm.txt:2
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "git-rm(1)"
msgstr ""
@@ -43494,7 +43753,7 @@ msgstr ""
#. type: Plain text
#: en/git-rm.txt:12
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...\n"
msgstr ""
@@ -43536,7 +43795,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rm.txt:63
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmatch"
msgstr ""
@@ -43710,7 +43969,7 @@ msgstr ""
#. type: Title =
#: en/git-send-email.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-send-email(1)"
msgstr ""
@@ -43722,7 +43981,7 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:14
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git send-email' [<options>] <file|directory|rev-list options>...\n"
"'git send-email' --dump-aliases\n"
@@ -43778,7 +44037,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:48 en/git-tag.txt:61
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--annotate"
msgstr ""
@@ -43790,7 +44049,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:53
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "--bcc=<address>,..."
msgstr ""
@@ -43808,7 +44067,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:59
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "--cc=<address>,..."
msgstr ""
@@ -43820,7 +44079,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:65
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--compose"
msgstr ""
@@ -43892,7 +44151,7 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:110
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" [PATCH 0/2] Here is what I did...\n"
" [PATCH 1/2] Clean up and tests\n"
@@ -43923,7 +44182,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:119
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "--to=<address>,..."
msgstr ""
@@ -43983,13 +44242,13 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:152
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--xmailer"
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:153
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-xmailer"
msgstr ""
@@ -44055,7 +44314,7 @@ msgstr ""
#. type: delimited block -
#: en/git-send-email.txt:188
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
msgstr ""
@@ -44085,7 +44344,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:209
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-smtp-auth"
msgstr ""
@@ -44139,7 +44398,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:239
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--smtp-ssl"
msgstr ""
@@ -44151,7 +44410,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:242
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--smtp-ssl-cert-path"
msgstr ""
@@ -44229,7 +44488,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:285
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-identity"
msgstr ""
@@ -44265,7 +44524,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:301
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]chain-reply-to"
msgstr ""
@@ -44289,7 +44548,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:315
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]signed-off-by-cc"
msgstr ""
@@ -44301,7 +44560,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:320
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]cc-cover"
msgstr ""
@@ -44313,7 +44572,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:326
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]to-cover"
msgstr ""
@@ -44397,7 +44656,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:357
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]suppress-from"
msgstr ""
@@ -44409,7 +44668,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:362
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]thread"
msgstr ""
@@ -44493,7 +44752,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:403
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]format-patch"
msgstr ""
@@ -44511,7 +44770,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:413
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]validate"
msgstr ""
@@ -44563,7 +44822,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:436
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--dump-aliases"
msgstr ""
@@ -44575,7 +44834,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:446
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "sendemail.aliasesFile"
msgstr ""
@@ -44587,7 +44846,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:450
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "sendemail.aliasFileType"
msgstr ""
@@ -44653,7 +44912,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:471
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "sendemail.multiEdit"
msgstr ""
@@ -44665,7 +44924,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:477
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "sendemail.confirm"
msgstr ""
@@ -44687,31 +44946,31 @@ msgstr ""
msgid "To use 'git send-email' to send your patches through the GMail SMTP server, edit ~/.gitconfig to specify your account settings:"
msgstr ""
-#. type: Plain text
-#: en/git-send-email.txt:494
+#. type: delimited block -
+#: en/git-send-email.txt:495
#, no-wrap, priority:100
msgid ""
-"\t[sendemail]\n"
-"\t\tsmtpEncryption = tls\n"
-"\t\tsmtpServer = smtp.gmail.com\n"
-"\t\tsmtpUser = yourname@gmail.com\n"
-"\t\tsmtpServerPort = 587\n"
+"[sendemail]\n"
+"\tsmtpEncryption = tls\n"
+"\tsmtpServer = smtp.gmail.com\n"
+"\tsmtpUser = yourname@gmail.com\n"
+"\tsmtpServerPort = 587\n"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:498
+#: en/git-send-email.txt:500
#, priority:100
msgid "If you have multifactor authentication setup on your gmail account, you will need to generate an app-specific password for use with 'git send-email'. Visit https://security.google.com/settings/security/apppasswords to create it."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:501
+#: en/git-send-email.txt:503
#, priority:100
msgid "Once your commits are ready to be sent to the mailing list, run the following commands:"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:505
+#: en/git-send-email.txt:507
#, no-wrap, priority:100
msgid ""
"\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -44720,26 +44979,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:510
+#: en/git-send-email.txt:512
#, priority:100
msgid "The first time you run it, you will be prompted for your credentials. Enter the app-specific or your regular password as appropriate. If you have credential helper configured (see linkgit:git-credential[1]), the password will be saved in the credential store so you won't have to type it the next time."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:518
#, priority:100
msgid "Note: the following core Perl modules that may be installed with your distribution of Perl are required: MIME::Base64, MIME::QuotedPrint, Net::Domain and Net::SMTP. These additional Perl modules are also required: Authen::SASL and Mail::Address."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:521
+#: en/git-send-email.txt:523
#, priority:100
msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
msgstr ""
#. type: Title =
#: en/git-send-pack.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-send-pack(1)"
msgstr ""
@@ -44751,7 +45010,7 @@ msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:16
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>]\n"
"\t\t[--verbose] [--thin] [--atomic]\n"
@@ -44791,7 +45050,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-pack.txt:68
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--atomic"
msgstr ""
@@ -44869,7 +45128,7 @@ msgstr ""
#. type: Title =
#: en/git-shell.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-shell(1)"
msgstr ""
@@ -45064,7 +45323,7 @@ msgstr ""
#. type: Title =
#: en/git-sh-i18n.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-sh-i18n(1)"
msgstr ""
@@ -45112,7 +45371,7 @@ msgstr ""
#. type: Title =
#: en/git-shortlog.txt:2
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "git-shortlog(1)"
msgstr ""
@@ -45124,7 +45383,7 @@ msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:13
-#, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git shortlog' [<options>] [<revision range>] [[--] <path>...]\n"
"git log --pretty=short | 'git shortlog' [<options>]\n"
@@ -45162,7 +45421,7 @@ msgstr ""
#. type: Labeled list
#: en/git-shortlog.txt:39
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--email"
msgstr ""
@@ -45192,7 +45451,7 @@ msgstr ""
#. type: Labeled list
#: en/git-shortlog.txt:51
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--committer"
msgstr ""
@@ -45240,7 +45499,7 @@ msgstr ""
#. type: Title =
#: en/git-show-branch.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-show-branch(1)"
msgstr ""
@@ -45252,7 +45511,7 @@ msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:17
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git show-branch' [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -45318,7 +45577,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:51
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--current"
msgstr ""
@@ -45330,7 +45589,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:56 en/rev-list-options.txt:652
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--topo-order"
msgstr ""
@@ -45342,7 +45601,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:62 en/rev-list-options.txt:644
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--date-order"
msgstr ""
@@ -45378,7 +45637,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:83
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--merge-base"
msgstr ""
@@ -45396,7 +45655,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:94
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-name"
msgstr ""
@@ -45408,7 +45667,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:97
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--sha1-name"
msgstr ""
@@ -45420,7 +45679,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:103
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--topics"
msgstr ""
@@ -45547,7 +45806,7 @@ msgstr ""
#. type: Title =
#: en/git-show-index.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-show-index(1)"
msgstr ""
@@ -45601,7 +45860,7 @@ msgstr ""
#. type: Title =
#: en/git-show-ref.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-show-ref(1)"
msgstr ""
@@ -45613,7 +45872,7 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:15
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git show-ref' [-q|--quiet] [--verify] [--head] [-d|--dereference]\n"
"\t [-s|--hash[=<n>]] [--abbrev[=<n>]] [--tags]\n"
@@ -45647,7 +45906,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-ref.txt:36
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--head"
msgstr ""
@@ -45665,7 +45924,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-ref.txt:48
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--dereference"
msgstr ""
@@ -45761,7 +46020,7 @@ msgstr ""
#. type: delimited block -
#: en/git-show-ref.txt:111
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git show-ref --head --dereference\n"
"832e76a9899f560a90ffd62ae2ce83bbeff58f54 HEAD\n"
@@ -45782,7 +46041,7 @@ msgstr ""
#. type: delimited block -
#: en/git-show-ref.txt:121
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git show-ref --heads --hash\n"
"2e3ba0114a1f52b47df29743d6915d056be13278\n"
@@ -45885,13 +46144,13 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:183
-#, priority:100
+#, ignore-same, priority:100
msgid "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-update-ref[1], linkgit:gitrepository-layout[5]"
msgstr ""
#. type: Title =
#: en/git-show.txt:2
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "git-show(1)"
msgstr ""
@@ -45903,7 +46162,7 @@ msgstr ""
#. type: Plain text
#: en/git-show.txt:13
-#, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:260
msgid "'git show' [<options>] [<object>...]\n"
msgstr ""
@@ -45951,7 +46210,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show.txt:37
-#, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:260
msgid "<object>..."
msgstr ""
@@ -46023,7 +46282,7 @@ msgstr ""
#. type: Title =
#: en/git-sh-setup.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-sh-setup(1)"
msgstr ""
@@ -46059,7 +46318,7 @@ msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:36
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "die"
msgstr ""
@@ -46071,7 +46330,7 @@ msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:40
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "usage"
msgstr ""
@@ -46083,7 +46342,7 @@ msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:43
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "set_reflog_action"
msgstr ""
@@ -46095,7 +46354,7 @@ msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:50
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git_editor"
msgstr ""
@@ -46119,7 +46378,7 @@ msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:60
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "cd_to_toplevel"
msgstr ""
@@ -46131,7 +46390,7 @@ msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:63
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "require_work_tree"
msgstr ""
@@ -46143,7 +46402,7 @@ msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:67
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "require_work_tree_exists"
msgstr ""
@@ -46173,7 +46432,7 @@ msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:83
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "get_author_ident_from_commit"
msgstr ""
@@ -46185,7 +46444,7 @@ msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:87
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "create_virtual_base"
msgstr ""
@@ -46197,7 +46456,7 @@ msgstr ""
#. type: Title =
#: en/git-stage.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-stage(1)"
msgstr ""
@@ -46209,7 +46468,7 @@ msgstr ""
#. type: Plain text
#: en/git-stage.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git stage' args...\n"
msgstr ""
@@ -46221,7 +46480,7 @@ msgstr ""
#. type: Title =
#: en/git-stash.txt:2
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "git-stash(1)"
msgstr ""
@@ -46233,7 +46492,7 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:22
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git stash' list [<options>]\n"
"'git stash' show [<options>] [<stash>]\n"
@@ -46256,7 +46515,7 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:38
-#, priority:240
+#, ignore-ellipsis, priority:240
msgid "The modifications stashed away by this command can be listed with `git stash list`, inspected with `git stash show`, and restored (potentially on top of a different commit) with `git stash apply`. Calling `git stash` without any arguments is equivalent to `git stash push`. A stash is by default listed as \"WIP on 'branchname' ...\", but you can give a more descriptive message on the command line when you create one."
msgstr ""
@@ -46268,7 +46527,7 @@ msgstr ""
#. type: Labeled list
#: en/git-stash.txt:49
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
msgstr ""
@@ -46321,165 +46580,165 @@ msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--a
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:92
+#: en/git-stash.txt:93
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs, and any non-option arguments form the message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:93
+#: en/git-stash.txt:94
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:100
+#: en/git-stash.txt:101
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:104
-#, no-wrap, priority:240
+#: en/git-stash.txt:105
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
"stash@{1}: On master: 9cc0589... Add git-stash\n"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:108
+#: en/git-stash.txt:109
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:109
+#: en/git-stash.txt:110
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:119
+#: en/git-stash.txt:120
#, priority:240
msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:120
+#: en/git-stash.txt:121
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:126
+#: en/git-stash.txt:127
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:130
+#: en/git-stash.txt:131
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:135
+#: en/git-stash.txt:136
#, priority:240
msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:138
+#: en/git-stash.txt:139
#, priority:240
msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:139
+#: en/git-stash.txt:140
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:145
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:145
+#: en/git-stash.txt:146
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:153
+#: en/git-stash.txt:154
#, priority:240
msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:159
+#: en/git-stash.txt:160
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:160
+#: en/git-stash.txt:161
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:164
+#: en/git-stash.txt:165
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:165
+#: en/git-stash.txt:166
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:171
+#: en/git-stash.txt:172
#, priority:240
msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:172 en/git-update-ref.txt:100
+#: en/git-stash.txt:173 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
-msgstr "create"
+msgstr ""
#. type: Plain text
-#: en/git-stash.txt:179
+#: en/git-stash.txt:180
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:180
+#: en/git-stash.txt:181
#, no-wrap, priority:240
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:186
+#: en/git-stash.txt:187
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:195
+#: en/git-stash.txt:196
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:199
+#: en/git-stash.txt:200
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46488,32 +46747,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:203
+#: en/git-stash.txt:204
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:208
+#: en/git-stash.txt:209
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:214
+#: en/git-stash.txt:215
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:219
+#: en/git-stash.txt:220
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:227
-#, no-wrap, priority:240
+#: en/git-stash.txt:228
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
" ...\n"
@@ -46524,14 +46783,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:235
+#: en/git-stash.txt:236
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:246
-#, no-wrap, priority:240
+#: en/git-stash.txt:247
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
"$ git switch -c my_wip\n"
@@ -46545,14 +46804,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:249
+#: en/git-stash.txt:250
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:257
-#, no-wrap, priority:240
+#: en/git-stash.txt:258
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
"$ git stash\n"
@@ -46563,20 +46822,20 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:259
+#: en/git-stash.txt:260
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:264
+#: en/git-stash.txt:265
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:275
-#, no-wrap, priority:240
+#: en/git-stash.txt:276
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
"$ git add --patch foo # add just first part to the index\n"
@@ -46590,19 +46849,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:277
+#: en/git-stash.txt:278
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:283
+#: en/git-stash.txt:284
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:288
+#: en/git-stash.txt:289
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -46611,14 +46870,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:298
-#, priority:240
+#: en/git-stash.txt:299
+#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr ""
#. type: Title =
#: en/git-status.txt:2
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "git-status(1)"
msgstr ""
@@ -46630,7 +46889,7 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:13
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "'git status' [<options>...] [--] [<pathspec>...]\n"
msgstr ""
@@ -46648,7 +46907,7 @@ msgstr ""
#. type: Labeled list
#: en/git-status.txt:35
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "--show-stash"
msgstr ""
@@ -46689,61 +46948,61 @@ msgid "In addition to the names of files that have been changed, also show the t
msgstr ""
#. type: Plain text
-#: en/git-status.txt:65
+#: en/git-status.txt:66
#, priority:280
msgid "The mode parameter is used to specify the handling of untracked files. It is optional: it defaults to 'all', and if specified, it must be stuck to the option (e.g. `-uno`, but not `-u no`)."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:69
+#: en/git-status.txt:70
#, no-wrap, priority:280
msgid "'no' - Show no untracked files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:70
+#: en/git-status.txt:71
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:81
+#: en/git-status.txt:82
#, priority:280
msgid "When `-u` option is not used, untracked files and directories are shown (i.e. the same as specifying `normal`), to help you avoid forgetting to add newly created files. Because it takes extra work to find untracked files in the filesystem, this mode may take some time in a large working tree. Consider enabling untracked cache and split index if supported (see `git update-index --untracked-cache` and `git update-index --split-index`), Otherwise you can use `no` to have `git status` return more quickly without showing untracked files."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:99
+#: en/git-status.txt:101
#, priority:280
msgid "Ignore changes to submodules when looking for changes. <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 before 1.7.0). Using \"all\" hides all changes to submodules (and suppresses the output of submodule summaries when the config option `status.submoduleSummary` is set)."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:100
+#: en/git-status.txt:102
#, no-wrap, priority:280
msgid "--ignored[=<mode>]"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:102
+#: en/git-status.txt:104
#, priority:280
msgid "Show ignored files as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:105
+#: en/git-status.txt:108
#, priority:280
msgid "The mode parameter is used to specify the handling of ignored files. It is optional: it defaults to 'traditional'."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:109
+#: en/git-status.txt:112
#, priority:280
msgid "'traditional' - Shows ignored files and directories, unless"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:112
+#: en/git-status.txt:115
#, no-wrap, priority:280
msgid ""
"--untracked-files=all is specified, in which case\n"
@@ -46752,109 +47011,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:113
+#: en/git-status.txt:116
#, no-wrap, priority:280
msgid "'no'\t - Show no ignored files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:114
+#: en/git-status.txt:117
#, no-wrap, priority:280
msgid "'matching' - Shows ignored files and directories matching an\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:115
+#: en/git-status.txt:118
#, no-wrap, priority:280
msgid "ignore pattern.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:121
+#: en/git-status.txt:124
#, priority:280
msgid "When 'matching' mode is specified, paths that explicitly match an ignored pattern are shown. If a directory matches an ignore pattern, then it is shown, but not paths contained in the ignored directory. If a directory does not match an ignore pattern, but all contents are ignored, then the directory is not shown, but all contents are shown."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:125
+#: en/git-status.txt:129
#, priority:280
msgid "Terminate entries with NUL, instead of LF. This implies the `--porcelain=v1` output format if no other format is given."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:132
+#: en/git-status.txt:136
#, priority:280
msgid "Display untracked files in columns. See configuration variable column.status for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:133
-#, no-wrap, priority:280
+#: en/git-status.txt:137
+#, ignore-same, no-wrap, priority:280
msgid "--ahead-behind"
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:134
-#, no-wrap, priority:280
+#: en/git-status.txt:138
+#, ignore-same, no-wrap, priority:280
msgid "--no-ahead-behind"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:137
+#: en/git-status.txt:141
#, priority:280
msgid "Display or do not display detailed ahead/behind counts for the branch relative to its upstream branch. Defaults to true."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:138
-#, no-wrap, priority:280
+#: en/git-status.txt:142
+#, ignore-same, no-wrap, priority:280
msgid "--renames"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:142
+#: en/git-status.txt:146
#, priority:280
msgid "Turn on/off rename detection regardless of user configuration. See also linkgit:git-diff[1] `--no-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:147
+#: en/git-status.txt:151
#, priority:280
msgid "Turn on rename detection, optionally setting the similarity threshold. See also linkgit:git-diff[1] `--find-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:150
+#: en/git-status.txt:154
#, priority:280
msgid "See the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:158
+#: en/git-status.txt:162
#, priority:280
msgid "The output from this command is designed to be used as a commit template comment. The default, long format, is designed to be human readable, verbose and descriptive. Its contents and format are subject to change at any time."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:163
+#: en/git-status.txt:167
#, priority:280
msgid "The paths mentioned in the output, unlike many other Git commands, are made relative to the current directory if you are working in a subdirectory (this is on purpose, to help cutting and pasting). See the status.relativePaths config option below."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:165
+#: en/git-status.txt:169
#, no-wrap, priority:280
msgid "Short Format"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:169
+#: en/git-status.txt:173
#, priority:280
msgid "In the short-format, the status of each path is shown as one of these forms"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:172
+#: en/git-status.txt:176
#, no-wrap, priority:280
msgid ""
"\tXY PATH\n"
@@ -46862,73 +47121,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:176
+#: en/git-status.txt:180
#, priority:280
msgid "where `ORIG_PATH` is where the renamed/copied contents came from. `ORIG_PATH` is only shown when the entry is renamed or copied. The `XY` is a two-letter status code."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:182
+#: en/git-status.txt:186
#, priority:280
msgid "The fields (including the `->`) are separated from each other by a single space. If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash-escaped."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:188
+#: en/git-status.txt:192
#, priority:280
msgid "For paths with merge conflicts, `X` and `Y` show the modification states of each side of the merge. For paths that do not have merge conflicts, `X` shows the status of the index, and `Y` shows the status of the work tree. For untracked paths, `XY` are `??`. Other status codes can be interpreted as follows:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:190
+#: en/git-status.txt:194
#, priority:280
msgid "' ' = unmodified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:191
+#: en/git-status.txt:195
#, priority:280
msgid "'M' = modified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:192
+#: en/git-status.txt:196
#, priority:280
msgid "'A' = added"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:193
+#: en/git-status.txt:197
#, priority:280
msgid "'D' = deleted"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:194
+#: en/git-status.txt:198
#, priority:280
msgid "'R' = renamed"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:195
+#: en/git-status.txt:199
#, priority:280
msgid "'C' = copied"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:196
+#: en/git-status.txt:200
#, priority:280
msgid "'U' = updated but unmerged"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:199
+#: en/git-status.txt:203
#, priority:280
msgid "Ignored files are not listed, unless `--ignored` option is in effect, in which case `XY` are `!!`."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:226
+#: en/git-status.txt:230
#, no-wrap, priority:280
msgid ""
"X Y Meaning\n"
@@ -46959,7 +47218,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:235
+#: en/git-status.txt:239
#, no-wrap, priority:280
msgid ""
"Submodules have more state and instead report\n"
@@ -46972,91 +47231,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:238
+#: en/git-status.txt:242
#, priority:280
msgid "'m' and '?' are applied recursively. For example if a nested submodule in a submodule contains an untracked file, this is reported as '?' as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:240
+#: en/git-status.txt:244
#, priority:280
msgid "If -b is used the short-format status is preceded by a line"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:242
+#: en/git-status.txt:246
#, no-wrap, priority:280
msgid " ## branchname tracking info\n"
msgstr ""
#. type: Title ~
-#: en/git-status.txt:244
+#: en/git-status.txt:248
#, no-wrap, priority:280
msgid "Porcelain Format Version 1"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:251
+#: en/git-status.txt:255
#, priority:280
msgid "Version 1 porcelain format is similar to the short format, but is guaranteed not to change in a backwards-incompatible way between Git versions or based on user configuration. This makes it ideal for parsing by scripts. The description of the short format above also describes the porcelain format, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:254
+#: en/git-status.txt:258
#, priority:280
msgid "The user's color.status configuration is not respected; color will always be off."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:257
+#: en/git-status.txt:261
#, priority:280
msgid "The user's status.relativePaths configuration is not respected; paths shown will always be relative to the repository root."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:267
+#: en/git-status.txt:271
#, priority:280
msgid "There is also an alternate -z format recommended for machine parsing. In that format, the status field is the same, but some other things change. First, the '\\->' is omitted from rename entries and the field order is reversed (e.g 'from \\-> to' becomes 'to from'). Second, a NUL (ASCII 0) follows each filename, replacing space as a field separator and the terminating newline (but a space still separates the status field from the first filename). Third, filenames containing special characters are not specially formatted; no quoting or backslash-escaping is performed."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:269
+#: en/git-status.txt:273
#, priority:280
msgid "Any submodule changes are reported as modified `M` instead of `m` or single `?`."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:271
+#: en/git-status.txt:275
#, no-wrap, priority:280
msgid "Porcelain Format Version 2"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:276
+#: en/git-status.txt:280
#, priority:280
msgid "Version 2 format adds more detailed information about the state of the worktree and changed items. Version 2 also defines an extensible set of easy to parse optional headers."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:280
+#: en/git-status.txt:284
#, priority:280
msgid "Header lines start with \"#\" and are added in response to specific command line arguments. Parsers should ignore headers they don't recognize."
msgstr ""
#. type: Title ^
-#: en/git-status.txt:282
+#: en/git-status.txt:286
#, no-wrap, priority:280
msgid "Branch Headers"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:286
+#: en/git-status.txt:290
#, priority:280
msgid "If `--branch` is given, a series of header lines are printed with information about the current branch."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:296
+#: en/git-status.txt:300
#, no-wrap, priority:280
msgid ""
"Line Notes\n"
@@ -47070,44 +47329,44 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:299
+#: en/git-status.txt:303
#, no-wrap, priority:280
msgid "Changed Tracked Entries"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:306
+#: en/git-status.txt:310
#, priority:280
msgid "Following the headers, a series of lines are printed for tracked entries. One of three different line formats may be used to describe an entry depending on the type of change. Tracked entries are printed in an undefined order; parsers should allow for a mixture of the 3 line types in any order."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:308
+#: en/git-status.txt:312
#, priority:280
msgid "Ordinary changed entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:310
+#: en/git-status.txt:314
#, no-wrap, priority:280
msgid " 1 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:312
+#: en/git-status.txt:316
#, priority:280
msgid "Renamed or copied entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:314
+#: en/git-status.txt:318
#, no-wrap, priority:280
msgid " 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:345
-#, no-wrap, priority:280
+#: en/git-status.txt:349
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"Field Meaning\n"
"--------------------------------------------------------\n"
@@ -47141,19 +47400,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:349
+#: en/git-status.txt:353
#, priority:280
msgid "Unmerged entries have the following format; the first character is a \"u\" to distinguish from ordinary changed entries."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:351
+#: en/git-status.txt:355
#, no-wrap, priority:280
msgid " u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:368
+#: en/git-status.txt:372
#, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47174,92 +47433,92 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:371
+#: en/git-status.txt:375
#, no-wrap, priority:280
msgid "Other Items"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:376
+#: en/git-status.txt:380
#, priority:280
msgid "Following the tracked entries (and if requested), a series of lines will be printed for untracked and then ignored items found in the worktree."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:378
+#: en/git-status.txt:382
#, priority:280
msgid "Untracked items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:380
+#: en/git-status.txt:384
#, no-wrap, priority:280
msgid " ? <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:382
+#: en/git-status.txt:386
#, priority:280
msgid "Ignored items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:384
+#: en/git-status.txt:388
#, no-wrap, priority:280
msgid " ! <path>\n"
msgstr ""
#. type: Title ^
-#: en/git-status.txt:386
+#: en/git-status.txt:390
#, no-wrap, priority:280
msgid "Pathname Format Notes and -z"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:391
+#: en/git-status.txt:395
#, priority:280
msgid "When the `-z` option is given, pathnames are printed as is and without any quoting and lines are terminated with a NUL (ASCII 0x00) byte."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:395
+#: en/git-status.txt:399
#, 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])."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:404
+#: en/git-status.txt:408
#, priority:280
msgid "The command honors `color.status` (or `status.color` -- they mean the same thing and the latter is kept for backward compatibility) and `color.status.<slot>` configuration variables to colorize its output."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:408
+#: en/git-status.txt:412
#, priority:280
msgid "If the config variable `status.relativePaths` is set to false, then all paths shown are relative to the repository root, not to the current directory."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:419
+#: en/git-status.txt:423
#, priority:280
msgid "If `status.submoduleSummary` is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). Please note that the summary output from the status command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings."
msgstr ""
#. type: Title -
-#: en/git-status.txt:421
+#: en/git-status.txt:425
#, no-wrap, priority:280
msgid "BACKGROUND REFRESH"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:432
+#: en/git-status.txt:436
#, priority:280
msgid "By default, `git status` will automatically refresh the index, updating the cached stat information from the working tree and writing out the result. Writing out the updated index is an optimization that isn't strictly necessary (`status` computes the values for itself, but writing them out is just to save subsequent programs from repeating our computation). When `status` is run in the background, the lock held during the write may conflict with other simultaneous processes, causing them to fail. Scripts running `status` in the background should consider using `git --no-optional-locks status` (see linkgit:git[1] for details)."
msgstr ""
#. type: Title =
#: en/git-stripspace.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-stripspace(1)"
msgstr ""
@@ -47330,7 +47589,7 @@ msgstr ""
#. type: Labeled list
#: en/git-stripspace.txt:39
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--strip-comments"
msgstr ""
@@ -47342,7 +47601,7 @@ msgstr ""
#. type: Labeled list
#: en/git-stripspace.txt:43
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--comment-lines"
msgstr ""
@@ -47416,7 +47675,7 @@ msgstr ""
#. type: Title =
#: en/git-submodule.txt:2
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
msgid "git-submodule(1)"
msgstr ""
@@ -47428,7 +47687,7 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:23
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git submodule' [--quiet] [--cached]\n"
"'git submodule' [--quiet] add [<options>] [--] <repository> [<path>]\n"
@@ -47499,7 +47758,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:74
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid "status [--cached] [--recursive] [--] [<path>...]"
msgstr ""
@@ -47523,7 +47782,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:91
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid "init [--] [<path>...]"
msgstr ""
@@ -47553,7 +47812,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:114
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid "deinit [-f|--force] (--all|[--] <path>...)"
msgstr ""
@@ -47583,7 +47842,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:132
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
msgstr ""
@@ -47696,281 +47955,287 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:176
#, no-wrap, priority:220
-msgid "set-branch ((-d|--default)|(-b|--branch <branch>)) [--] <path>"
+msgid "set-branch (-b|--branch) <branch> [--] <path>"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-submodule.txt:177
+#, no-wrap, priority:220
+msgid "set-branch (-d|--default) [--] <path>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:181
+#: en/git-submodule.txt:182
#, priority:220
msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:182
-#, no-wrap, priority:220
+#: en/git-submodule.txt:183
+#, ignore-ellipsis, no-wrap, priority:220
msgid "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:191
+#: en/git-submodule.txt:192
#, priority:220
msgid "Show commit summary between the given commit (defaults to HEAD) and working tree/index. For a submodule in question, a series of commits in the submodule between the given super project commit and the index or working tree (switched by `--cached`) are shown. If the option `--files` is given, show the series of commits in the submodule between the index of the super project and the working tree of the submodule (this option doesn't allow to use the `--cached` option or to provide an explicit commit)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:194
+#: en/git-submodule.txt:195
#, priority:220
msgid "Using the `--submodule=log` option with linkgit:git-diff[1] will provide that information too."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:195
+#: en/git-submodule.txt:196
#, no-wrap, priority:220
msgid "foreach [--recursive] <command>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:216
+#: en/git-submodule.txt:217
#, priority:220
msgid "Evaluates an arbitrary shell command in each checked out submodule. The command has access to the variables $name, $sm_path, $displaypath, $sha1 and $toplevel: $name is the name of the relevant submodule section in `.gitmodules`, $sm_path is the path of the submodule as recorded in the immediate superproject, $displaypath contains the relative path from the current working directory to the submodules root directory, $sha1 is the commit as recorded in the immediate superproject, and $toplevel is the absolute path to the top-level of the immediate superproject. Note that to avoid conflicts with '$PATH' on Windows, the '$path' variable is now a deprecated synonym of '$sm_path' variable. Any submodules defined in the superproject but not checked out are ignored by this command. Unless given `--quiet`, foreach prints the name of each submodule before evaluating the command. If `--recursive` is given, submodules are traversed recursively (i.e. the given shell command is evaluated in nested submodules as well). A non-zero return from the command in any submodule causes the processing to terminate. This can be overridden by adding '|| :' to the end of the command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:219
+#: en/git-submodule.txt:220
#, priority:220
msgid "As an example, the command below will show the path and currently checked out commit for each submodule:"
msgstr ""
#. type: delimited block -
-#: en/git-submodule.txt:222
+#: en/git-submodule.txt:223
#, no-wrap, priority:220
msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:224
-#, no-wrap, priority:220
+#: en/git-submodule.txt:225
+#, ignore-ellipsis, no-wrap, priority:220
msgid "sync [--recursive] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:231
+#: en/git-submodule.txt:232
#, priority:220
msgid "Synchronizes submodules' remote URL configuration setting to the value specified in `.gitmodules`. It will only affect those submodules which already have a URL entry in .git/config (that is the case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:234
+#: en/git-submodule.txt:235
#, priority:220
msgid "`git submodule sync` synchronizes all submodules while `git submodule sync -- A` synchronizes submodule \"A\" only."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:237
+#: en/git-submodule.txt:238
#, priority:220
msgid "If `--recursive` is specified, this command will recurse into the registered submodules, and sync any nested submodules within."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:238
+#: en/git-submodule.txt:239
#, no-wrap, priority:220
msgid "absorbgitdirs"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:245
+#: en/git-submodule.txt:246
#, priority:220
msgid "If a git directory of a submodule is inside the submodule, move the git directory of the submodule into its superprojects `$GIT_DIR/modules` path and then connect the git directory and its working directory by setting the `core.worktree` and adding a .git file pointing to the git directory embedded in the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:249
+#: en/git-submodule.txt:250
#, priority:220
msgid "A repository that was cloned independently and later added as a submodule or old setups have the submodules git directory inside the submodule instead of embedded into the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:251
+#: en/git-submodule.txt:252
#, priority:220
msgid "This command is recursive by default."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:257
+#: en/git-submodule.txt:258
#, priority:220
msgid "Only print error messages."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:264
+#: en/git-submodule.txt:265
#, priority:220
msgid "This option is only valid for add and update commands. Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:268
+#: en/git-submodule.txt:269
#, priority:220
msgid "This option is only valid for the deinit command. Unregister all submodules in the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:269
+#: en/git-submodule.txt:270
#, no-wrap, priority:220
msgid "-b <branch>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:277
+#: en/git-submodule.txt:278
#, priority:220
msgid "Branch of repository to add as submodule. The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository. If the option is not specified, it defaults to 'master'."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:290
+#: en/git-submodule.txt:291
#, priority:220
msgid "This option is only valid for add, deinit and update commands. When running add, allow adding an otherwise ignored submodule path. When running deinit the submodule working trees will be removed even if they contain local changes. When running update (only effective with the checkout procedure), throw away local changes in submodules when switching to a different commit; and always run a checkout operation in the submodule, even if the commit listed in the index of the containing repository matches the commit checked out in the submodule."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:295
+#: en/git-submodule.txt:296
#, priority:220
msgid "This option is only valid for status and summary commands. These commands typically use the commit found in the submodule HEAD, but with this option, the commit stored in the index is used instead."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:296
-#, no-wrap, priority:220
+#: en/git-submodule.txt:297
+#, ignore-same, no-wrap, priority:220
msgid "--files"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:300
+#: en/git-submodule.txt:301
#, priority:220
msgid "This option is only valid for the summary command. This command compares the commit in the index with that in the submodule HEAD when this option is used."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:302
-#, no-wrap, priority:220
+#: en/git-submodule.txt:303
+#, ignore-same, no-wrap, priority:220
msgid "--summary-limit"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:308
+#: en/git-submodule.txt:309
#, priority:220
msgid "This option is only valid for the summary command. Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:309
-#, no-wrap, priority:220
+#: en/git-submodule.txt:310
+#, ignore-same, no-wrap, priority:220
msgid "--remote"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:318
+#: en/git-submodule.txt:319
#, priority:220
msgid "This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:324
+#: en/git-submodule.txt:325
#, priority:220
msgid "This works for any of the supported update procedures (`--checkout`, `--rebase`, etc.). The only change is the source of the target SHA-1. For example, `submodule update --remote --merge` will merge upstream submodule changes into the submodules, while `submodule update --merge` will merge superproject gitlink changes into the submodules."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:329
+#: en/git-submodule.txt:330
#, priority:220
msgid "In order to ensure a current tracking branch state, `update --remote` fetches the submodule's remote repository before calculating the SHA-1. If you don't want to fetch, you should use `submodule update --remote --no-fetch`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:339
+#: en/git-submodule.txt:340
#, priority:220
msgid "Use this option to integrate changes from the upstream subproject with your submodule's current HEAD. Alternatively, you can run `git pull` from the submodule, which is equivalent except for the remote branch name: `update --remote` uses the default upstream repository and `submodule.<name>.branch`, while `git pull` uses the submodule's `branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want to distribute the default upstream branch with the superproject and `branch.<name>.merge` if you want a more native feel while working in the submodule itself."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:341
-#, no-wrap, priority:220
+#: en/git-submodule.txt:342
+#, ignore-same, no-wrap, priority:220
msgid "--no-fetch"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:344
+#: en/git-submodule.txt:345
#, priority:220
msgid "This option is only valid for the update command. Don't fetch new objects from the remote site."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:345
-#, no-wrap, priority:220
+#: en/git-submodule.txt:346
+#, ignore-same, no-wrap, priority:220
msgid "--checkout"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:353
+#: en/git-submodule.txt:354
#, priority:220
msgid "This option is only valid for the update command. Checkout the commit recorded in the superproject on a detached HEAD in the submodule. This is the default behavior, the main use of this option is to override `submodule.$name.update` when set to a value other than `checkout`. If the key `submodule.$name.update` is either not explicitly set or set to `checkout`, this option is implicit."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:363
+#: en/git-submodule.txt:364
#, priority:220
msgid "This option is only valid for the update command. Merge the commit recorded in the superproject into the current branch of the submodule. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve the resulting conflicts within the submodule with the usual conflict resolution tools. If the key `submodule.$name.update` is set to `merge`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:364
-#, no-wrap, priority:220
+#: en/git-submodule.txt:365
+#, ignore-same, no-wrap, priority:220
msgid "--rebase"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:372
+#: en/git-submodule.txt:373
#, priority:220
msgid "This option is only valid for the update command. Rebase the current branch onto the commit recorded in the superproject. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve these failures with linkgit:git-rebase[1]. If the key `submodule.$name.update` is set to `rebase`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:373
-#, no-wrap, priority:220
+#: en/git-submodule.txt:374
+#, ignore-same, no-wrap, priority:220
msgid "--init"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:377
+#: en/git-submodule.txt:378
#, priority:220
msgid "This option is only valid for the update command. Initialize all submodules for which \"git submodule init\" has not been called so far before updating."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:378
-#, no-wrap, priority:220
+#: en/git-submodule.txt:379
+#, ignore-same, no-wrap, priority:220
msgid "--name"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:382
+#: en/git-submodule.txt:383
#, priority:220
msgid "This option is only valid for the add command. It sets the submodule's name to the given string instead of defaulting to its path. The name must be valid as a directory name and may not end with a '/'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:383
+#: en/git-submodule.txt:384
#, no-wrap, priority:220
msgid "--reference <repository>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:387 en/git-submodule.txt:396
+#: en/git-submodule.txt:388 en/git-submodule.txt:397
#, priority:220
msgid "This option is only valid for add and update commands. These commands sometimes need to clone a remote repository. In this case, this option will be passed to the linkgit:git-clone[1] command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:391
+#: en/git-submodule.txt:392
#, no-wrap, priority:220
msgid ""
"*NOTE*: Do *not* use this option unless you have read the note\n"
@@ -47979,68 +48244,68 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:398
+#: en/git-submodule.txt:399
#, no-wrap, priority:220
msgid "*NOTE*: see the NOTE for the `--reference` option.\n"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:404
+#: en/git-submodule.txt:405
#, priority:220
msgid "This option is only valid for foreach, update, status and sync commands. Traverse submodules recursively. The operation is performed not only in the submodules of the current repo, but also in any nested submodules inside those submodules (and so on)."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:405
-#, no-wrap, priority:220
+#: en/git-submodule.txt:406
+#, ignore-same, no-wrap, priority:220
msgid "--depth"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:409
+#: en/git-submodule.txt:410
#, priority:220
msgid "This option is valid for add and update commands. Create a 'shallow' clone with a history truncated to the specified number of revisions. See linkgit:git-clone[1]"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:410
-#, no-wrap, priority:220
+#: en/git-submodule.txt:411
+#, ignore-same, no-wrap, priority:220
msgid "--[no-]recommend-shallow"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:415
+#: en/git-submodule.txt:416
#, priority:220
msgid "This option is only valid for the update command. The initial clone of a submodule will use the recommended `submodule.<name>.shallow` as provided by the `.gitmodules` file by default. To ignore the suggestions use `--no-recommend-shallow`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:421
+#: en/git-submodule.txt:422
#, priority:220
msgid "This option is only valid for the update command. Clone new submodules in parallel with as many jobs. Defaults to the `submodule.fetchJobs` option."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:426
+#: en/git-submodule.txt:427
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:434
+#: en/git-submodule.txt:435
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:438
+#: en/git-submodule.txt:439
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
-msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
+msgstr ""
#. type: Title =
#: en/git-svn.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-svn(1)"
msgstr ""
@@ -48078,7 +48343,7 @@ msgstr ""
#: en/git-svn.txt:31
#, ignore-same, no-wrap, priority:100
msgid "'init'"
-msgstr "'init'"
+msgstr ""
#. type: Plain text
#: en/git-svn.txt:39
@@ -48124,7 +48389,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:47
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--stdlayout"
msgstr ""
@@ -48136,7 +48401,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:58
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-metadata"
msgstr ""
@@ -48148,7 +48413,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:62
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--use-svm-props"
msgstr ""
@@ -48160,7 +48425,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:64
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--use-svnsync-props"
msgstr ""
@@ -48256,7 +48521,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:110
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-minimize-url"
msgstr ""
@@ -48270,11 +48535,11 @@ msgstr ""
#: en/git-svn.txt:122
#, ignore-same, no-wrap, priority:100
msgid "'fetch'"
-msgstr "'fetch'"
+msgstr ""
#. type: Plain text
#: en/git-svn.txt:127
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Fetch unfetched revisions from the Subversion remote we are tracking. The name of the [svn-remote \"...\"] section in the $GIT_DIR/config file may be specified as an optional command-line argument."
msgstr ""
@@ -48286,7 +48551,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:131
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--localtime"
msgstr ""
@@ -48304,7 +48569,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:142 en/git-svn.txt:536
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--parent"
msgstr ""
@@ -48402,7 +48667,7 @@ msgstr ""
#: en/git-svn.txt:204
#, ignore-same, no-wrap, priority:100
msgid "'clone'"
-msgstr "'clone'"
+msgstr ""
#. type: Plain text
#: en/git-svn.txt:214
@@ -48412,7 +48677,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:215
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--preserve-empty-dirs"
msgstr ""
@@ -48438,7 +48703,7 @@ msgstr ""
#: en/git-svn.txt:226
#, ignore-same, no-wrap, priority:100
msgid "'rebase'"
-msgstr "'rebase'"
+msgstr ""
#. type: Plain text
#: en/git-svn.txt:229
@@ -48474,7 +48739,7 @@ msgstr ""
#: en/git-svn.txt:249
#, ignore-same, no-wrap, priority:100
msgid "'dcommit'"
-msgstr "'dcommit'"
+msgstr ""
#. type: Plain text
#: en/git-svn.txt:254
@@ -48572,7 +48837,7 @@ msgstr ""
#: en/git-svn.txt:305
#, ignore-same, no-wrap, priority:100
msgid "'branch'"
-msgstr "'branch'"
+msgstr ""
#. type: Plain text
#: en/git-svn.txt:307
@@ -48582,7 +48847,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:309
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--message"
msgstr ""
@@ -48594,7 +48859,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:313
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--tag"
msgstr ""
@@ -48636,7 +48901,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:333
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--username"
msgstr ""
@@ -48648,7 +48913,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:337
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--commit-url"
msgstr ""
@@ -48665,8 +48930,8 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:889
-#, no-wrap, priority:260
+#: en/git-svn.txt:346 en/rev-list-options.txt:905
+#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr ""
@@ -48680,7 +48945,7 @@ msgstr ""
#: en/git-svn.txt:351
#, ignore-same, no-wrap, priority:100
msgid "'tag'"
-msgstr "'tag'"
+msgstr ""
#. type: Plain text
#: en/git-svn.txt:354
@@ -48692,7 +48957,7 @@ msgstr ""
#: en/git-svn.txt:355
#, ignore-same, no-wrap, priority:100
msgid "'log'"
-msgstr "'log'"
+msgstr ""
#. type: Plain text
#: en/git-svn.txt:358
@@ -48720,7 +48985,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:366
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
msgstr ""
@@ -48756,7 +49021,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:380
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--show-commit"
msgstr ""
@@ -48768,7 +49033,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:382 en/pretty-options.txt:31
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--oneline"
msgstr ""
@@ -48794,7 +49059,7 @@ msgstr ""
#: en/git-svn.txt:392
#, ignore-same, no-wrap, priority:100
msgid "'blame'"
-msgstr "'blame'"
+msgstr ""
#. type: Plain text
#: en/git-svn.txt:399
@@ -48804,7 +49069,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:400
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--git-format"
msgstr ""
@@ -48818,7 +49083,7 @@ msgstr ""
#: en/git-svn.txt:406
#, ignore-same, no-wrap, priority:100
msgid "'find-rev'"
-msgstr "'find-rev'"
+msgstr ""
#. type: Plain text
#: en/git-svn.txt:411
@@ -48834,7 +49099,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:413
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--before"
msgstr ""
@@ -48846,7 +49111,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:419
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--after"
msgstr ""
@@ -48860,7 +49125,7 @@ msgstr ""
#: en/git-svn.txt:424
#, ignore-same, no-wrap, priority:100
msgid "'set-tree'"
-msgstr "'set-tree'"
+msgstr ""
#. type: Plain text
#: en/git-svn.txt:432
@@ -48872,7 +49137,7 @@ msgstr ""
#: en/git-svn.txt:433
#, ignore-same, no-wrap, priority:100
msgid "'create-ignore'"
-msgstr "'create-ignore'"
+msgstr ""
#. type: Plain text
#: en/git-svn.txt:438
@@ -48884,7 +49149,7 @@ msgstr ""
#: en/git-svn.txt:439
#, ignore-same, no-wrap, priority:100
msgid "'show-ignore'"
-msgstr "'show-ignore'"
+msgstr ""
#. type: Plain text
#: en/git-svn.txt:443
@@ -48896,7 +49161,7 @@ msgstr ""
#: en/git-svn.txt:444
#, ignore-same, no-wrap, priority:100
msgid "'mkdirs'"
-msgstr "'mkdirs'"
+msgstr ""
#. type: Plain text
#: en/git-svn.txt:452
@@ -48908,7 +49173,7 @@ msgstr ""
#: en/git-svn.txt:453
#, ignore-same, no-wrap, priority:100
msgid "'commit-diff'"
-msgstr "'commit-diff'"
+msgstr ""
#. type: Plain text
#: en/git-svn.txt:462
@@ -49187,7 +49452,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:602
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--rmdir"
msgstr ""
@@ -49345,7 +49610,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:701
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--use-log-author"
msgstr ""
@@ -49363,7 +49628,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:709
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--add-author-from"
msgstr ""
@@ -49423,7 +49688,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:735
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--follow-parent"
msgstr ""
@@ -49478,7 +49743,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:777
#, priority:100
-msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider linkgit:git-filter-branch[1] instead. filter-branch also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
+msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports, and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider https://github.com/newren/git-filter-repo[git-filter-repo] instead. filter-repo also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
msgstr ""
#. type: Labeled list
@@ -49621,7 +49886,7 @@ msgstr ""
#. type: delimited block -
#: en/git-svn.txt:876
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"# Clone a repo (like git clone):\n"
"\tgit svn clone http://svn.example.com/project/trunk\n"
@@ -49674,7 +49939,7 @@ msgstr ""
#. type: delimited block -
#: en/git-svn.txt:924
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"# Do the initial import on a server\n"
"\tssh server \"cd /pub && git svn clone http://svn.example.com/project [options...]\"\n"
@@ -49984,7 +50249,7 @@ msgstr ""
#. type: Title =
#: en/git-switch.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-switch(1)"
msgstr ""
@@ -50124,7 +50389,7 @@ msgstr ""
#. type: Labeled list
#: en/git-switch.txt:111
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--discard-changes"
msgstr ""
@@ -50285,13 +50550,13 @@ msgstr ""
#. type: Plain text
#: en/git-switch.txt:270
-#, priority:100
+#, ignore-same, priority:100
msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
msgstr ""
#. type: Title =
#: en/git-symbolic-ref.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-symbolic-ref(1)"
msgstr ""
@@ -50372,7 +50637,7 @@ msgstr ""
#. type: Title =
#: en/git-tag.txt:2
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "git-tag(1)"
msgstr ""
@@ -50384,7 +50649,7 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:20
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>] [-e]\n"
"\t<tagname> [<commit> | <object>]\n"
@@ -50452,7 +50717,7 @@ msgstr ""
#. type: Labeled list
#: en/git-tag.txt:65
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--sign"
msgstr ""
@@ -50464,7 +50729,7 @@ msgstr ""
#. type: Labeled list
#: en/git-tag.txt:71
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--no-sign"
msgstr ""
@@ -50530,7 +50795,7 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:103
-#, priority:240
+#, ignore-ellipsis, priority:240
msgid "List tags. With optional `<pattern>...`, e.g. `git tag --list 'v-*'`, list only the tags that match the pattern(s)."
msgstr ""
@@ -50820,13 +51085,13 @@ msgstr ""
#. type: delimited block -
#: en/git-tag.txt:319
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid "\tgit://git..../proj.git master\n"
msgstr ""
#. type: delimited block -
#: en/git-tag.txt:321
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid "to get the following updates...\n"
msgstr ""
@@ -50838,7 +51103,7 @@ msgstr ""
#. type: delimited block -
#: en/git-tag.txt:327
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid "$ git pull git://git..../proj.git master\n"
msgstr ""
@@ -50958,7 +51223,7 @@ msgstr ""
#. type: Plain text
#: en/git.txt:55
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Other options are available to control how the manual page is displayed. See linkgit:git-help[1] for more information, because `git --help ...` is converted internally into `git help ...`."
msgstr ""
@@ -51002,7 +51267,7 @@ msgstr ""
#. type: Plain text
#: en/git.txt:82
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Note that omitting the `=` in `git -c foo.bar ...` is allowed and sets `foo.bar` to the boolean true value (just like `[foo]bar` would in a config file). Including the equals but with an empty value (like `git -c foo.bar= ...`) sets `foo.bar` to the empty string which `git config --type=bool` will convert to `false`."
msgstr ""
@@ -51020,7 +51285,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:89
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--html-path"
msgstr ""
@@ -51032,7 +51297,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:93
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--man-path"
msgstr ""
@@ -51044,7 +51309,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:97
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--info-path"
msgstr ""
@@ -51056,7 +51321,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:102
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--paginate"
msgstr ""
@@ -51068,7 +51333,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:109
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-pager"
msgstr ""
@@ -51134,7 +51399,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:140
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-replace-objects"
msgstr ""
@@ -51146,7 +51411,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:144
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--literal-pathspecs"
msgstr ""
@@ -51158,7 +51423,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:149
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--glob-pathspecs"
msgstr ""
@@ -51170,7 +51435,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:155
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--noglob-pathspecs"
msgstr ""
@@ -51182,7 +51447,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:161
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--icase-pathspecs"
msgstr ""
@@ -51194,7 +51459,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:165
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-optional-locks"
msgstr ""
@@ -51206,7 +51471,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:169
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "--list-cmds=group[,group...]"
msgstr ""
@@ -51399,16 +51664,6 @@ msgid ""
"#\n"
msgstr ""
-#. type: delimited block -
-#: en/git.txt:310
-#, 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/git.txt:315
#, no-wrap, priority:100
@@ -51589,7 +51844,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:403
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_FILE`"
msgstr ""
@@ -51601,7 +51856,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:408
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_VERSION`"
msgstr ""
@@ -51613,7 +51868,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:414
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr ""
@@ -51625,7 +51880,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:420
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr ""
@@ -51643,7 +51898,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:433
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIR`"
msgstr ""
@@ -51655,7 +51910,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:439
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_WORK_TREE`"
msgstr ""
@@ -51667,7 +51922,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:444
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_NAMESPACE`"
msgstr ""
@@ -51679,7 +51934,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:448
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr ""
@@ -51691,7 +51946,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:463
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr ""
@@ -51703,13 +51958,13 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:473
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMON_DIR`"
msgstr ""
#. type: Plain text
#: en/git.txt:481
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr ""
@@ -51721,37 +51976,37 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:484
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_NAME`"
msgstr ""
#. type: Labeled list
#: en/git.txt:485
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_EMAIL`"
msgstr ""
#. type: Labeled list
#: en/git.txt:486
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_DATE`"
msgstr ""
#. type: Labeled list
#: en/git.txt:487
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_NAME`"
msgstr ""
#. type: Labeled list
#: en/git.txt:488
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_EMAIL`"
msgstr ""
#. type: Labeled list
#: en/git.txt:489
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_DATE`"
msgstr ""
@@ -51775,7 +52030,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:495
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_OPTS`"
msgstr ""
@@ -51787,7 +52042,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:501
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_EXTERNAL_DIFF`"
msgstr ""
@@ -51871,7 +52126,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:528
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr ""
@@ -51883,7 +52138,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:531
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr ""
@@ -51895,7 +52150,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:536
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_MERGE_VERBOSITY`"
msgstr ""
@@ -51907,7 +52162,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:541
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_PAGER`"
msgstr ""
@@ -51919,7 +52174,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:547
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_EDITOR`"
msgstr ""
@@ -51931,13 +52186,13 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:553
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH`"
msgstr ""
#. type: Labeled list
#: en/git.txt:554
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_COMMAND`"
msgstr ""
@@ -51961,7 +52216,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:572
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_VARIANT`"
msgstr ""
@@ -51973,7 +52228,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:578
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_ASKPASS`"
msgstr ""
@@ -51985,7 +52240,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:585
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TERMINAL_PROMPT`"
msgstr ""
@@ -51997,7 +52252,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:589
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr ""
@@ -52009,7 +52264,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:597
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_FLUSH`"
msgstr ""
@@ -52030,7 +52285,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:608
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE`"
msgstr ""
@@ -52066,7 +52321,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:629
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_FSMONITOR`"
msgstr ""
@@ -52078,7 +52333,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:633
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr ""
@@ -52090,7 +52345,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:640
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKET`"
msgstr ""
@@ -52102,7 +52357,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:647
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKFILE`"
msgstr ""
@@ -52120,7 +52375,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:658
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr ""
@@ -52132,7 +52387,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:663
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SETUP`"
msgstr ""
@@ -52144,7 +52399,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:668
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SHALLOW`"
msgstr ""
@@ -52156,7 +52411,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:673
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL`"
msgstr ""
@@ -52168,7 +52423,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:681
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr ""
@@ -52180,7 +52435,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:685
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2`"
msgstr ""
@@ -52210,7 +52465,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:720
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_EVENT`"
msgstr ""
@@ -52222,7 +52477,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:726
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_PERF`"
msgstr ""
@@ -52234,7 +52489,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:733
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDACT_COOKIES`"
msgstr ""
@@ -52246,7 +52501,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:739
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr ""
@@ -52258,7 +52513,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:748
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_GLOB_PATHSPECS`"
msgstr ""
@@ -52270,7 +52525,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:752
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr ""
@@ -52282,7 +52537,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:756
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_ICASE_PATHSPECS`"
msgstr ""
@@ -52294,7 +52549,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:760
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_REFLOG_ACTION`"
msgstr ""
@@ -52306,7 +52561,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:770
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_REF_PARANOIA`"
msgstr ""
@@ -52318,7 +52573,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:781
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr ""
@@ -52330,7 +52585,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:790
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr ""
@@ -52342,7 +52597,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:797
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL`"
msgstr ""
@@ -52354,7 +52609,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:803
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr ""
@@ -52366,19 +52621,19 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:811
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDIN`"
msgstr ""
#. type: Labeled list
#: en/git.txt:812
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDOUT`"
msgstr ""
#. type: Labeled list
#: en/git.txt:813
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDERR`"
msgstr ""
@@ -52552,7 +52807,7 @@ msgstr ""
#. type: Title =
#: en/git-unpack-file.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-unpack-file(1)"
msgstr ""
@@ -52585,7 +52840,7 @@ msgstr ""
#. type: Title =
#: en/git-unpack-objects.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-unpack-objects(1)"
msgstr ""
@@ -52651,7 +52906,7 @@ msgstr ""
#. type: Title =
#: en/git-update-index.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-update-index(1)"
msgstr ""
@@ -52663,7 +52918,7 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:29
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git update-index'\n"
"\t [--add] [--remove | --force-remove] [--replace]\n"
@@ -52710,7 +52965,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:49
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--remove"
msgstr ""
@@ -52740,7 +52995,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:63
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--ignore-submodules"
msgstr ""
@@ -52794,7 +53049,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:82
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--index-info"
msgstr ""
@@ -52812,7 +53067,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:88
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]assume-unchanged"
msgstr ""
@@ -52830,7 +53085,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:106
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--really-refresh"
msgstr ""
@@ -52842,7 +53097,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:110
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]skip-worktree"
msgstr ""
@@ -52854,7 +53109,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:116
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]fsmonitor-valid"
msgstr ""
@@ -52866,7 +53121,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:123
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--again"
msgstr ""
@@ -52878,7 +53133,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:127
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--unresolve"
msgstr ""
@@ -52890,7 +53145,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:131
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--info-only"
msgstr ""
@@ -52902,7 +53157,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:136
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--force-remove"
msgstr ""
@@ -52914,7 +53169,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:140
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--replace"
msgstr ""
@@ -52956,13 +53211,13 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:172
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--split-index"
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:173
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-split-index"
msgstr ""
@@ -52980,13 +53235,13 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:185
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--untracked-cache"
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:186
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-untracked-cache"
msgstr ""
@@ -53004,7 +53259,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:196
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--test-untracked-cache"
msgstr ""
@@ -53016,7 +53271,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:206
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--force-untracked-cache"
msgstr ""
@@ -53028,13 +53283,13 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:212
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--fsmonitor"
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:213
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--no-fsmonitor"
msgstr ""
@@ -53223,7 +53478,7 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:348
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "The command looks at `core.ignorestat` configuration variable. When this is true, paths updated with `git update-index paths...` and paths updated with other Git commands that update both index and working tree (e.g. 'git apply --index', 'git checkout-index -u', and 'git read-tree -u') are automatically marked as \"assume unchanged\". Note that \"assume unchanged\" bit is *not* set if `git update-index --refresh` finds the working tree file matches the index (use `git update-index --really-refresh` if you want to mark them as \"assume unchanged\")."
msgstr ""
@@ -53513,13 +53768,13 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:551
-#, priority:100
+#, ignore-same, priority:100
msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
msgstr ""
#. type: Title =
#: en/git-update-ref.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-update-ref(1)"
msgstr ""
@@ -53675,7 +53930,7 @@ msgstr ""
#: en/git-update-ref.txt:104
#, ignore-same, no-wrap, priority:100
msgid "delete"
-msgstr "delete"
+msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:107
@@ -53687,7 +53942,7 @@ msgstr ""
#: en/git-update-ref.txt:108
#, ignore-same, no-wrap, priority:100
msgid "verify"
-msgstr "verify"
+msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:111
@@ -53699,7 +53954,7 @@ msgstr ""
#: en/git-update-ref.txt:112
#, ignore-same, no-wrap, priority:100
msgid "option"
-msgstr "option"
+msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:116
@@ -53763,7 +54018,7 @@ msgstr ""
#. type: Title =
#: en/git-update-server-info.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-update-server-info(1)"
msgstr ""
@@ -53805,7 +54060,7 @@ msgstr ""
#. type: Title =
#: en/git-upload-archive.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-upload-archive(1)"
msgstr ""
@@ -53883,7 +54138,7 @@ msgstr ""
#. type: Title =
#: en/git-upload-pack.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-upload-pack(1)"
msgstr ""
@@ -53915,7 +54170,7 @@ msgstr ""
#. type: Labeled list
#: en/git-upload-pack.txt:28
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]strict"
msgstr ""
@@ -53933,7 +54188,7 @@ msgstr ""
#. type: Labeled list
#: en/git-upload-pack.txt:34
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--stateless-rpc"
msgstr ""
@@ -53945,7 +54200,7 @@ msgstr ""
#. type: Labeled list
#: en/git-upload-pack.txt:39
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--advertise-refs"
msgstr ""
@@ -53963,13 +54218,13 @@ msgstr ""
#. type: Plain text
#: en/git-upload-pack.txt:50
-#, priority:100
+#, ignore-same, priority:100
msgid "linkgit:gitnamespaces[7]"
msgstr ""
#. type: Title =
#: en/git-var.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-var(1)"
msgstr ""
@@ -54013,7 +54268,7 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:34
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "GIT_AUTHOR_IDENT"
msgstr ""
@@ -54025,7 +54280,7 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:37
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "GIT_COMMITTER_IDENT"
msgstr ""
@@ -54037,7 +54292,7 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:40
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "GIT_EDITOR"
msgstr ""
@@ -54055,7 +54310,7 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:52
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "GIT_PAGER"
msgstr ""
@@ -54073,13 +54328,13 @@ msgstr ""
#. type: Plain text
#: en/git-var.txt:67
-#, priority:100
+#, ignore-same, priority:100
msgid "linkgit:git-commit-tree[1] linkgit:git-tag[1] linkgit:git-config[1]"
msgstr ""
#. type: Title =
#: en/git-verify-commit.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-verify-commit(1)"
msgstr ""
@@ -54091,7 +54346,7 @@ msgstr ""
#. type: Plain text
#: en/git-verify-commit.txt:12
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git verify-commit' <commit>...\n"
msgstr ""
@@ -54121,7 +54376,7 @@ msgstr ""
#. type: Title =
#: en/git-verify-pack.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-verify-pack(1)"
msgstr ""
@@ -54133,7 +54388,7 @@ msgstr ""
#. type: Plain text
#: en/git-verify-pack.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git verify-pack' [-v|--verbose] [-s|--stat-only] [--] <pack>.idx ...\n"
msgstr ""
@@ -54145,7 +54400,7 @@ msgstr ""
#. type: Labeled list
#: en/git-verify-pack.txt:23
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<pack>.idx ..."
msgstr ""
@@ -54163,7 +54418,7 @@ msgstr ""
#. type: Labeled list
#: en/git-verify-pack.txt:32
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--stat-only"
msgstr ""
@@ -54211,7 +54466,7 @@ msgstr ""
#. type: Title =
#: en/git-verify-tag.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-verify-tag(1)"
msgstr ""
@@ -54223,7 +54478,7 @@ msgstr ""
#. type: Plain text
#: en/git-verify-tag.txt:12
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git verify-tag' [--format=<format>] <tag>...\n"
msgstr ""
@@ -54241,7 +54496,7 @@ msgstr ""
#. type: Labeled list
#: en/git-verify-tag.txt:27
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<tag>..."
msgstr ""
@@ -54265,7 +54520,7 @@ msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:12
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git web{litdd}browse' [<options>] <url|file>...\n"
msgstr ""
@@ -54527,7 +54782,7 @@ msgstr ""
#. type: Title =
#: en/git-whatchanged.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-whatchanged(1)"
msgstr ""
@@ -54539,7 +54794,7 @@ msgstr ""
#. type: Plain text
#: en/git-whatchanged.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git whatchanged' <option>...\n"
msgstr ""
@@ -54587,7 +54842,7 @@ msgstr ""
#. type: Title =
#: en/git-worktree.txt:2
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "git-worktree(1)"
msgstr ""
@@ -54674,7 +54929,7 @@ msgstr ""
#: en/git-worktree.txt:88
#, ignore-same, no-wrap, priority:240
msgid "lock"
-msgstr "lock"
+msgstr ""
#. type: Plain text
#: en/git-worktree.txt:95
@@ -54686,7 +54941,7 @@ msgstr ""
#: en/git-worktree.txt:96
#, ignore-same, no-wrap, priority:240
msgid "move"
-msgstr "move"
+msgstr ""
#. type: Plain text
#: en/git-worktree.txt:100
@@ -54710,7 +54965,7 @@ msgstr ""
#: en/git-worktree.txt:112
#, ignore-same, no-wrap, priority:240
msgid "unlock"
-msgstr "unlock"
+msgstr ""
#. type: Plain text
#: en/git-worktree.txt:115
@@ -54762,7 +55017,7 @@ msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:147
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--[no-]checkout"
msgstr ""
@@ -54774,7 +55029,7 @@ msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:153
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--[no-]guess-remote"
msgstr ""
@@ -54792,7 +55047,7 @@ msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:163
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--[no-]track"
msgstr ""
@@ -54804,7 +55059,7 @@ msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:169
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "--lock"
msgstr ""
@@ -55069,7 +55324,7 @@ msgstr ""
#. type: delimited block -
#: en/git-worktree.txt:372
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git worktree add -b emergency-fix ../temp master\n"
"$ pushd ../temp\n"
@@ -55087,7 +55342,7 @@ msgstr ""
#. type: Title =
#: en/git-write-tree.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "git-write-tree(1)"
msgstr ""
@@ -55123,7 +55378,7 @@ msgstr ""
#. type: Labeled list
#: en/git-write-tree.txt:30
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
msgid "--missing-ok"
msgstr ""
@@ -55449,98 +55704,104 @@ msgstr ""
msgid "This option determines how the merge message will be cleaned up before commiting. See linkgit:git-commit[1] for more details. In addition, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on to the commit machinery in the case of a merge conflict."
msgstr ""
+#. type: Labeled list
+#: en/merge-options.txt:44
+#, ignore-same, no-wrap, priority:240
+msgid "--ff-only"
+msgstr ""
+
#. type: Plain text
-#: en/merge-options.txt:46
+#: en/merge-options.txt:50
#, priority:240
-msgid "When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. This is the default behavior."
+msgid "Specifies how a merge is handled when the merged-in history is already a descendant of the current history. `--ff` is the default unless merging an annotated (and possibly signed) tag that is not stored in its natural place in the `refs/tags/` hierarchy, in which case `--no-ff` is assumed."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:52
+#: en/merge-options.txt:55
#, priority:240
-msgid "Create a merge commit even when the merge resolves as a fast-forward. This is the default behaviour when merging an annotated (and possibly signed) tag that is not stored in its natural place in 'refs/tags/' hierarchy."
+msgid "With `--ff`, when possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit."
msgstr ""
-#. type: Labeled list
-#: en/merge-options.txt:53
-#, no-wrap, priority:240
-msgid "--ff-only"
+#. type: Plain text
+#: en/merge-options.txt:58
+#, priority:240
+msgid "With `--no-ff`, create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:57
+#: en/merge-options.txt:61
#, priority:240
-msgid "Refuse to merge and exit with a non-zero status unless the current `HEAD` is already up to date or the merge can be resolved as a fast-forward."
+msgid "With `--ff-only`, resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:63
+#: en/merge-options.txt:67
#, priority:240
msgid "GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:69
+#: en/merge-options.txt:73
#, priority:240
msgid "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also linkgit:git-fmt-merge-msg[1]."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:72
+#: en/merge-options.txt:76
#, priority:240
msgid "With --no-log do not list one-line descriptions from the actual commits being merged."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:74
-#, no-wrap, priority:240
+#: en/merge-options.txt:78
+#, ignore-same, no-wrap, priority:240
msgid "--no-signoff"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:83
+#: en/merge-options.txt:87
#, priority:240
msgid "With --no-signoff do not add a Signed-off-by line."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:89
+#: en/merge-options.txt:93
#, priority:240
msgid "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:92
+#: en/merge-options.txt:96
#, priority:240
msgid "With -n or --no-stat do not show a diffstat at the end of the merge."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:93
-#, no-wrap, priority:240
+#: en/merge-options.txt:97
+#, ignore-same, no-wrap, priority:240
msgid "--squash"
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:94
-#, no-wrap, priority:240
+#: en/merge-options.txt:98
+#, ignore-same, no-wrap, priority:240
msgid "--no-squash"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:102
+#: en/merge-options.txt:106
#, priority:240
msgid "Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:105
+#: en/merge-options.txt:109
#, priority:240
msgid "With --no-squash perform the merge and commit the result. This option can be used to override --squash."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:107
+#: en/merge-options.txt:111
#, priority:240
msgid "With --squash, --commit is not allowed, and will fail."
msgstr ""
@@ -55548,71 +55809,77 @@ msgstr ""
#. type: Plain text
#: en/merge-options.txt:115
#, priority:240
+msgid "This option bypasses the pre-merge and commit-msg hooks. See also linkgit:githooks[5]."
+msgstr ""
+
+#. type: Plain text
+#: en/merge-options.txt:123
+#, priority:240
msgid "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise)."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:116
+#: en/merge-options.txt:124
#, no-wrap, priority:240
msgid "-X <option>"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:120
+#: en/merge-options.txt:128
#, priority:240
msgid "Pass merge strategy specific option through to the merge strategy."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:121
-#, no-wrap, priority:240
+#: en/merge-options.txt:129
+#, ignore-same, no-wrap, priority:240
msgid "--verify-signatures"
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:122
-#, no-wrap, priority:240
+#: en/merge-options.txt:130
+#, ignore-same, no-wrap, priority:240
msgid "--no-verify-signatures"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:128
+#: en/merge-options.txt:136
#, priority:240
msgid "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:130
-#, no-wrap, priority:240
+#: en/merge-options.txt:138
+#, ignore-same, no-wrap, priority:240
msgid "--no-summary"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:133
+#: en/merge-options.txt:141
#, priority:240
msgid "Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:138
+#: en/merge-options.txt:146
#, priority:240
msgid "Operate quietly. Implies --no-progress."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:149
+#: en/merge-options.txt:157
#, priority:240
msgid "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:152
-#, no-wrap, priority:240
+#: en/merge-options.txt:160
+#, ignore-same, no-wrap, priority:240
msgid "--allow-unrelated-histories"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:158
+#: en/merge-options.txt:166
#, priority:240
msgid "By default, `git merge` command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added."
msgstr ""
@@ -55633,7 +55900,7 @@ msgstr ""
#: en/merge-strategies.txt:9
#, ignore-same, no-wrap, priority:240
msgid "resolve"
-msgstr "resolve"
+msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:15
@@ -55645,7 +55912,7 @@ msgstr ""
#: en/merge-strategies.txt:16
#, ignore-same, no-wrap, priority:240
msgid "recursive"
-msgstr "recursive"
+msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:29
@@ -55663,7 +55930,7 @@ msgstr ""
#: en/merge-strategies.txt:32 en/merge-strategies.txt:115
#, ignore-same, no-wrap, priority:240
msgid "ours"
-msgstr "ours"
+msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:37
@@ -55681,7 +55948,7 @@ msgstr ""
#: en/merge-strategies.txt:42
#, ignore-same, no-wrap, priority:240
msgid "theirs"
-msgstr "theirs"
+msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:45
@@ -55693,7 +55960,7 @@ msgstr ""
#: en/merge-strategies.txt:46
#, ignore-same, no-wrap, priority:240
msgid "patience"
-msgstr "patience"
+msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:52
@@ -55705,7 +55972,7 @@ msgstr ""
#: en/merge-strategies.txt:53
#, ignore-same, no-wrap, priority:240
msgid "diff-algorithm=[patience|minimal|histogram|myers]"
-msgstr "diff-algorithm=[patience|minimal|histogram|myers]"
+msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:58
@@ -55717,7 +55984,7 @@ msgstr ""
#: en/merge-strategies.txt:62
#, ignore-same, no-wrap, priority:240
msgid "ignore-cr-at-eol"
-msgstr "ignore-cr-at-eol"
+msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:68
@@ -55747,7 +56014,7 @@ msgstr ""
#: en/merge-strategies.txt:75
#, ignore-same, no-wrap, priority:240
msgid "renormalize"
-msgstr "renormalize"
+msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:82
@@ -55759,7 +56026,7 @@ msgstr ""
#: en/merge-strategies.txt:83
#, ignore-same, no-wrap, priority:240
msgid "no-renormalize"
-msgstr "no-renormalize"
+msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:86
@@ -55771,7 +56038,7 @@ msgstr ""
#: en/merge-strategies.txt:87
#, ignore-same, no-wrap, priority:240
msgid "no-renames"
-msgstr "no-renames"
+msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:91
@@ -55819,7 +56086,7 @@ msgstr ""
#: en/merge-strategies.txt:108
#, ignore-same, no-wrap, priority:240
msgid "octopus"
-msgstr "octopus"
+msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:114
@@ -55837,7 +56104,7 @@ msgstr ""
#: en/merge-strategies.txt:123
#, ignore-same, no-wrap, priority:240
msgid "subtree"
-msgstr "subtree"
+msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:129
@@ -55853,157 +56120,157 @@ msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:2
-#, priority:240
+#, ignore-same, priority:240
msgid "araxis"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:3
-#, priority:240
+#, ignore-same, priority:240
msgid "bc"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:4
-#, priority:240
+#, ignore-same, priority:240
msgid "bc3"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, priority:240
+#, ignore-same, priority:240
msgid "codecompare"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:6
-#, priority:240
+#, ignore-same, priority:240
msgid "deltawalker"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:7
-#, priority:240
+#, ignore-same, priority:240
msgid "diffmerge"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:8
-#, priority:240
+#, ignore-same, priority:240
msgid "diffuse"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:9
-#, priority:240
+#, ignore-same, priority:240
msgid "ecmerge"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:10
-#, priority:240
+#, ignore-same, priority:240
msgid "emerge"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:11
-#, priority:240
+#, ignore-same, priority:240
msgid "examdiff"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:12
-#, priority:240
+#, ignore-same, priority:240
msgid "guiffy"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:13
-#, priority:240
+#, ignore-same, priority:240
msgid "gvimdiff"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:14
-#, priority:240
+#, ignore-same, priority:240
msgid "gvimdiff2"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, priority:240
+#, ignore-same, priority:240
msgid "gvimdiff3"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:16
-#, priority:240
+#, ignore-same, priority:240
msgid "kdiff3"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:17
-#, priority:240
+#, ignore-same, priority:240
msgid "meld"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:18
-#, priority:240
+#, ignore-same, priority:240
msgid "opendiff"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:19
-#, priority:240
+#, ignore-same, priority:240
msgid "p4merge"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, priority:240
+#, ignore-same, priority:240
msgid "smerge"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, priority:240
+#, ignore-same, priority:240
msgid "tkdiff"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, priority:240
+#, ignore-same, priority:240
msgid "tortoisemerge"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, priority:240
+#, ignore-same, priority:240
msgid "vimdiff"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:24
-#, priority:240
+#, ignore-same, priority:240
msgid "vimdiff2"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:25
-#, priority:240
+#, ignore-same, priority:240
msgid "vimdiff3"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:26
-#, priority:240
+#, ignore-same, priority:240
msgid "winmerge"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:26
-#, priority:240
+#, ignore-same, priority:240
msgid "xxdiff"
msgstr ""
@@ -56029,7 +56296,7 @@ msgstr ""
#: en/pretty-formats.txt:22
#, ignore-same, priority:260
msgid "'oneline'"
-msgstr "'oneline'"
+msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:24
@@ -56047,7 +56314,7 @@ msgstr ""
#: en/pretty-formats.txt:28
#, ignore-same, priority:260
msgid "'short'"
-msgstr "'short'"
+msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:31
@@ -56067,7 +56334,7 @@ msgstr ""
#: en/pretty-formats.txt:35
#, ignore-same, priority:260
msgid "'medium'"
-msgstr "'medium'"
+msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:39
@@ -56088,7 +56355,7 @@ msgstr ""
#: en/pretty-formats.txt:45
#, ignore-same, priority:260
msgid "'full'"
-msgstr "'full'"
+msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:49
@@ -56103,7 +56370,7 @@ msgstr ""
#: en/pretty-formats.txt:55
#, ignore-same, priority:260
msgid "'fuller'"
-msgstr "'fuller'"
+msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:61
@@ -56120,7 +56387,7 @@ msgstr ""
#: en/pretty-formats.txt:67
#, ignore-same, priority:260
msgid "'email'"
-msgstr "'email'"
+msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:72
@@ -56136,7 +56403,7 @@ msgstr ""
#: en/pretty-formats.txt:76
#, ignore-same, priority:260
msgid "'raw'"
-msgstr "'raw'"
+msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:86
@@ -56184,7 +56451,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:106
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%n'"
msgstr ""
@@ -56220,7 +56487,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:111
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%Cred'"
msgstr ""
@@ -56232,7 +56499,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:112
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%Cgreen'"
msgstr ""
@@ -56244,7 +56511,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:113
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%Cblue'"
msgstr ""
@@ -56256,7 +56523,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:114
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%Creset'"
msgstr ""
@@ -56268,7 +56535,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:115
-#, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:260
msgid "'%C(...)'"
msgstr ""
@@ -56280,13 +56547,13 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:129
-#, priority:260
+#, ignore-ellipsis, priority:260
msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:129
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%m'"
msgstr ""
@@ -56312,7 +56579,7 @@ msgstr ""
#: en/pretty-formats.txt:132
#, ignore-same, priority:260
msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
+msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:132
@@ -56412,7 +56679,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:154
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%H'"
msgstr ""
@@ -56424,7 +56691,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:155
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%h'"
msgstr ""
@@ -56436,7 +56703,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:156
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%T'"
msgstr ""
@@ -56448,7 +56715,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:157
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%t'"
msgstr ""
@@ -56460,7 +56727,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:158
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%P'"
msgstr ""
@@ -56472,7 +56739,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:159
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%p'"
msgstr ""
@@ -56484,7 +56751,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:160
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%an'"
msgstr ""
@@ -56496,7 +56763,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:161
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%aN'"
msgstr ""
@@ -56514,7 +56781,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:163
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%ae'"
msgstr ""
@@ -56526,7 +56793,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:164
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%aE'"
msgstr ""
@@ -56538,7 +56805,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:166
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%ad'"
msgstr ""
@@ -56550,7 +56817,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:167
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%aD'"
msgstr ""
@@ -56562,7 +56829,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:168
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%ar'"
msgstr ""
@@ -56574,7 +56841,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:169
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%at'"
msgstr ""
@@ -56586,7 +56853,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:170
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%ai'"
msgstr ""
@@ -56598,7 +56865,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:171
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%aI'"
msgstr ""
@@ -56610,7 +56877,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:172
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%cn'"
msgstr ""
@@ -56622,7 +56889,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:173
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%cN'"
msgstr ""
@@ -56640,7 +56907,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:175
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%ce'"
msgstr ""
@@ -56652,7 +56919,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:176
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%cE'"
msgstr ""
@@ -56664,7 +56931,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:178
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%cd'"
msgstr ""
@@ -56676,7 +56943,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:179
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%cD'"
msgstr ""
@@ -56688,7 +56955,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:180
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%cr'"
msgstr ""
@@ -56700,7 +56967,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:181
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%ct'"
msgstr ""
@@ -56712,7 +56979,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:182
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%ci'"
msgstr ""
@@ -56724,7 +56991,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:183
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%cI'"
msgstr ""
@@ -56736,7 +57003,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:184
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%d'"
msgstr ""
@@ -56748,7 +57015,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:185
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%D'"
msgstr ""
@@ -56772,7 +57039,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:188
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%e'"
msgstr ""
@@ -56790,7 +57057,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:190
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%f'"
msgstr ""
@@ -56802,7 +57069,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:191
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%b'"
msgstr ""
@@ -56814,7 +57081,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:192
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%B'"
msgstr ""
@@ -56826,7 +57093,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:194
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%N'"
msgstr ""
@@ -56838,7 +57105,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:196
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%GG'"
msgstr ""
@@ -56868,7 +57135,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:205
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%GS'"
msgstr ""
@@ -56880,7 +57147,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:206
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%GK'"
msgstr ""
@@ -56892,7 +57159,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:207
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%GF'"
msgstr ""
@@ -56904,7 +57171,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:208
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%GP'"
msgstr ""
@@ -56922,7 +57189,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:210
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%gD'"
msgstr ""
@@ -56935,12 +57202,12 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:215
#, priority:260
-msgid "minutes ago`}; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:215
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%gd'"
msgstr ""
@@ -56958,7 +57225,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:218
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%gn'"
msgstr ""
@@ -56970,7 +57237,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:219
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%gN'"
msgstr ""
@@ -56982,7 +57249,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:221
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%ge'"
msgstr ""
@@ -56994,7 +57261,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:222
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%gE'"
msgstr ""
@@ -57006,7 +57273,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:224
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "'%gs'"
msgstr ""
@@ -57160,7 +57427,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:17
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--abbrev-commit"
msgstr ""
@@ -57178,7 +57445,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:26
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--no-abbrev-commit"
msgstr ""
@@ -57208,13 +57475,13 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:46
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--expand-tabs"
msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:47
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--no-expand-tabs"
msgstr ""
@@ -57274,7 +57541,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:89
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--[no-]standard-notes"
msgstr ""
@@ -57286,7 +57553,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:94
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--show-signature"
msgstr ""
@@ -57358,7 +57625,7 @@ msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:45
-#, priority:220
+#, ignore-ellipsis, priority:220
msgid "Whether that update is allowed without `--force` depends on the ref namespace it's being fetched to, the type of object being fetched, and whether the update is considered to be a fast-forward. Generally, the same rules apply for fetching as when pushing, see the `<refspec>...` section of linkgit:git-push[1] for what those are. Exceptions to those rules particular to 'git fetch' are noted below."
msgstr ""
@@ -57829,13 +58096,13 @@ msgstr ""
#. type: Labeled list
#: en/revisions.txt:280
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "The '...' (three-dot) Symmetric Difference Notation"
msgstr ""
#. type: Plain text
#: en/revisions.txt:286
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "A similar notation 'r1\\...r2' is called symmetric difference of 'r1' and 'r2' and is defined as 'r1 r2 --not $(git merge-base --all r1 r2)'. It is the set of commits that are reachable from either one of 'r1' (left side) or 'r2' (right side) but not from both."
msgstr ""
@@ -57925,7 +58192,7 @@ msgstr ""
#. type: Labeled list
#: en/revisions.txt:331
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'<rev1>\\...<rev2>'"
msgstr ""
@@ -57979,7 +58246,7 @@ msgstr ""
#. type: delimited block .
#: en/revisions.txt:377
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" Args Expanded arguments Selected commits\n"
" D G H D\n"
@@ -58175,7 +58442,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:69
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--invert-grep"
msgstr ""
@@ -58187,7 +58454,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:74
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--regexp-ignore-case"
msgstr ""
@@ -58223,7 +58490,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:101
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--remove-empty"
msgstr ""
@@ -58235,7 +58502,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:104
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--merges"
msgstr ""
@@ -58247,7 +58514,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:107
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--no-merges"
msgstr ""
@@ -58271,13 +58538,13 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:113
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--no-min-parents"
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:114
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--no-max-parents"
msgstr ""
@@ -58361,7 +58628,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:181
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--reflog"
msgstr ""
@@ -58373,7 +58640,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:185
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--alternate-refs"
msgstr ""
@@ -58397,7 +58664,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:206 en/rev-list-options.txt:586
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--bisect"
msgstr ""
@@ -58421,7 +58688,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:228
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--cherry-mark"
msgstr ""
@@ -58433,7 +58700,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:232
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--cherry-pick"
msgstr ""
@@ -58451,13 +58718,13 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:245
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--left-only"
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:246
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--right-only"
msgstr ""
@@ -58469,31 +58736,31 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:256
-#, priority:260
+#, ignore-ellipsis, priority:260
msgid "For example, `--cherry-pick --right-only A...B` omits those commits from `B` which are in `A` or are patch-equivalent to a commit in `A`. In other words, this lists the `+` commits from `git cherry A B`. More precisely, `--cherry-pick --right-only --no-merges` gives the exact list."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:257
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--cherry"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:263
-#, priority:260
+#, ignore-ellipsis, priority:260
msgid "A synonym for `--right-only --cherry-mark --no-merges`; useful to limit the output to the commits on our side and mark those that have been applied to the other side of a forked history with `git log --cherry upstream...mybranch`, similar to `git cherry upstream mybranch`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:265
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--walk-reflogs"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:271
-#, priority:260
+#, ignore-ellipsis, priority:260
msgid "Instead of walking the commit ancestry chain, walk reflog entries from the most recent one to older ones. When this option is used you cannot specify commits to exclude (that is, '{caret}commit', 'commit1..commit2', and 'commit1\\...commit2' notations cannot be used)."
msgstr ""
@@ -58541,7 +58808,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:301
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--boundary"
msgstr ""
@@ -58553,7 +58820,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:306
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--use-bitmap-index"
msgstr ""
@@ -58607,7 +58874,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:330
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--simplify-by-decoration"
msgstr ""
@@ -58643,7 +58910,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:343
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--full-history"
msgstr ""
@@ -58655,7 +58922,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:346 en/rev-list-options.txt:479
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--dense"
msgstr ""
@@ -58673,7 +58940,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:353 en/rev-list-options.txt:490
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--simplify-merges"
msgstr ""
@@ -58685,7 +58952,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:358 en/rev-list-options.txt:537
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--ancestry-path"
msgstr ""
@@ -59069,7 +59336,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:610
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--bisect-vars"
msgstr ""
@@ -59081,7 +59348,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:622
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--bisect-all"
msgstr ""
@@ -59123,7 +59390,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:648
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--author-date-order"
msgstr ""
@@ -59186,7 +59453,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:687
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--objects"
msgstr ""
@@ -59198,7 +59465,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:693
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--in-commit-order"
msgstr ""
@@ -59210,7 +59477,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:698
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--objects-edge"
msgstr ""
@@ -59222,7 +59489,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:705
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--objects-edge-aggressive"
msgstr ""
@@ -59234,7 +59501,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:710
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--indexed-objects"
msgstr ""
@@ -59252,7 +59519,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:719
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--object-names"
msgstr ""
@@ -59264,7 +59531,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:723
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
msgid "--no-object-names"
msgstr ""
@@ -59313,263 +59580,281 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:762
#, priority:260
+msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:771
+#, ignore-ellipsis, priority:260
+msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:775
+#, priority:260
+msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:778
+#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:763
-#, no-wrap, priority:260
+#: en/rev-list-options.txt:779
+#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:766
+#: en/rev-list-options.txt:782
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:773
+#: en/rev-list-options.txt:789
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:781
+#: en/rev-list-options.txt:797
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:800
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:791
+#: en/rev-list-options.txt:807
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:793
+#: en/rev-list-options.txt:809
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:801
+#: en/rev-list-options.txt:817
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:802
-#, no-wrap, priority:260
+#: en/rev-list-options.txt:818
+#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:804
+#: en/rev-list-options.txt:820
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:822
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:812
+#: en/rev-list-options.txt:828
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:816
-#, no-wrap, priority:260
+#: en/rev-list-options.txt:832
+#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:818
+#: en/rev-list-options.txt:834
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:819
+#: en/rev-list-options.txt:835
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:826
+#: en/rev-list-options.txt:842
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:847
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:833
+#: en/rev-list-options.txt:849
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:852
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:838
+#: en/rev-list-options.txt:854
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:839
+#: en/rev-list-options.txt:855
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:840
+#: en/rev-list-options.txt:856
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:859
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:846
+#: en/rev-list-options.txt:862
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:864
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:873
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:864
+#: en/rev-list-options.txt:880
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:868
+#: en/rev-list-options.txt:884
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:875
-#, priority:260
+#: en/rev-list-options.txt:891
+#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:894
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:880
+#: en/rev-list-options.txt:896
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:882
+#: en/rev-list-options.txt:898
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:884
-#, no-wrap, priority:260
+#: en/rev-list-options.txt:900
+#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:887
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:892
-#, priority:260
+#: en/rev-list-options.txt:908
+#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:893
-#, no-wrap, priority:260
+#: en/rev-list-options.txt:909
+#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:896
-#, priority:260
+#: en/rev-list-options.txt:912
+#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:898
-#, no-wrap, priority:260
+#: en/rev-list-options.txt:914
+#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:902
-#, no-wrap, priority:260
+#: en/rev-list-options.txt:918
+#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:907
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:925
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:932
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -59580,20 +59865,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:919
+#: en/rev-list-options.txt:935
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:922
-#, no-wrap, priority:260
+#: en/rev-list-options.txt:938
+#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:929
-#, no-wrap, priority:260
+#: en/rev-list-options.txt:945
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
"\t>bbbbbbb... 2nd on b\n"
@@ -59604,85 +59889,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:931
-#, no-wrap, priority:260
+#: en/rev-list-options.txt:947
+#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:937
+#: en/rev-list-options.txt:953
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:939
+#: en/rev-list-options.txt:955
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:942
+#: en/rev-list-options.txt:958
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:943
+#: en/rev-list-options.txt:959
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:949
+#: en/rev-list-options.txt:965
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:959
+#: en/rev-list-options.txt:975
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:963
+#: en/rev-list-options.txt:979
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:984
#, priority:260
msgid "Listed below are options that control the formatting of diff output. Some of them are specific to linkgit:git-rev-list[1], however other diff options may be given. See linkgit:git-diff-files[1] for more options."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:991
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:981
+#: en/rev-list-options.txt:997
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:1012
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1015
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1018
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po
index 967e9292247b507c9f9f59475dbca7433ce64bc1..19ffd132fe23c2edd63b709220374151bdcdffd2 100644
--- a/po/documentation.pt_BR.po
+++ b/po/documentation.pt_BR.po
@@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
-"POT-Creation-Date: 2019-08-26 23:13+0200\n"
+"POT-Creation-Date: 2019-12-08 16:35+0100\n"
"PO-Revision-Date: 2019-08-09 22:48+0200\n"
"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
"Language-Team: none\n"
@@ -28,7 +28,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr "Mostrar SHA-1 em branco para confirma챌천es de commits. Isso tamb챕m pode ser controlado atrav챕s da op챌찾o de configura챌찾o 'blame.blankboundary'."
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:319 en/git-fsck.txt:38 en/git-rebase.txt:471
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:321 en/git-fsck.txt:38 en/git-rebase.txt:493
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -88,7 +88,7 @@ msgid "Show long rev (Default: off)."
msgstr "Mostra o rev longo (Padr찾o: desligado)."
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1000
+#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1016
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -124,7 +124,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr "Caminhe para a frente em vez de para tr찼s. Em vez de mostrar a revis찾o em que uma linha apareceu, isso mostra a 첬ltima revis찾o em que uma linha existiu. Isso requer um intervalo de revis찾o como START..END, onde o path respons찼vel existe em START. --'git blame --reverse START' is taken as 'git blame --reverse START..HEAD' por conveni챗ncia."
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:433 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -468,7 +468,7 @@ msgid "Get and set repository or global options."
msgstr "Obt챕m e seta reposit처rios ou op챌천es globais."
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1505
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1528
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-export[1]"
msgstr "linkgit:git-fast-export[1]"
@@ -480,7 +480,7 @@ msgid "Git data exporter."
msgstr "tipo: Texto plano."
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:243
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-import[1]"
msgstr "linkgit:git-fast-import[1]"
@@ -2266,119 +2266,161 @@ msgstr "Note que \"../\" n찾o 챕 especial e n찾o ir찼 casar literalmente, o que
msgid "Example"
msgstr "Exemplo"
-#. type: Plain text
-#: en/config.txt:185
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/config.txt:186
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "\t# Core variables\n"
+#| "\t[core]\n"
+#| "\t\t; Don't trust file modes\n"
+#| "\t\tfilemode = false\n"
msgid ""
-"\t# Core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"# Core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
"\t# Principais vari찼veis\n"
"\t[core]\n"
"\t\t; N찾o confie nos modos de arquivo\n"
"\t\tfilemode = false\n"
-#. type: Plain text
-#: en/config.txt:190
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/config.txt:191
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "\t# Our diff algorithm\n"
+#| "\t[diff]\n"
+#| "\t\texternal = /usr/local/bin/diff-wrapper\n"
+#| "\t\trenames = true\n"
msgid ""
-"\t# Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"# Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
"\t# Nosso algoritmo de diff\n"
"\t[diff]\n"
"\t\texternal = /usr/local/bin/diff-wrapper\n"
"\t\trenames = true\n"
-#. type: Plain text
-#: en/config.txt:194
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/config.txt:195
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "\t[branch \"devel\"]\n"
+#| "\t\tremote = origin\n"
+#| "\t\tmerge = refs/heads/devel\n"
msgid ""
-"\t[branch \"devel\"]\n"
-"\t\tremote = origin\n"
-"\t\tmerge = refs/heads/devel\n"
+"[branch \"devel\"]\n"
+"\tremote = origin\n"
+"\tmerge = refs/heads/devel\n"
msgstr ""
"\t[branch \"devel\"]\n"
"\t\tremoto = origem\n"
"\t\tmerge = refs/heads/devel\n"
-#. type: Plain text
-#: en/config.txt:199
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/config.txt:200
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "\t# Proxy settings\n"
+#| "\t[core]\n"
+#| "\t\tgitProxy=\"ssh\" for \"kernel.org\"\n"
+#| "\t\tgitProxy=default-proxy ; for the rest\n"
msgid ""
-"\t# Proxy settings\n"
-"\t[core]\n"
-"\t\tgitProxy=\"ssh\" for \"kernel.org\"\n"
-"\t\tgitProxy=default-proxy ; for the rest\n"
+"# Proxy settings\n"
+"[core]\n"
+"\tgitProxy=\"ssh\" for \"kernel.org\"\n"
+"\tgitProxy=default-proxy ; for the rest\n"
msgstr ""
"\t# Configura챌천es de proxy\n"
"\t[core]\n"
"\t\tgitProxy=\"ssh\" para \"kernel.org\"\n"
"\t\tgitProxy=default-proxy; para o resto\n"
-#. type: Plain text
-#: en/config.txt:204
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/config.txt:205
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "\t[include]\n"
+#| "\t\tpath = /path/to/foo.inc ; include by absolute path\n"
+#| "\t\tpath = foo.inc ; find \"foo.inc\" relative to the current file\n"
+#| "\t\tpath = ~/foo.inc ; find \"foo.inc\" in your `$HOME` directory\n"
msgid ""
-"\t[include]\n"
-"\t\tpath = /path/to/foo.inc ; include by absolute path\n"
-"\t\tpath = foo.inc ; find \"foo.inc\" relative to the current file\n"
-"\t\tpath = ~/foo.inc ; find \"foo.inc\" in your `$HOME` directory\n"
+"[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 ""
"\t[include]\n"
"\t\tpath = /path/to/foo.inc; incluir absolutamente pelo path\n"
"\t\tpath = foo.inc; encontrar \"foo.inc\" em rela챌찾o ao arquivo atual\n"
"\t\tpath = ~/foo.inc; encontre \"foo.inc\" no diret처rio `$HOME`\n"
-#. type: Plain text
-#: en/config.txt:208
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/config.txt:209
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "\t; include if $GIT_DIR is /path/to/foo/.git\n"
+#| "\t[includeIf \"gitdir:/path/to/foo/.git\"]\n"
+#| "\t\tpath = /path/to/foo.inc\n"
msgid ""
-"\t; include if $GIT_DIR is /path/to/foo/.git\n"
-"\t[includeIf \"gitdir:/path/to/foo/.git\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include if $GIT_DIR is /path/to/foo/.git\n"
+"[includeIf \"gitdir:/path/to/foo/.git\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
"\t;inclua se $GIT_DIR for /path/to/foo/.git\n"
"\t[includeIf \"gitdir:/path/to/foo/.git\"]\n"
"\t\tpath = /path/to/foo.inc\n"
-#. type: Plain text
-#: en/config.txt:212
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/config.txt:213
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "\t; include for all repositories inside /path/to/group\n"
+#| "\t[includeIf \"gitdir:/path/to/group/\"]\n"
+#| "\t\tpath = /path/to/foo.inc\n"
msgid ""
-"\t; include for all repositories inside /path/to/group\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside /path/to/group\n"
+"[includeIf \"gitdir:/path/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
"\t;incluir para todos os reposit처rios dentro de /path/to/group\n"
"\t\t[includeIf \"gitdir:/path/to/group/\"]\n"
"\t\t\tpath = /path/to/foo.inc\n"
-#. type: Plain text
-#: en/config.txt:216
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/config.txt:217
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "\t; include for all repositories inside $HOME/to/group\n"
+#| "\t[includeIf \"gitdir:~/to/group/\"]\n"
+#| "\t\tpath = /path/to/foo.inc\n"
msgid ""
-"\t; include for all repositories inside $HOME/to/group\n"
-"\t[includeIf \"gitdir:~/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside $HOME/to/group\n"
+"[includeIf \"gitdir:~/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
"\t; incluir para todos os reposit처rios dentro de $HOME/to/group\n"
"\t[includeIf \"gitdir:~/to/group/\"]\n"
"\t\tpath = /path/to/foo.inc\n"
-#. type: Plain text
-#: en/config.txt:222
-#, no-wrap, priority:100
-msgid ""
-"\t; relative paths are always relative to the including\n"
-"\t; file (if the condition is true); their location is not\n"
-"\t; affected by the condition\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = foo.inc\n"
+#. type: delimited block -
+#: en/config.txt:223
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "\t; relative paths are always relative to the including\n"
+#| "\t; file (if the condition is true); their location is not\n"
+#| "\t; affected by the condition\n"
+#| "\t[includeIf \"gitdir:/path/to/group/\"]\n"
+#| "\t\tpath = foo.inc\n"
+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 ""
"\t; paths relativos s찾o sempre relativos 횪 inclus찾o\n"
"\t; arquivo (se a condi챌찾o inicial for verdadeira); sua localiza챌찾o n찾o 챕\n"
@@ -2387,7 +2429,7 @@ msgstr ""
"\t\tpath = foo.inc\n"
#. type: Plain text
-#: en/config.txt:227
+#: en/config.txt:229
#, no-wrap, priority:100
msgid ""
"\t; include only if we are in a worktree where foo-branch is\n"
@@ -2397,43 +2439,43 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/config.txt:229
+#: en/config.txt:231
#, no-wrap, priority:100
msgid "Values"
msgstr "Valores"
#. type: Plain text
-#: en/config.txt:234
+#: 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 "Valores de v찼rias vari찼veis s찾o tratados como string simples, mas sempre existem vari찼veis que pegam valores de tipos espec챠ficos e existem regras de como os soletrar."
#. type: Labeled list
-#: en/config.txt:235
+#: en/config.txt:237
#, no-wrap, priority:100
msgid "boolean"
msgstr "booleano"
#. type: Plain text
-#: en/config.txt:240
+#: 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 "Quando uma vari찼vel pega um valor booleano, muitos sin척nimos s찾o aceitos para 'true' e 'false', esses s찾o todos insens챠veis a mudan챌a de caixa."
#. type: Labeled list
-#: en/config.txt:241
+#: en/config.txt:243
#, no-wrap, priority:100
msgid "true"
msgstr "verdadeiro"
#. type: Plain text
-#: en/config.txt:242
+#: en/config.txt:244
#, priority:100
msgid "Boolean true literals are `yes`, `on`, `true`,"
msgstr "Literais booleanos verdades s찾o `yes`,`on`,`true`,"
#. type: Plain text
-#: en/config.txt:244
+#: en/config.txt:246
#, no-wrap, priority:100
msgid ""
"and `1`. Also, a variable defined without `= <value>`\n"
@@ -2443,109 +2485,109 @@ msgstr ""
"챕 tomada como verdadeira.\n"
#. type: Labeled list
-#: en/config.txt:245
+#: en/config.txt:247
#, no-wrap, priority:100
msgid "false"
msgstr "falso"
#. type: Plain text
-#: en/config.txt:246
+#: en/config.txt:248
#, priority:100
msgid "Boolean false literals are `no`, `off`, `false`,"
msgstr "Falsos literais booleanos s찾o `no`, `off`, `false`,"
#. type: Plain text
-#: en/config.txt:247
+#: en/config.txt:249
#, no-wrap, priority:100
msgid "`0` and the empty string.\n"
msgstr "`0` e a string vazia.\n"
#. type: Plain text
-#: en/config.txt:251
+#: 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 "Quando converter um valor a sua forma can척nica usando o tipo de especifica챌찾o `--type=bool`, 'git config' se assegurar찼 que a sa챠da 챕 'true' ou \"false\" (em caixa baixa)."
#. type: Labeled list
-#: en/config.txt:252
+#: en/config.txt:254
#, no-wrap, priority:100
msgid "integer"
msgstr "inteiro"
#. type: Plain text
-#: en/config.txt:256
+#: 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 "O valor de muitas vari찼veis que especificam v찼rios tamanhos podem ter como sufixo `k`,`M`, para dizer \"escale o n첬mero por 1024\", \"por 1024x1024\", etc."
#. type: Labeled list
-#: en/config.txt:257 en/diff-options.txt:356 en/git-for-each-ref.txt:177
+#: 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:261
+#: 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 "O valor de uma vari찼vel que pega uma cor de uma lista de cores (ao menos duas, uma para o foreground e outra para o background) e atributos (quantos voc챗 quiser), separados por espa챌os."
#. type: Plain text
-#: en/config.txt:265
+#: en/config.txt:267
#, 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."
msgstr "As cores b찼sicas aceitas s찾o `black` (preto) , `red` (vermelho) , `green` (verde), `yellow` (amarelo) , `blue` (azul), `magenta` (magenta), `cyan` (ciano) and `white` (branco) para o primeiro plano; o segundo 챕 o segundo plano."
#. type: Plain text
-#: en/config.txt:270
+#: en/config.txt:272
#, 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 "As cores tamb챕m podem ser dadas como n첬meros entre 0 e 255; estes usam o modo ANSI de 256 cores (mas note que nem todos os terminais suportam isso). Se o seu terminal suportar, voc챗 tamb챕m pode especificar valores RGB de 24 bits como hexadecimais, como `#ff0ab3`."
#. type: Plain text
-#: en/config.txt:277
+#: en/config.txt:279
#, 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 "Os atributos aceitos s찾o `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, e `strike` (para letras cruzadas ou \"rasuradas\"). A posi챌찾o de qualquer atributo em rela챌찾o 횪s cores (antes, depois ou entre) n찾o importa. Atributos espec챠ficos podem ser desativados prefixando-os com `no` ou `no-` (por exemplo, `noreverse`, `no-ul`, etc)."
#. type: Plain text
-#: en/config.txt:280
+#: en/config.txt:282
#, 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 "Uma sequ챗ncia de cores vazia n찾o produz nenhum efeito de cor. Isso pode ser usado para evitar colorir elementos espec챠ficos sem desabilitar totalmente a cor."
#. type: Plain text
-#: en/config.txt:289
+#: en/config.txt:291
#, 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 "Para os slots de cores predefinidos do git, os atributos devem ser redefinidos no in챠cio de cada item na sa챠da colorida. Portanto, definir `color.decorate.branch` como `black` ir찼 pintar esse nome de branch em `black`, mesmo que a anterior esteja na mesma linha de sa챠da (por exemplo, abrindo par챗nteses antes da linha de nomes de ramifica챌천es em `log --decorate`) 챕 definido para ser pintado com `bold` ou algum outro atributo. No entanto, formatos de log personalizados podem fazer cores mais complicadas e em camadas, e os formul찼rios negados podem ser 첬teis l찼."
#. type: Labeled list
-#: en/config.txt:290
+#: en/config.txt:292
#, no-wrap, priority:100
msgid "pathname"
msgstr "caminho do diret처rio"
#. type: Plain text
-#: en/config.txt:296
+#: en/config.txt:298
#, 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 "Uma vari찼vel que recebe um valor de nome de caminho pode receber uma string que come챌a com \"`~/`\" ou \"`~user/`\", e a expans찾o usual do til acontece com essa string: `~/` 챕 expandida para o valor de `$HOME`, e `~user/` para o diret처rio inicial do usu찼rio especificado."
#. type: Title ~
-#: en/config.txt:299 en/git-imap-send.txt:58
+#: en/config.txt:301 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr "Vari찼veis"
#. type: Plain text
-#: en/config.txt:304
+#: en/config.txt:306
#, 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 "Note que esta lista n찾o 챕 abrangente e n찾o necessariamente completa. Para vari찼veis espec챠ficas de comando, voc챗 encontrar찼 uma descri챌찾o mais detalhada na p찼gina de manual apropriada."
#. type: Plain text
-#: en/config.txt:309
+#: en/config.txt:311
#, 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 "Outras ferramentas relacionadas ao git podem e usam suas pr처prias vari찼veis. Ao inventar novas vari찼veis para uso em sua pr처pria ferramenta, certifique-se de que seus nomes n찾o conflitem com aqueles que s찾o usados pelo pr처prio Git e outras ferramentas populares, e descrev챗-los em sua documenta챌찾o."
@@ -3293,54 +3335,56 @@ msgstr "O extra `NUL` antes do caminho de pr챕-imagem no caso renomeado 챕 permi
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, no-wrap, priority:260
-msgid "Generating patches with -p"
+#, fuzzy, no-wrap, priority:260
+#| msgid "Generating patches with -p"
+msgid "Generating patch text with -p"
msgstr "Gerando patches com -p"
#. type: Plain text
-#: en/diff-generate-patch.txt:10
-#, priority:260
-msgid "When \"git-diff-index\", \"git-diff-tree\", or \"git-diff-files\" are run with a `-p` option, \"git diff\" without the `--raw` option, or \"git log\" with the \"-p\" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
+#: en/diff-generate-patch.txt:14
+#, fuzzy, priority:260
+#| msgid "When \"git-diff-index\", \"git-diff-tree\", or \"git-diff-files\" are run with a `-p` option, \"git diff\" without the `--raw` option, or \"git log\" with the \"-p\" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
+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 "Quando \"git-diff-index\", \"git-diff-tree\", ou \"git-diff-files\" s찾o executados com a op챌찾o -p, git diff sem a op챌찾o `--raw`, ou git log \"com a op챌찾o\" -p, eles n찾o produzem a sa챠da descrita acima; em vez disso, eles produzem um arquivo de corre챌찾o. Voc챗 pode personalizar a cria챌찾o de tais corre챌천es atrav챕s das vari찼veis de ambiente `GIT_EXTERNAL_DIFF` e `GIT_DIFF_OPTS`."
#. type: Plain text
-#: en/diff-generate-patch.txt:13
+#: en/diff-generate-patch.txt:17
#, priority:260
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr "O que a op챌찾o -p produz 챕 um pouco diferente do formato tradicional diff:"
#. type: Plain text
-#: en/diff-generate-patch.txt:15
+#: en/diff-generate-patch.txt:19
#, priority:260
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr "Ele 챕 percebido por um cabe챌alho \"git diff\" que se parece com isso:"
#. type: Plain text
-#: en/diff-generate-patch.txt:17
+#: en/diff-generate-patch.txt:21
#, no-wrap, priority:260
msgid "diff --git a/file1 b/file2\n"
msgstr "diff --git a/arquivo1 b/arquivo2\n"
#. type: Plain text
-#: en/diff-generate-patch.txt:21
+#: 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 "Os nomes de arquivos `a/` e `b/` s찾o os mesmos, a menos que haja renomea챌찾o/ c처pia. Especialmente, mesmo para uma cria챌찾o ou uma exclus찾o, `/dev/null` 챕 _n찾o_usado no lugar dos nomes de arquivos `a/` ou `b/`."
#. type: Plain text
-#: en/diff-generate-patch.txt:25
+#: 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 "Quando renomear/ copiar est찼 envolvido, `file1` e `file2` mostram o nome do arquivo de origem da renomea챌찾o/ c처pia e o nome do arquivo que renomeia/ copia, produz, respectivamente."
#. type: Plain text
-#: en/diff-generate-patch.txt:27
+#: en/diff-generate-patch.txt:31
#, priority:260
msgid "It is followed by one or more extended header lines:"
msgstr "Ele 챕 seguido por uma ou mais linhas de cabe챌alho estendidas:"
#. type: Plain text
-#: en/diff-generate-patch.txt:39
+#: en/diff-generate-patch.txt:43
#, no-wrap, priority:260
msgid ""
"old mode <mode>\n"
@@ -3368,43 +3412,44 @@ msgstr ""
"챠ndice <hash>..<hash> <mode>\n"
#. type: Plain text
-#: en/diff-generate-patch.txt:42
+#: 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 "Os modos de arquivo s찾o impressos como n첬meros octal de 6 d챠gitos, incluindo o tipo de arquivo e os bits de permiss찾o de arquivo."
#. type: Plain text
-#: en/diff-generate-patch.txt:44
+#: en/diff-generate-patch.txt:48
#, priority:260
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr "Os nomes de path nos cabe챌alhos estendidos n찾o incluem os prefixos `a/` e `b/`."
#. type: Plain text
-#: en/diff-generate-patch.txt:51
+#: 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 "O 챠ndice de similaridade 챕 a porcentagem de linhas inalteradas e o 챠ndice de dissimilaridade 챕 a porcentagem de linhas alteradas. 횋 um inteiro arredondado, seguido por um sinal de porcentagem. O valor de 챠ndice de similaridade de 100% 챕, portanto, reservado para dois arquivos iguais, enquanto 100% de dissemelhan챌a significa que nenhuma linha do arquivo antigo foi convertida no novo."
#. type: Plain text
-#: en/diff-generate-patch.txt:55
-#, priority:260
-msgid "The index line includes the SHA-1 checksum 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."
+#: en/diff-generate-patch.txt:59
+#, fuzzy, priority:260
+#| msgid "The index line includes the SHA-1 checksum 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."
+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 "A linha de 챠ndice inclui a soma de verifica챌찾o SHA-1 antes e depois da altera챌찾o. O <mode> 챕 inclu챠do se o modo de arquivo n찾o mudar; caso contr찼rio, linhas separadas indicam o modo antigo e o novo."
#. type: Plain text
-#: en/diff-generate-patch.txt:59
+#: 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 "Pathnames com caracteres \"incomuns\" s찾o citados como explicado para a vari찼vel de configura챌찾o `core.quotePath` (veja linkgit:git-config[1])."
#. type: Plain text
-#: en/diff-generate-patch.txt:64
+#: 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 "Todos os arquivos `file1` na sa챠da referem-se a arquivos antes do commit, e todos os arquivos `file2` se referem a arquivos ap처s o commit. 횋 incorreto aplicar cada altera챌찾o a cada arquivo sequencialmente. Por exemplo, este patch ir찼 trocar a e b:"
#. type: Plain text
-#: en/diff-generate-patch.txt:71
+#: en/diff-generate-patch.txt:75
#, no-wrap, priority:260
msgid ""
"diff --git a/a b/b\n"
@@ -3422,25 +3467,27 @@ msgstr ""
"renomear para a\n"
#. type: Title -
-#: en/diff-generate-patch.txt:74
-#, no-wrap, priority:260
-msgid "combined diff format"
+#: en/diff-generate-patch.txt:78
+#, fuzzy, no-wrap, priority:260
+#| msgid "combined diff format"
+msgid "Combined diff format"
msgstr "formato diff combinado"
#. type: Plain text
-#: en/diff-generate-patch.txt:82
+#: 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 "Qualquer comando gerador de diff pode pegar a op챌찾o `-c` ou `--cc` para produzir um 'diff combinado' ao mostrar uma mesclagem. Este 챕 o formato padr찾o ao mostrar mesclagens com linkgit:git-diff[1] ou linkgit:git-show[1]. Note tamb챕m que voc챗 ode dar a op챌찾o `-m` a qualquer um desses comandos para for챌ar a gera챌찾o de diffs com pais individuais de uma mesclagem."
#. type: Plain text
-#: en/diff-generate-patch.txt:84
-#, priority:260
-msgid "A 'combined diff' format looks like this:"
+#: en/diff-generate-patch.txt:88
+#, fuzzy, priority:260
+#| msgid "A 'combined diff' format looks like this:"
+msgid "A \"combined diff\" format looks like this:"
msgstr "Um formato 'diff combinado' 챕 assim:"
#. type: delimited block -
-#: en/diff-generate-patch.txt:93
+#: en/diff-generate-patch.txt:97
#, no-wrap, priority:260
msgid ""
"diff --combined describe.c\n"
@@ -3460,7 +3507,7 @@ msgstr ""
" }\n"
#. type: delimited block -
-#: en/diff-generate-patch.txt:103
+#: en/diff-generate-patch.txt:107
#, no-wrap, priority:260
msgid ""
"- static void describe(char *arg)\n"
@@ -3484,7 +3531,7 @@ msgstr ""
"struct commit_name * n;\n"
#. type: delimited block -
-#: en/diff-generate-patch.txt:113
+#: en/diff-generate-patch.txt:117
#, no-wrap, priority:260
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
@@ -3508,37 +3555,39 @@ msgstr ""
"\t\tfor_each_ref(get_name);\n"
#. type: Plain text
-#: en/diff-generate-patch.txt:117
-#, priority:260
-msgid "It is preceded with a \"git diff\" header, that looks like this (when `-c` option is used):"
+#: en/diff-generate-patch.txt:121
+#, fuzzy, priority:260
+#| msgid "It is preceded with a \"git diff\" header, that looks like this (when `-c` option is used):"
+msgid "It is preceded with a \"git diff\" header, that looks like this (when the `-c` option is used):"
msgstr "Ele 챕 percebido por um cabe챌alho \"git diff\", que se parece com isso (quando a op챌찾o `-c` 챕 usada):"
#. type: Plain text
-#: en/diff-generate-patch.txt:119
+#: en/diff-generate-patch.txt:123
#, no-wrap, priority:260
msgid "diff --combined file\n"
msgstr "diff --arquivo combinado\n"
#. type: Plain text
-#: en/diff-generate-patch.txt:121
-#, priority:260
-msgid "or like this (when `--cc` option is used):"
+#: en/diff-generate-patch.txt:125
+#, fuzzy, priority:260
+#| msgid "or like this (when `--cc` option is used):"
+msgid "or like this (when the `--cc` option is used):"
msgstr "ou assim (quando a op챌찾o `--cc` 챕 usada):"
#. type: Plain text
-#: en/diff-generate-patch.txt:123
+#: en/diff-generate-patch.txt:127
#, no-wrap, priority:260
msgid " diff --cc file\n"
msgstr " .......arquivo diff --cc\n"
#. type: Plain text
-#: en/diff-generate-patch.txt:126
+#: 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 "Ele 챕 seguido por uma ou mais linhas de cabe챌alho estendidas (este exemplo mostra uma mesclagem com dois pais):"
#. type: Plain text
-#: en/diff-generate-patch.txt:131
+#: en/diff-generate-patch.txt:135
#, no-wrap, priority:260
msgid ""
"index <hash>,<hash>..<hash>\n"
@@ -3552,91 +3601,92 @@ msgstr ""
"modo de arquivo exclu챠do <mode>,<mode>\n"
#. type: Plain text
-#: en/diff-generate-patch.txt:137
+#: 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 "A linha `mode <mode>,<mode>..<mode>` aparece somente se pelo menos um dos <mode> for diferente do resto. Cabe챌alhos estendidos com informa챌천es sobre o movimento de conte첬do detectado (renomea챌찾o e detec챌찾o de c처pia) s찾o projetados para trabalhar com diff de dois <tree-ish> e n찾o s찾o usados pelo formato diff combinado."
#. type: Plain text
-#: en/diff-generate-patch.txt:139
+#: en/diff-generate-patch.txt:143
#, priority:260
msgid "It is followed by two-line from-file/to-file header"
msgstr "횋 seguido por duas-linhas-do-arquivo/ cabe챌alho-de arquivo"
#. type: Plain text
-#: en/diff-generate-patch.txt:141 en/diff-generate-patch.txt:152 en/diff-generate-patch.txt:153 en/diff-generate-patch.txt:154
+#: 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 "a/ arquivo"
#. type: Plain text
-#: en/diff-generate-patch.txt:142 en/diff-generate-patch.txt:155
+#: en/diff-generate-patch.txt:146 en/diff-generate-patch.txt:159
#, priority:260
msgid "b/file"
msgstr "b/ arquivo"
#. type: Plain text
-#: en/diff-generate-patch.txt:146
+#: 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 "Semelhante ao cabe챌alho de duas linhas para o formato diff 'unificado' tradicional, o `/dev/null` 챕 usado para sinalizar arquivos criados ou exclu챠dos."
#. type: Plain text
-#: en/diff-generate-patch.txt:150
+#: 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:159
+#: 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:165
-#, 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 for apply. The change is similar to the change in the extended 'index' header:"
+#: en/diff-generate-patch.txt:169
+#, fuzzy, 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 for apply. The change is similar to the change in the extended 'index' header:"
+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 "O formato do cabe챌alho do peda챌o 챕 modificado para evitar que as pessoas o carreguem acidentalmente para `patch -p1`. O formato diff combinado foi criado para revisar as altera챌천es de consolida챌찾o de mesclagem, e n찾o foi feito para ser aplicado. A mudan챌a 챕 semelhante 횪 altera챌찾o no cabe챌alho 'index' estendido:"
#. type: Plain text
-#: en/diff-generate-patch.txt:167
+#: en/diff-generate-patch.txt:171
#, no-wrap, priority:260
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
#. type: Plain text
-#: en/diff-generate-patch.txt:170
+#: 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 "Existem (n첬meros de pais + 1 caracteres `@` no cabe챌alho do bloco para o formato de compara챌찾o combinado diff."
#. type: Plain text
-#: en/diff-generate-patch.txt:179
+#: 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 "Ao contr찼rio do formato diff tradicional 'unificado', que mostra dois arquivos A e B com uma 첬nica coluna que tem `-` (menos -- aparece em A, mas removido em B), `+` (mais -- faltando em A, mas adicionado para B), ou `\" \"` (espa챌o -- inalterado) prefixo, este formato compara dois ou mais arquivos file1, file2, ... com um arquivo X, e mostra como X difere de cada fileN. Uma coluna para cara arquivo fileN 챕 anexada 횪 linha de sa챠da para observar como a linha do X 챕 diferente dela."
#. type: Plain text
-#: en/diff-generate-patch.txt:185
+#: 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 "Um caractere `-` na coluna N significa que a linha aparece no arquivo N, mas n찾o aparece no resultado. Um caractere `+` na coluna N significa que a linha aparece no resultado, e fileN n찾o possui aquela linha (em outras palavras, a linha foi adicionada, do ponto de vista daquele main)."
#. type: Plain text
-#: en/diff-generate-patch.txt:191
+#: 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 "Na sa챠da do exemplo acima, a assinatura da fun챌찾o foi alterada de ambos os arquivos (portanto, duas remo챌천es `-` do file1 e do file2, mais `++` para significar que uma linha adicionada n찾o aparece no file1 nem no file2). Tamb챕m oito outras linhas s찾o as mesmas do file1, mas n찾o aparecem no file2 (portanto, prefixado com `+`)."
#. type: Plain text
-#: en/diff-generate-patch.txt:197
+#: 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 "Quando mostrado pelo `git diff-tree -c`, ele compara os pais de uma consolida챌찾o de mesclagem com o resultado da mesclagem (ou seja, file1..fileN s찾o os pais). Quando mostrado pelo `git diff-files -c`, compara os dois pais de mesclagem n찾o resolvidos com o arquivo da 찼rvore de trabalho (ou seja, file1 챕 o est찼gio 2, tamb챕m conhecido como\" nossa vers찾o \", file2 챕 o est찼gio 3\" aka sua vers찾o \")."
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:327 en/merge-options.txt:86
+#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3648,7 +3698,7 @@ msgid "Generate plain patches without any diffstats."
msgstr "Gere corre챌천es simples sem qualquer diffstats."
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:186 en/git-add.txt:111 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/diff-options.txt:23 en/fetch-options.txt:198 en/git-add.txt:111 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
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
@@ -3672,7 +3722,7 @@ msgid "\tThis is the default.\n"
msgstr "\tEste 챕 o padr찾o.\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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:117 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
+#: 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:118 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"
@@ -4102,7 +4152,7 @@ msgid "Synonym for --dirstat=files,param1,param2..."
msgstr "--dirstat[=<param1,param2,...>]"
#. type: Labeled list
-#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:129
+#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--summary"
msgstr "--summary"
@@ -4126,7 +4176,7 @@ msgid "Synonym for `-p --stat`."
msgstr "Sin척nimo para `-p --stat`."
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:122 en/git-update-index.txt:168
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:168
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4542,7 +4592,7 @@ msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word
msgstr "Equivalente a `--word-diff = color` plus (se um regex foi especificado)` --word-diff-regex = <regex> `."
#. type: Labeled list
-#: en/diff-options.txt:402 en/git-status.txt:139
+#: en/diff-options.txt:402 en/git-status.txt:143
#, ignore-same, no-wrap, priority:280
msgid "--no-renames"
msgstr "--no-renames"
@@ -4646,8 +4696,9 @@ msgstr "Pausa completa reescreve as altera챌천es em pares de excluir e criar. Is
#. type: Plain text
#: en/diff-options.txt:463
-#, priority:280
-msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
+#, fuzzy, priority:280
+#| msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
+msgid "It affects the way a change that amounts to a total rewrite of a file does not appear as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
msgstr "Ela afeta a forma como uma mudan챌a que equivale a uma reescrita total de um arquivo n찾o como uma s챕rie de exclus찾o e inser챌찾o misturadas com poucas linhas que correspondem textualmente ao contexto, mas como uma 첬nica exclus찾o de tudo o que 챕 antigo seguido por uma inser챌찾o 첬nica de tudo novo, e o n첬mero `m` controla este aspecto da op챌찾o -B (o padr찾o 챕 60%). \"-B / 70%\" especifica que menos de 30% do original deve permanecer no resultado para o Git consider찼-lo uma reescrita total (isto 챕, o patch resultante ser찼 uma s챕rie de dele챌찾o e inser챌찾o misturadas com linhas de contexto)."
#. type: Plain text
@@ -4663,7 +4714,7 @@ msgid "-M[<n>]"
msgstr "-M[<n>]"
#. type: Labeled list
-#: en/diff-options.txt:473 en/git-status.txt:143
+#: en/diff-options.txt:473 en/git-status.txt:147
#, no-wrap, priority:280
msgid "--find-renames[=<n>]"
msgstr "--encontrar-renomea챌천es[=<n>]"
@@ -5102,7 +5153,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr "Fa챌a o programa sair com c처digos semelhantes ao diff(1). Ou seja, sai com 1 se houver diferen챌as e 0 significa sem diferen챌as."
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:203 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:52 en/git-clone.txt:120 en/git-commit.txt:314 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:301 en/git-gc.txt:68 en/git-grep.txt:296 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:315 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:255 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:136 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:215 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:316 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:302 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:256 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5156,7 +5207,7 @@ msgid "Allow (or disallow) external text conversion filters to be run when compa
msgstr "Permitir (ou proibir) filtros de convers찾o de texto externos para serem executados ao comparar arquivos bin찼rios. Veja linkgit:gitattributes[5] para detalhes. Como os filtros textconv s찾o tipicamente uma convers찾o unidirecional, o diff resultante 챕 adequado para consumo humano, mas n찾o pode ser aplicado. Por essa raz찾o, os filtros textconv s찾o habilitados por padr찾o apenas para linkgit:git-diff[1] e linkgit:git-log[1], mas n찾o para os comandos linkgit:git-format-patch 1] ou diff plumbing."
#. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:85
+#: en/diff-options.txt:722 en/git-status.txt:87
#, no-wrap, priority:280
msgid "--ignore-submodules[=<when>]"
msgstr "--ignorar-submodulos[=<when>]"
@@ -5234,7 +5285,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr "Para uma explica챌찾o mais detalhada sobre estas op챌천es comuns, veja tamb챕m linkgit:gitdiffcore[7]."
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:265 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:266 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5366,7 +5417,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr "Veja tamb챕m a vari찼vel de configura챌찾o `fetch.negotiationAlgorithm` documentada em linkgit:git-config[1]."
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:48 en/git-commit.txt:317 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:50 en/git-commit.txt:319 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5378,13 +5429,13 @@ msgid "Show what would be done, without making any changes."
msgstr "Mostre o que seria feito, sem fazer altera챌천es."
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:34 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:195 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:347 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:278 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:279 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:35 en/git-fast-import.txt:37 en/git-filter-branch.txt:196 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:279 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:280 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5418,7 +5469,7 @@ msgid "\tThis option overrides that check.\n"
msgstr "\tEsta op챌찾o sobrescreve essa verifica챌찾o.\n"
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:112 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:113 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5496,7 +5547,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr "Antes de buscar, remova quaisquer tags locais que n찾o existam mais no controle remoto se `--prune` estiver ativado. Esta op챌찾o deve ser usada com mais cuidado, ao contr찼rio de `--prune` ela ir찼 remover quaisquer refer챗ncias locais (tags locais) que tenham sido criadas. Esta op챌찾o 챕 uma forma abreviada de fornecer o refspec de tag expl챠cito junto com o `--prune`, veja a discuss찾o sobre isso em sua documenta챌찾o."
#. type: Labeled list
-#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:47 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:97 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:326 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:301 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:85
+#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:98 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:302 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5562,188 +5613,212 @@ msgid "--jobs=<n>"
msgstr "--empregos=<n>"
#. type: Plain text
-#: en/fetch-options.txt:167
+#: en/fetch-options.txt:164
#, priority:220
-msgid "Number of parallel children to be used for fetching submodules. Each will fetch from different submodules, such that fetching many submodules will be faster. By default submodules will be fetched one at a time."
-msgstr "N첬mero de filhos paralelos a serem usados para buscar subm처dulos. Cada um buscar찼 de diferentes subm처dulos, de modo que buscar muitos subm처dulos ser찼 mais r찼pido. Por padr찾o, os subm처dulos ser찾o buscados um de cada vez."
+msgid "Number of parallel children to be used for all forms of fetching."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:169
+#, priority:220
+msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:172
+#, priority:220
+msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
+msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:168 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:173 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:171
+#: en/fetch-options.txt:176
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr "Desabilite a busca recursiva de subm처dulos (isto tem o mesmo efeito que usar a op챌찾o `--recurse-submodules=no`)."
#. type: Labeled list
-#: en/fetch-options.txt:172
+#: en/fetch-options.txt:177 en/git-branch.txt:225 en/git-push.txt:349
+#, ignore-same, no-wrap, priority:240
+msgid "--set-upstream"
+msgstr "--set-upstream"
+
+#. type: Plain text
+#: en/fetch-options.txt:183
+#, priority:220
+msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:184
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr "--subm처dulo-prefixo=<path>"
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:188
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr "Prefira <path> a caminhos impressos em mensagens informativas, como \"Buscando submodulo foo\". Essa op챌찾o 챕 usada internamente ao recorrer a subm처dulos."
#. type: Labeled list
-#: en/fetch-options.txt:177
+#: en/fetch-options.txt:189
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr "--recurso-subm처dulo-padr찾o=[sim|sob-demanda]"
#. type: Plain text
-#: en/fetch-options.txt:184
+#: en/fetch-options.txt:196
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr "Essa op챌찾o 챕 usada internamente para fornecer temporariamente um valor padr찾o n찾o negativo para a op챌찾o --recurse-submodules. Todos os outros m챕todos de configura챌찾o da recurs찾o do subm처dulo da busca (como configura챌천es em linkgit:gitmodules[5] e linkgit:git-config[1]) sobrescrevem esta op챌찾o, assim como especificar - [no-]recurse-submodules diretamente."
#. type: Labeled list
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:199
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:194
+#: en/fetch-options.txt:206
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr "Por padr찾o, 'git fetch' se recusa a atualizar a cabe챌a que corresponde 횪 ramifica챌찾o atual. Este sinalizador desativa o cheque. Isto 챕 puramente para o uso interno de 'git pull' para se comunicar com 'git fetch', e a menos que voc챗 esteja implementando sua pr처pria Porcelana, voc챗 n찾o deve us찼-la."
#. type: Labeled list
-#: en/fetch-options.txt:195 en/git-clone.txt:182
+#: en/fetch-options.txt:207 en/git-clone.txt:182
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr "--envio-pacote <envio-pacote>"
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:212
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr "Quando dado, e o reposit처rio para buscar 챕 manipulado por 'git fetch-pack', `--exec=<upload-pack>` 챕 passado para o comando para especificar o caminho n찾o padr찾o para o comando executado na outra extremidade."
#. type: Labeled list
-#: en/fetch-options.txt:202 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:51 en/git-clone.txt:119 en/git-commit.txt:313 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:300 en/git-grep.txt:295 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:314 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:254 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:135
+#: en/fetch-options.txt:214 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:315 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:301 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:255 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:207
+#: en/fetch-options.txt:219
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr "Passe - silencie para git-fetch-pack e silencie quaisquer outros comandos git usados internamente. O progresso n찾o 챕 relatado para o fluxo de erros padr찾o."
#. type: Labeled list
-#: en/fetch-options.txt:208 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:298 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:318 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:139
+#: en/fetch-options.txt:220 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:300 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:209 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:299 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:319 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:140
+#: en/fetch-options.txt:221 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:301 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:211 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:142
+#: en/fetch-options.txt:223 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr "Seja verboso."
#. type: Labeled list
-#: en/fetch-options.txt:213 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:326 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:258 en/git-switch.txt:144 en/merge-options.txt:143
+#: en/fetch-options.txt:225 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:328 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:259 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:218 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:230 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr "O status de progresso 챕 relatado no fluxo de erro padr찾o por padr찾o quando ele 챕 anexado a um terminal, a menos que -q seja especificado. Esse sinalizador for챌a o status de progresso mesmo se o fluxo de erro padr찾o n찾o for direcionado para um terminal."
#. type: Labeled list
-#: en/fetch-options.txt:219 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:231 en/git-ls-remote.txt:73 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr "-o <option>"
#. type: Labeled list
-#: en/fetch-options.txt:220 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:232 en/git-clone.txt:135 en/git-ls-remote.txt:74
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr "--servidor-op챌찾o=<option>"
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-clone.txt:142
+#: en/fetch-options.txt:239 en/git-clone.txt:142
#, fuzzy, priority:300
#| msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgid "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."
msgstr "Transmita a string fornecida para o servidor ao se comunicar usando o protocolo vers찾o 2. A string fornecida n찾o deve conter um caractere NUL ou LF. Quando m첬ltiplos `--server-option=<option>` s찾o fornecidos, todos eles s찾o enviados para o outro lado na ordem listada na linha de comando."
#. type: Labeled list
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:240
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:233
+#: en/fetch-options.txt:245
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:234
+#: en/fetch-options.txt:246
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:240
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:241 en/git-push.txt:398
+#: en/fetch-options.txt:253 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:242 en/git-push.txt:399
+#: en/fetch-options.txt:254 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:244 en/git-push.txt:401
+#: en/fetch-options.txt:256 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr "Use apenas endere챌os IPv4, ignorando endere챌os IPv6."
#. type: Labeled list
-#: en/fetch-options.txt:245 en/git-push.txt:402
+#: en/fetch-options.txt:257 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:246 en/git-push.txt:403
+#: en/fetch-options.txt:258 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:247 en/git-push.txt:405
+#: en/fetch-options.txt:259 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr "Use apenas endere챌os IPv6, ignorando endere챌os IPv4."
@@ -5787,7 +5862,7 @@ msgstr ""
"\t [--chmod = (+ | -) x] [-] [<pathspec> ...]\n"
#. type: Title -
-#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:20 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:67 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
+#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr "DESCRI횉횄O"
@@ -5829,13 +5904,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr "Por favor, veja linkgit:git-commit[1] para formas alternativas de adicionar conte첬do a um commit."
#. type: Title -
-#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:83 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:85 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:115 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:253 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:86 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:254 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr "OP횉횛ES"
#. type: Labeled list
-#: en/git-add.txt:52 en/git-grep.txt:308 en/git-status.txt:148
+#: en/git-add.txt:52 en/git-grep.txt:325 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr "<pathspec>..."
@@ -5847,7 +5922,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr "Arquivos para adicionar conte첬do de. Fileglobs (por exemplo, `* .c`) podem ser fornecidos para adicionar todos os arquivos correspondentes. Tamb챕m um nome de diret처rio principal (por exemplo, `dir` para adicionar` dir/file1` e `dir/file2`) pode ser dado para atualizar o 챠ndice para corresponder ao estado atual do diret처rio como um todo (por exemplo, especificando` dir` ir찼 gravar n찾o apenas um arquivo `dir/file1` modificado na 찼rvore de trabalho, um arquivo `dir/file2` adicionado 횪 찼rvore de trabalho, mas tamb챕m um arquivo `dir /file3` removido da 찼rvore de trabalho). Note que vers천es mais antigas do Git costumavam ignorar arquivos removidos; use a op챌찾o `--no-all` se voc챗 quiser adicionar arquivos modificados ou novos, mas ignorar os removidos."
#. type: Plain text
-#: en/git-add.txt:67 en/git-grep.txt:314
+#: en/git-add.txt:67 en/git-grep.txt:331
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr "Para mais detalhes sobre a sintaxe <pathspec>, veja a entrada 'pathspec' em linkgit:gitglossary[7]."
@@ -5865,13 +5940,13 @@ msgid "Allow adding otherwise ignored files."
msgstr "Permitir a adi챌찾o de arquivos ignorados."
#. type: Labeled list
-#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:42 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:394 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:43 en/git-rebase.txt:395 en/git-rebase.txt:536 en/git-svn.txt:297
+#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5895,7 +5970,7 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr "Isso efetivamente executa `add --interactive`, mas ignora o menu de comando inicial e pula diretamente para o subcomando` patch`. Veja `` modo interativo '' para detalhes."
#. type: Labeled list
-#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:275 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
@@ -5985,7 +6060,7 @@ msgid "This option is primarily to help users who are used to older versions of
msgstr "Esta op챌찾o 챕 principalmente para ajudar usu찼rios que est찾o acostumados com vers천es mais antigas do Git, cujo \"git add <pathspec> ...\" era um sin척nimo para \"git add --no-all <pathspec> ...\", isto 챕, ignorado removido arquivos."
#. type: Labeled list
-#: en/git-add.txt:146 en/git-format-patch.txt:101 en/git-submodule.txt:340
+#: en/git-add.txt:146 en/git-format-patch.txt:102 en/git-submodule.txt:341
#, no-wrap, priority:300
msgid "-N"
msgstr "-N"
@@ -6075,7 +6150,7 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr "Substituir o bit execut찼vel dos arquivos adicionados. O bit execut찼vel 챕 alterado apenas no 챠ndice, os arquivos no disco s찾o mantidos inalterados."
#. type: Labeled list
-#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:343 en/git-grep.txt:304 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
+#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:345 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr "\\--"
@@ -6087,7 +6162,7 @@ msgid "This option can be used to separate command-line options from the list of
msgstr "Essa op챌찾o pode ser usada para separar as op챌천es da linha de comandos da lista de arquivos (첬til quando nomes de arquivo podem ser confundidos com op챌천es de linha de comando)."
#. type: Title -
-#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:357 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:153 en/git-fetch.txt:242 en/git-filter-branch.txt:234 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:634 en/git-grep.txt:316 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:206 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:359 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:638 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr "EXEMPLOS"
@@ -6129,7 +6204,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr "Como este exemplo permite que o shell expanda o asterisco (ou seja, voc챗 est찼 listando os arquivos explicitamente), ele n찾o considera `subdir/git-foo.sh`."
#. type: Title -
-#: en/git-add.txt:221 en/git-rebase.txt:591
+#: en/git-add.txt:221 en/git-rebase.txt:613
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr "MODO INTERATIVO"
@@ -6141,7 +6216,7 @@ msgid "When the command enters the interactive mode, it shows the output of the
msgstr "Quando o comando entra no modo interativo, ele mostra a sa챠da do subcomando 'status' e entra em seu loop de comando interativo."
#. type: Plain text
-#: en/git-add.txt:230 en/git-clean.txt:83
+#: en/git-add.txt:230 en/git-clean.txt:85
#, priority:300
msgid "The command loop shows the list of subcommands available, and gives a prompt \"What now> \". In general, when the prompt ends with a single '>', you can pick only one of the choices given and type return, like this:"
msgstr "O loop de comando mostra a lista de subcomandos dispon챠veis e fornece um prompt \"What now>\". Em geral, quando o prompt termina com um 첬nico '>', voc챗 pode escolher apenas uma das op챌천es dadas e digitar return, assim:"
@@ -6458,7 +6533,7 @@ msgid "modifying the contents of context or removal lines"
msgstr "modificando o conte첬do do contexto ou linhas de remo챌찾o"
#. type: Title -
-#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:135 en/git-commit-tree.txt:118 en/git-commit.txt:487 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:241 en/git-fast-import.txt:1503 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:679 en/git-gc.txt:154 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:112 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:247 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:519 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:292 en/git-status.txt:434 en/git-submodule.txt:436 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
+#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:489 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1526 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:683 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:437 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr "VEJA TAMB횋M"
@@ -6470,13 +6545,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:139 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:495 en/git-config.txt:492 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:245 en/git-fast-import.txt:1507 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:480 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:683 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:334 en/git-gui.txt:126 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:116 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:230 en/git-merge-file.txt:94 en/git-merge-index.txt:78 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1052 en/git-receive-pack.txt:251 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:123 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:523 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:300 en/git-status.txt:438 en/git-stripspace.txt:93 en/git-submodule.txt:440 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
+#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:497 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1530 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:693 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:687 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:441 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
#, no-wrap, priority:300
msgid "GIT"
msgstr "GIT"
#. type: Plain text
-#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:140 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:496 en/git-config.txt:493 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:246 en/git-fast-import.txt:1508 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:481 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:684 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:335 en/git-gui.txt:127 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:117 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:231 en/git-merge-file.txt:95 en/git-merge-index.txt:79 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1053 en/git-receive-pack.txt:252 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:124 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:524 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:301 en/git-status.txt:439 en/git-stripspace.txt:94 en/git-submodule.txt:441 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
+#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:498 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1531 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:694 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:688 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:442 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr "Parte do linkgit:git[1] suite"
@@ -6534,7 +6609,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr "A lista de arquivos de caixa de correio para ler os patches. Se voc챗 n찾o fornecer esse argumento, o comando ler찼 a partir da entrada padr찾o. Se voc챗 fornecer diret처rios, eles ser찾o tratados como Maildirs."
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:118 en/git-rebase.txt:387 en/git-revert.txt:98 en/merge-options.txt:73
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:119 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6576,7 +6651,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr "Com `--keep-cr`, chame 'git mailsplit' (veja linkgit:git-mailsplit[1]) com a mesma op챌찾o, para evitar que ele retire CR no final das linhas. A vari찼vel de configura챌찾o `am.keepcr` pode ser usada para especificar o comportamento padr찾o. `--no-keep-cr` 챕 첬til para sobrescrever` am.keepcr`."
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:969
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:985
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6606,7 +6681,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr "Ignore linhas de tesoura (veja linkgit:git-mailinfo[1])."
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:267 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:989
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1005
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6700,37 +6775,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr "Quando o patch n찾o se aplica corretamente, use a mesclagem de 3 vias se o patch registra a identidade dos blobs aos quais ele deve se aplicar e temos esses blobs dispon챠veis localmente. `--no-3way` pode ser usado para sobrescrever a vari찼vel de configura챌찾o am.threeWay. Para mais informa챌천es, veja am.threeWay em linkgit:git-config[1]."
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:303 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:304 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:307 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:373 en/git-rebase.txt:524
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:374
+#: en/git-am.txt:109 en/git-rebase.txt:396
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr "--espa챌oembranco=<op챌찾o>"
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:337
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
#, no-wrap, priority:100
msgid "-C<n>"
msgstr "-C<n>"
@@ -6790,7 +6865,7 @@ msgid "Run interactively."
msgstr "Corra interativamente."
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:380 en/git-rebase.txt:521
+#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6802,7 +6877,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr "Por padr찾o, o comando registra a data da mensagem de e-mail como a data do autor de confirma챌찾o e usa a hora da cria챌찾o de confirma챌찾o como a data do committer. Isso permite ao usu찼rio mentir sobre a data do committer usando o mesmo valor da data do autor."
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:381 en/git-rebase.txt:522
+#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6814,7 +6889,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr "Por padr찾o, o comando registra a data da mensagem de e-mail como a data do autor de confirma챌찾o e usa a hora da cria챌찾o de confirma챌찾o como a data do committer. Isso permite ao usu찼rio mentir sobre a data do autor usando o mesmo valor que a data do committer."
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:256 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6826,31 +6901,31 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr "Ignore o patch atual. Isso s처 챕 significativo ao reiniciar um patch abortado."
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:333 en/git-rebase.txt:308 en/git-revert.txt:91 en/merge-options.txt:58
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:335 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr "-S[<keyid>]"
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:334 en/git-rebase.txt:309 en/git-revert.txt:92 en/merge-options.txt:59
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:336 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr "--gpg-sinal[=<keyid>]"
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:338 en/git-rebase.txt:313 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:340 en/git-rebase.txt:331 en/git-revert.txt:96
#, priority:280
msgid "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."
msgstr "Confirma챌천es de assinatura de GPG. O argumento `keyid` 챕 opcional e padroniza a identidade do committer; se especificado, deve estar preso 횪 op챌찾o sem espa챌o."
#. type: Labeled list
-#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:228 en/sequencer.txt:1
+#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:246 en/sequencer.txt:1
#, ignore-same, no-wrap, priority:240
msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:406 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:997
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1013
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6880,7 +6955,7 @@ msgid "When a patch failure occurs, <msg> will be printed to the screen before e
msgstr "Quando ocorre uma falha de patch, <msg> ser찼 impresso na tela antes de sair. Isto substitui a mensagem padr찾o informando que voc챗 deve usar `--continue` ou` --skip` para manipular a falha. Isto 챕 apenas para uso interno entre 'git rebase' e 'git am'."
#. type: Labeled list
-#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:231 en/sequencer.txt:15
+#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:249 en/sequencer.txt:15
#, ignore-same, no-wrap, priority:240
msgid "--abort"
msgstr "--abort"
@@ -6892,7 +6967,7 @@ msgid "Restore the original branch and abort the patching operation."
msgstr "Restaure a ramifica챌찾o original e aborte a opera챌찾o de corre챌찾o."
#. type: Labeled list
-#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:238 en/sequencer.txt:10
+#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:256 en/sequencer.txt:10
#, ignore-same, no-wrap, priority:240
msgid "--quit"
msgstr "--quit"
@@ -6904,7 +6979,7 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr "Anule a opera챌찾o de corre챌찾o, mas mantenha HEAD e o 챠ndice inalterados."
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:262
+#: en/git-am.txt:179 en/git-rebase.txt:280
#, ignore-same, no-wrap, priority:100
msgid "--show-current-patch"
msgstr "--show-current-patch"
@@ -6916,7 +6991,7 @@ msgid "Show the patch being applied when \"git am\" is stopped because of confli
msgstr "Mostrar o patch sendo aplicado quando \"git am\" 챕 interrompido devido a conflitos."
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:451 en/git-format-patch.txt:351 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:188 en/git-tag.txt:231
+#: en/git-am.txt:184 en/git-commit.txt:453 en/git-format-patch.txt:355 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr "DISCUSS횄O"
@@ -7002,7 +7077,7 @@ msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the curren
msgstr "Antes que qualquer corre챌찾o seja aplicada, ORIG_HEAD 챕 definido como a ponta da ramifica챌찾o atual. Isso 챕 첬til se voc챗 tiver problemas com v찼rias confirma챌천es, como executar 'git am' na ramifica챌찾o errada ou um erro nas confirma챌천es mais facilmente corrigido alterando a caixa de correio (por exemplo, erros nas linhas \"De:\")."
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:471 en/git-gc.txt:147
+#: en/git-am.txt:234 en/git-commit.txt:473 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr "GANCHOS"
@@ -7108,7 +7183,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr "Os arquivos para ler o patch de. '-' pode ser usado para ler a entrada padr찾o."
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:322 en/merge-options.txt:84
+#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -7150,7 +7225,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr "Quando `--check` estiver em vigor ou ao aplicar o patch (que 챕 o padr찾o quando nenhuma das op챌천es que o desativam estiver em vigor), certifique-se de que o patch seja aplic찼vel ao que o arquivo de 챠ndice atual registra. Se o arquivo a ser corrigido na 찼rvore de trabalho n찾o estiver atualizado, ele ser찼 marcado como um erro. Esse sinalizador tamb챕m faz com que o arquivo de 챠ndice seja atualizado."
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:291
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:292
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7224,7 +7299,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr "Remova os componentes do caminho principal <n> (separados por barras) dos caminhos tradicionais do diff. Por exemplo, com `-p2`, um patch contra` a/dir/file` ser찼 aplicado diretamente ao `file`. O padr찾o 챕 1."
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:342
+#: en/git-apply.txt:134 en/git-rebase.txt:360
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr "Assegure pelo menos <n> linhas de correspond챗ncia de contexto ao redor antes e depois de cada altera챌찾o. Quando menos linhas de contexto circundante existem, todas devem corresponder. Por padr찾o, nenhum contexto 챕 ignorado."
@@ -7442,7 +7517,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr "Quando `git apply` 챕 usado como um \"melhor patch GNU\", o usu찼rio pode passar a op챌찾o` --unsafe-paths` para sobrescrever esta verifica챌찾o de seguran챌a. Esta op챌찾o n찾o tem efeito quando o `--index` ou` --cached` est찼 em uso."
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:330 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:398 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:332 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr "CONFIGURA횉횄O"
@@ -9409,7 +9484,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr "Copie uma ramifica챌찾o e o reflogo correspondente."
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:525
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
#, no-wrap, priority:240
msgid "-C"
msgstr "-C"
@@ -9445,13 +9520,13 @@ msgid "Sorting and filtering branches are case insensitive."
msgstr "As ramifica챌천es de classifica챌찾o e filtragem n찾o diferenciam mai첬sculas de min첬sculas."
#. type: Labeled list
-#: en/git-branch.txt:153 en/git-status.txt:126 en/git-tag.txt:134
+#: en/git-branch.txt:153 en/git-status.txt:130 en/git-tag.txt:134
#, no-wrap, priority:280
msgid "--column[=<options>]"
msgstr "--coluna[=<op챌천es>]"
#. type: Labeled list
-#: en/git-branch.txt:154 en/git-status.txt:127 en/git-tag.txt:135
+#: en/git-branch.txt:154 en/git-status.txt:131 en/git-tag.txt:135
#, ignore-same, no-wrap, priority:280
msgid "--no-column"
msgstr "--no-column"
@@ -9580,12 +9655,6 @@ msgstr "--no-track"
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr "N찾o configure \"upstream\", mesmo que a vari찼vel de configura챌찾o branch.autoSetupMerge seja verdadeira."
-#. type: Labeled list
-#: en/git-branch.txt:225 en/git-push.txt:349
-#, ignore-same, no-wrap, priority:240
-msgid "--set-upstream"
-msgstr "--set-upstream"
-
#. type: Plain text
#: en/git-branch.txt:228
#, priority:240
@@ -9855,7 +9924,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-filter-branch.txt:449 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
#, no-wrap, priority:240
msgid "NOTES"
msgstr "NOTAS"
@@ -10494,7 +10563,7 @@ msgstr ""
"\t/etc/passwd\n"
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:152 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr "SA횒DA"
@@ -11155,7 +11224,7 @@ msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will al
msgstr "Se `-n` ou` --n찾o-coincidindo` forem especificados, nomes de caminhos n찾o correspondentes tamb챕m ser찾o emitidos, caso em que todos os campos em cada registro de sa챠da, exceto para <nome do path>, estar찾o vazios. Isso pode ser 첬til ao executar de forma n찾o interativa, para que os arquivos possam ser transmitidos de forma incremental para STDIN de um processo de ignorar cheque de longa execu챌찾o e, para cada um desses arquivos, STDOUT indicar찼 se esse arquivo correspondeu a um padr찾o. (Sem essa op챌찾o, seria imposs챠vel dizer se a aus챗ncia de sa챠da para um determinado arquivo significava que ele n찾o correspondia a nenhum padr찾o ou que a sa챠da ainda n찾o havia sido gerada.)"
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:226
+#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr "ESTADO DE SA횒DA"
@@ -11352,7 +11421,7 @@ msgid "Only meaningful with `--stdin`; paths are separated with NUL character in
msgstr "Somente significativo com `--stdin`; caminhos s찾o separados com caracteres NUL em vez de LF."
#. type: Plain text
-#: en/git-checkout-index.txt:73 en/git-commit.txt:345 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
+#: en/git-checkout-index.txt:73 en/git-commit.txt:347 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
#, priority:280
msgid "Do not interpret any more arguments as options."
msgstr "N찾o interprete mais argumentos como op챌천es."
@@ -11688,7 +11757,7 @@ msgid "Quiet, suppress feedback messages."
msgstr "Silencioso, suprima as mensagens de feedback."
#. type: Labeled list
-#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:144
+#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:152
#, ignore-same, no-wrap, priority:240
msgid "--no-progress"
msgstr "--no-progress"
@@ -11887,7 +11956,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr "No modo de checkout esparso, `git checkout - <paths>` atualizaria apenas entradas correspondidas por <paths> e padr천es esparsos em $GIT_DIR/info/sparse-checkout. Esta op챌찾o ignora os padr천es esparsos e adiciona de volta os arquivos em <paths>."
#. type: Labeled list
-#: en/git-checkout.txt:241 en/git-rebase.txt:268 en/git-rebase.txt:529 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:354 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
+#: en/git-checkout.txt:241 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:355 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -12010,7 +12079,7 @@ msgid "In the default overlay mode, `git checkout` never removes files from the
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:312 en/git-rebase.txt:225 en/git-switch.txt:36
+#: en/git-checkout.txt:312 en/git-rebase.txt:243 en/git-switch.txt:36
#, no-wrap, priority:240
msgid "<branch>"
msgstr ""
@@ -12761,7 +12830,7 @@ msgid "This option determines how the commit message will be cleaned up before b
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:65 en/git-clean.txt:61
+#: en/git-cherry-pick.txt:65 en/git-clean.txt:63
#, ignore-same, no-wrap, priority:100
msgid "-x"
msgstr "-x"
@@ -12847,7 +12916,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr "Por padr찾o, a escolha aleat처ria de uma confirma챌찾o vazia falhar찼, indicando que uma chamada expl챠cita de `git commit --allow-empty` 챕 necess찼ria. Essa op챌찾o substitui esse comportamento, permitindo que os commits vazios sejam preservados automaticamente em um cherry-pick. Observe que quando \"--ff\" est찼 em vigor, os commits vazios que atendem ao requisito de \"fast forward\" ser찾o mantidos mesmo sem essa op챌찾o. Observe tamb챕m que o uso desta op챌찾o mant챕m apenas confirma챌천es que estavam inicialmente vazias (isto 챕, o commit registrou a mesma 찼rvore que seu pai). Commits que s찾o feitos em branco devido a um commit anterior s찾o descartados. Para for챌ar a inclus찾o desses commits use `--keep-redundant-commits`."
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:249 en/git-rebase.txt:532
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:267 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12873,7 +12942,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr "Se um commit que est찼 sendo escolhido, duplicar um commit j찼 no hist처rico atual, ele ficar찼 vazio. Por padr찾o, estas confirma챌천es redundantes fazem com que o `cherry-pick` pare para que o usu찼rio possa examinar o commit. Esta op챌찾o substitui esse comportamento e cria um objeto de confirma챌찾o vazio. Implica `--allow-empty`."
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:282 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:109
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12891,7 +12960,7 @@ msgid "-X<option>"
msgstr "-X<op챌찾o>"
#. type: Labeled list
-#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:125
#, no-wrap, priority:240
msgid "--strategy-option=<option>"
msgstr "--strategy-op챌찾o=<op챌찾o>"
@@ -13087,7 +13156,7 @@ msgid "Show the commit subjects next to the SHA1s."
msgstr "Mostra os assuntos de commits ao lado dos SHA1s."
#. type: Labeled list
-#: en/git-cherry.txt:32 en/git-rebase.txt:220
+#: en/git-cherry.txt:32 en/git-rebase.txt:238
#, no-wrap, priority:100
msgid "<upstream>"
msgstr ""
@@ -13105,7 +13174,7 @@ msgid "<head>"
msgstr ""
#. type: Plain text
-#: en/git-cherry.txt:38 en/git-rebase.txt:227
+#: en/git-cherry.txt:38 en/git-rebase.txt:245
#, priority:100
msgid "Working branch; defaults to HEAD."
msgstr "Branch de trabalho; O padr찾o 챕 HEAD."
@@ -13328,86 +13397,87 @@ msgid "If any optional `<path>...` arguments are given, only those paths are aff
msgstr "Se algum argumento opcional `<path>...` for dado, somente esses caminhos ser찾o afetados."
#. type: Plain text
-#: en/git-clean.txt:33
+#: en/git-clean.txt:35
#, priority:100
-msgid "Remove untracked directories in addition to untracked files. If an untracked directory is managed by a different Git repository, it is not removed by default. Use -f option twice if you really want to remove such a directory."
-msgstr "Remova os diret처rios n찾o acompanhados, al챕m dos arquivos n찾o acompanhados. Se um diret처rio n찾o rastreado for gerenciado por um reposit처rio Git diferente, ele n찾o ser찼 removido por padr찾o. Use a op챌찾o -f duas vezes se voc챗 realmente quiser remover esse diret처rio."
+msgid "Normally, when no <path> is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. If any paths are specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under `--force`) will be removed."
+msgstr ""
#. type: Plain text
-#: en/git-clean.txt:41
-#, priority:100
-msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f, -n or -i. Git will refuse to delete directories with .git sub directory or file unless a second -f is given."
+#: en/git-clean.txt:43
+#, fuzzy, priority:100
+#| msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f, -n or -i. Git will refuse to delete directories with .git sub directory or file unless a second -f is given."
+msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f or -i. Git will refuse to modify untracked nested git repositories (directories with a .git subdirectory) unless a second -f is given."
msgstr "Se a vari찼vel de configura챌찾o do Git, clean.requireForce, n찾o estiver definida como false, o 'git clean' recusar찼 a exclus찾o de arquivos ou diret처rios, a menos que seja dado -f, -n ou -i. O Git se recusar찼 a deletar diret처rios com o subdiret처rio ou arquivo .git, a menos que seja dado um segundo -f."
#. type: Plain text
-#: en/git-clean.txt:46
+#: en/git-clean.txt:48
#, priority:100
msgid "Show what would be done and clean files interactively. See ``Interactive mode'' for details."
msgstr "Mostre o que seria feito e limpe os arquivos interativamente. Veja ``modo interativo'' para detalhes."
#. type: Plain text
-#: en/git-clean.txt:50
+#: en/git-clean.txt:52
#, priority:100
msgid "Don't actually remove anything, just show what would be done."
msgstr "Na verdade, n찾o remova nada, apenas mostre o que seria feito."
#. type: Plain text
-#: en/git-clean.txt:55
+#: en/git-clean.txt:57
#, priority:100
msgid "Be quiet, only report errors, but not the files that are successfully removed."
msgstr "Fique quieto, relate somente erros, mas n찾o os arquivos removidos com sucesso."
#. type: Labeled list
-#: en/git-clean.txt:56
+#: en/git-clean.txt:58
#, no-wrap, priority:100
msgid "-e <pattern>"
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:57 en/git-ls-files.txt:85 en/git-name-rev.txt:33
+#: en/git-clean.txt:59 en/git-ls-files.txt:85 en/git-name-rev.txt:33
#, no-wrap, priority:100
msgid "--exclude=<pattern>"
msgstr "--excluir=<pattern>"
#. type: Plain text
-#: en/git-clean.txt:60
+#: en/git-clean.txt:62
#, priority:100
msgid "Use the given exclude pattern in addition to the standard ignore rules (see linkgit:gitignore[5])."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:68
+#: en/git-clean.txt:70
#, fuzzy, priority:100
#| msgid "Don't use the standard ignore rules read from .gitignore (per directory) and $GIT_DIR/info/exclude, but do still use the ignore rules given with `-e` options. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git reset') to create a pristine working directory to test a clean build."
msgid "Don't use the standard ignore rules (see linkgit:gitignore[5]), but still use the ignore rules given with `-e` options from the command line. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git restore' or 'git reset') to create a pristine working directory to test a clean build."
msgstr "N찾o use as regras padr찾o de ignorar lidas de .gitignore (por diret처rio) e $GIT_DIR/info/excluir, mas ainda use as regras de ignorar dadas com as op챌천es `-e`. Isso permite remover todos os arquivos n찾o acompanhados, incluindo produtos de cria챌찾o. Isso pode ser usado (possivelmente em conjunto com 'git reset') para criar um diret처rio de trabalho primitivo para testar uma compila챌찾o limpa."
#. type: Labeled list
-#: en/git-clean.txt:69
+#: en/git-clean.txt:71
#, no-wrap, priority:100
msgid "-X"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:72
+#: en/git-clean.txt:74
#, priority:100
msgid "Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files."
msgstr "Remova apenas arquivos ignorados pelo Git. Isso pode ser 첬til para reconstruir tudo do zero, mas manter arquivos criados manualmente."
#. type: Title -
-#: en/git-clean.txt:74
+#: en/git-clean.txt:76
#, no-wrap, priority:100
msgid "Interactive mode"
msgstr "Modo interativo"
#. type: Plain text
-#: en/git-clean.txt:78
+#: en/git-clean.txt:80
#, priority:100
msgid "When the command enters the interactive mode, it shows the files and directories to be cleaned, and goes into its interactive command loop."
msgstr "Quando o comando entra no modo interativo, ele mostra os arquivos e diret처rios a serem limpos e entra em seu loop de comando interativo."
#. type: delimited block -
-#: en/git-clean.txt:89
+#: en/git-clean.txt:91
#, no-wrap, priority:100
msgid ""
" *** Commands ***\n"
@@ -13417,91 +13487,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:92
+#: en/git-clean.txt:94
#, priority:100
msgid "You also could say `c` or `clean` above as long as the choice is unique."
msgstr "Voc챗 tamb챕m poderia dizer `c` ou` clean` acima, desde que a escolha seja 첬nica."
#. type: Plain text
-#: en/git-clean.txt:94
+#: en/git-clean.txt:96
#, priority:100
msgid "The main command loop has 6 subcommands."
msgstr "O la챌o de comando principal tem 6 subcomandos."
#. type: Labeled list
-#: en/git-clean.txt:95
+#: en/git-clean.txt:97
#, no-wrap, priority:100
msgid "clean"
msgstr "limpar"
#. type: Plain text
-#: en/git-clean.txt:98
+#: en/git-clean.txt:100
#, priority:100
msgid "Start cleaning files and directories, and then quit."
msgstr "Comece limpando arquivos e diret처rios e, em seguida, saia."
#. type: Labeled list
-#: en/git-clean.txt:99
+#: en/git-clean.txt:101
#, no-wrap, priority:100
msgid "filter by pattern"
msgstr "filtrar por padr찾o"
#. type: Plain text
-#: en/git-clean.txt:107
+#: en/git-clean.txt:109
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Input ignore patterns>>\" prompt. You can input space-separated patterns to exclude files and directories from deletion. E.g. \"*.c *.h\" will excludes files end with \".c\" and \".h\" from deletion. When you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr "Isso mostra os arquivos e diret처rios a serem exclu챠dos e emite um aviso \"Input ignore patterns >>\". Voc챗 pode inserir padr천es separados por espa챌o para excluir arquivos e diret처rios da exclus찾o. Por exemplo. \"*.c *.h\" excluir찼 os arquivos com \".c\" e \".h\" da exclus찾o. Quando estiver satisfeito com o resultado filtrado, pressione ENTER (vazio) de volta ao menu principal."
#. type: Labeled list
-#: en/git-clean.txt:108
+#: en/git-clean.txt:110
#, no-wrap, priority:100
msgid "select by numbers"
msgstr "selecione por n첬meros"
#. type: Plain text
-#: en/git-clean.txt:119
+#: en/git-clean.txt:121
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Select items to delete>>\" prompt. When the prompt ends with double '>>' like this, you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything. Also when you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr "Isso mostra os arquivos e diret처rios a serem exclu챠dos e emite um prompt \"Selecionar itens para excluir>>\". Quando o prompt terminar com '>>' duplo, voc챗 poder찼 fazer mais de uma sele챌찾o, concatenada com espa챌o em branco ou v챠rgula. Al챕m disso, voc챗 pode dizer intervalos. Por exemplo. \"2-5 7,9\" para escolher 2,3,4,5,7,9 da lista. Se o segundo n첬mero de um intervalo for omitido, todos os itens restantes ser찾o selecionados. Por exemplo. \"7-\" para escolher 7,8,9 da lista. Voc챗 pode dizer '*' para escolher tudo. Al챕m disso, quando estiver satisfeito com o resultado filtrado, pressione ENTER (vazio) de volta ao menu principal."
#. type: Labeled list
-#: en/git-clean.txt:120
+#: en/git-clean.txt:122
#, no-wrap, priority:100
msgid "ask each"
msgstr "pergunte a cada"
#. type: Plain text
-#: en/git-clean.txt:125
+#: en/git-clean.txt:127
#, priority:100
msgid "This will start to clean, and you must confirm one by one in order to delete items. Please note that this action is not as efficient as the above two actions."
msgstr "Isso come챌ar찼 a ser limpo e voc챗 dever찼 confirmar um por um para excluir itens. Por favor, note que esta a챌찾o n찾o 챕 t찾o eficiente quanto as duas a챌천es acima."
#. type: Labeled list
-#: en/git-clean.txt:126
+#: en/git-clean.txt:128
#, no-wrap, priority:100
msgid "quit"
msgstr "sair"
#. type: Plain text
-#: en/git-clean.txt:129
+#: en/git-clean.txt:131
#, priority:100
msgid "This lets you quit without do cleaning."
msgstr "Isso permite que voc챗 saia sem fazer limpeza."
#. type: Labeled list
-#: en/git-clean.txt:130
+#: en/git-clean.txt:132
#, no-wrap, priority:100
msgid "help"
msgstr "socorro"
#. type: Plain text
-#: en/git-clean.txt:133
+#: en/git-clean.txt:135
#, priority:100
msgid "Show brief usage of interactive git-clean."
msgstr "Mostrar um breve uso do git-limpo interativo."
#. type: Plain text
-#: en/git-clean.txt:137 en/git-status.txt:436
+#: en/git-clean.txt:139 en/git-status.txt:440
#, ignore-same, priority:280
msgid "linkgit:gitignore[5]"
msgstr "linkgit:gitignore[5]"
@@ -13647,7 +13717,7 @@ msgstr ""
"`--dissociate` op챌찾o.\n"
#. type: Labeled list
-#: en/git-clone.txt:108 en/git-submodule.txt:392
+#: en/git-clone.txt:108 en/git-submodule.txt:393
#, ignore-same, no-wrap, priority:300
msgid "--dissociate"
msgstr "--dissociate"
@@ -13897,13 +13967,13 @@ msgid "Instead of placing the cloned repository where it is supposed to be, plac
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:277 en/git-submodule.txt:416
+#: en/git-clone.txt:277 en/git-submodule.txt:417
#, no-wrap, priority:300
msgid "-j <n>"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:278 en/git-submodule.txt:417
+#: en/git-clone.txt:278 en/git-submodule.txt:418
#, no-wrap, priority:300
msgid "--jobs <n>"
msgstr ""
@@ -14261,7 +14331,7 @@ msgid "Read the commit log message from the given file. Use `-` to read from the
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:68 en/git-commit.txt:339
+#: en/git-commit-tree.txt:68 en/git-commit.txt:341
#, ignore-same, no-wrap, priority:280
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
@@ -14345,7 +14415,7 @@ msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:477 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:428 en/git-svn.txt:1156
+#: en/git-commit-tree.txt:114 en/git-commit.txt:479 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:429 en/git-svn.txt:1156
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
@@ -14651,13 +14721,13 @@ msgid "When editing the commit message, start the editor with the contents in th
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:173 en/merge-options.txt:81
+#: en/git-commit.txt:173 en/merge-options.txt:85
#, priority:280
msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:175 en/git-rebase.txt:330
+#: en/git-commit.txt:175 en/git-rebase.txt:348 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14864,115 +14934,115 @@ msgid "Show untracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:288
+#: en/git-commit.txt:289
#, priority:280
msgid "The mode parameter is optional (defaults to 'all'), and is used to specify the handling of untracked files; when -u is not used, the default is 'normal', i.e. show untracked files and directories."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:290 en/git-status.txt:67 en/git-status.txt:107
+#: en/git-commit.txt:291 en/git-status.txt:68 en/git-status.txt:110
#, priority:280
msgid "The possible options are:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:292
+#: en/git-commit.txt:293
#, no-wrap, priority:280
msgid "'no' - Show no untracked files\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:293
+#: en/git-commit.txt:294
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:294 en/git-status.txt:71
+#: en/git-commit.txt:295 en/git-status.txt:72
#, no-wrap, priority:280
msgid "'all' - Also shows individual files in untracked directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:297 en/git-status.txt:84
+#: en/git-commit.txt:298 en/git-status.txt:85
#, priority:280
msgid "The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:308
+#: en/git-commit.txt:310
#, priority:280
msgid "Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template to help the user describe the commit by reminding what changes the commit has. Note that this diff output doesn't have its lines prefixed with '#'. This diff will not be a part of the commit message. See the `commit.verbose` configuration variable in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:312
+#: en/git-commit.txt:314
#, priority:280
msgid "If specified twice, show in addition the unified diff between what would be committed and the worktree files, i.e. the unstaged changes to tracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:316
+#: en/git-commit.txt:318
#, priority:280
msgid "Suppress commit summary message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:321
+#: en/git-commit.txt:323
#, priority:280
msgid "Do not create a commit, but show a list of paths that are to be committed, paths with local changes that will be left uncommitted and paths that are untracked."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:322
+#: en/git-commit.txt:324
#, ignore-same, no-wrap, priority:280
msgid "--status"
msgstr "--status"
#. type: Plain text
-#: en/git-commit.txt:327
+#: en/git-commit.txt:329
#, priority:280
msgid "Include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the commit message. Defaults to on, but can be used to override configuration variable commit.status."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:328
+#: en/git-commit.txt:330
#, ignore-same, no-wrap, priority:280
msgid "--no-status"
msgstr "--no-status"
#. type: Plain text
-#: en/git-commit.txt:332
+#: en/git-commit.txt:334
#, priority:280
msgid "Do not include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the default commit message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:342
+#: en/git-commit.txt:344
#, priority:280
msgid "Countermand `commit.gpgSign` configuration variable that is set to force each and every commit to be signed."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:346 en/git-rm.txt:29
+#: en/git-commit.txt:348 en/git-rm.txt:29
#, ignore-ellipsis, no-wrap, priority:280
msgid "<file>..."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:352
+#: en/git-commit.txt:354
#, priority:280
msgid "When files are given on the command line, the command commits the contents of the named files, without recording the changes already staged. The contents of these files are also staged for the next commit on top of what have been staged before."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:369
+#: en/git-commit.txt:371
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:375
+#: en/git-commit.txt:377
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14982,13 +15052,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:383
+#: en/git-commit.txt:385
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:388
+#: en/git-commit.txt:390
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14997,19 +15067,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:393
+#: en/git-commit.txt:395
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:398
+#: en/git-commit.txt:400
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:404
+#: en/git-commit.txt:406
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -15019,31 +15089,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:411
+#: en/git-commit.txt:413
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:414 en/git-commit.txt:440
+#: en/git-commit.txt:416 en/git-commit.txt:442
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:418
+#: en/git-commit.txt:420
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:426
+#: en/git-commit.txt:428
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:432
+#: en/git-commit.txt:434
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -15053,55 +15123,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:437
+#: en/git-commit.txt:439
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:448
+#: en/git-commit.txt:450
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:460
+#: en/git-commit.txt:462
#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:464
+#: en/git-commit.txt:466
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:469
+#: en/git-commit.txt:471
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:475
+#: en/git-commit.txt:477
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:479
+#: en/git-commit.txt:481
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:485
+#: en/git-commit.txt:487
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:493
+#: en/git-commit.txt:495
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -15775,211 +15845,229 @@ msgstr "Se deve ignorar as configura챌천es de leitura do arquivo $/etc/gitconfig
msgid "Given a .git/config like this:"
msgstr "Dado um .git/config como este:"
-#. type: Plain text
-#: en/git-config.txt:347
+#. type: delimited block -
+#: en/git-config.txt:348
#, no-wrap, priority:100
msgid ""
-"\t#\n"
-"\t# This is the config file, and\n"
-"\t# a '#' or ';' character indicates\n"
-"\t# a comment\n"
-"\t#\n"
+"#\n"
+"# This is the config file, and\n"
+"# a '#' or ';' character indicates\n"
+"# a comment\n"
+"#\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:352
+#. type: delimited block -
+#: en/git-config.txt:353 en/git.txt:310
#, no-wrap, priority:100
msgid ""
-"\t; core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"; core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:357
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/git-config.txt:358
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "\t# Our diff algorithm\n"
+#| "\t[diff]\n"
+#| "\t\texternal = /usr/local/bin/diff-wrapper\n"
+#| "\t\trenames = true\n"
msgid ""
-"\t; Our diff algorithm\n"
+"; Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
+msgstr ""
+"\t# Nosso algoritmo de diff\n"
"\t[diff]\n"
"\t\texternal = /usr/local/bin/diff-wrapper\n"
"\t\trenames = true\n"
-msgstr ""
-#. type: Plain text
-#: en/git-config.txt:362
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/git-config.txt:363
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "\t# Proxy settings\n"
+#| "\t[core]\n"
+#| "\t\tgitProxy=\"ssh\" for \"kernel.org\"\n"
+#| "\t\tgitProxy=default-proxy ; for the rest\n"
msgid ""
-"\t; Proxy settings\n"
-"\t[core]\n"
-"\t\tgitproxy=proxy-command for kernel.org\n"
-"\t\tgitproxy=default-proxy ; for all the rest\n"
+"; Proxy settings\n"
+"[core]\n"
+"\tgitproxy=proxy-command for kernel.org\n"
+"\tgitproxy=default-proxy ; for all the rest\n"
msgstr ""
+"\t# Configura챌천es de proxy\n"
+"\t[core]\n"
+"\t\tgitProxy=\"ssh\" para \"kernel.org\"\n"
+"\t\tgitProxy=default-proxy; para o resto\n"
-#. type: Plain text
-#: en/git-config.txt:369
+#. type: delimited block -
+#: en/git-config.txt:370
#, no-wrap, priority:100
msgid ""
-"\t; HTTP\n"
-"\t[http]\n"
-"\t\tsslVerify\n"
-"\t[http \"https://weak.example.com\"]\n"
-"\t\tsslVerify = false\n"
-"\t\tcookieFile = /tmp/cookie.txt\n"
+"; HTTP\n"
+"[http]\n"
+"\tsslVerify\n"
+"[http \"https://weak.example.com\"]\n"
+"\tsslVerify = false\n"
+"\tcookieFile = /tmp/cookie.txt\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:371
+#: en/git-config.txt:373
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:374
+#: en/git-config.txt:376
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:379
+#: en/git-config.txt:381
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:382
+#: en/git-config.txt:384
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:385
+#: en/git-config.txt:387
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:389
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:390
+#: en/git-config.txt:392
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:394
+#: en/git-config.txt:396
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:398
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:399
+#: en/git-config.txt:401
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:402 en/git-gui.txt:120 en/git-merge-index.txt:64
+#: en/git-config.txt:404 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:407
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:410
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:413
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:414
+#: en/git-config.txt:416
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:417
+#: en/git-config.txt:419
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:421
+#: en/git-config.txt:423
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:424
+#: en/git-config.txt:426
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:428
+#: en/git-config.txt:430
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:431
+#: en/git-config.txt:433
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:434
+#: en/git-config.txt:436
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:437
+#: en/git-config.txt:439
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:440
+#: en/git-config.txt:442
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:443
+#: en/git-config.txt:445
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:447
+#: en/git-config.txt:449
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:453
+#: en/git-config.txt:455
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15989,13 +16077,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:457
+#: en/git-config.txt:459
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:466
+#: en/git-config.txt:468
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16008,19 +16096,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:471 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1029 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
+#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:476
+#: en/git-config.txt:478
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:482
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -16028,13 +16116,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:483
+#: en/git-config.txt:485
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:488
+#: en/git-config.txt:490
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -17397,7 +17485,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
msgstr ""
#. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:234
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
#, no-wrap, priority:100
msgid "LIMITATIONS"
msgstr ""
@@ -18902,7 +18990,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:976
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:992
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19454,7 +19542,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:422
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:423
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -19550,13 +19638,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:982
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:998
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:988
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1004
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -19911,9 +19999,9 @@ msgid "This program dumps the given revisions in a form suitable to be piped int
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:22
+#: en/git-fast-export.txt:23
#, priority:100
-msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a kind of an interactive 'git filter-branch'."
+msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
@@ -20000,146 +20088,158 @@ msgstr ""
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
+#. type: Labeled list
+#: en/git-fast-export.txt:79
+#, ignore-same, no-wrap, priority:100
+msgid "--mark-tags"
+msgstr "--mark-tags"
+
+#. type: Plain text
+#: en/git-fast-export.txt:87
+#, priority:100
+msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
+msgstr ""
+
#. type: Plain text
-#: en/git-fast-export.txt:83
+#: en/git-fast-export.txt:92
#, priority:100
-msgid "Any commits that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
+msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:84
+#: en/git-fast-export.txt:93
#, ignore-same, no-wrap, priority:100
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
-#: en/git-fast-export.txt:89
+#: en/git-fast-export.txt:98
#, priority:100
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:90
+#: en/git-fast-export.txt:99
#, ignore-same, no-wrap, priority:100
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
-#: en/git-fast-export.txt:93
+#: en/git-fast-export.txt:102
#, priority:100
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:94
+#: en/git-fast-export.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
-#: en/git-fast-export.txt:101
+#: en/git-fast-export.txt:110
#, priority:100
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
+#: en/git-fast-export.txt:111 en/git-ls-tree.txt:72
#, ignore-same, no-wrap, priority:100
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
-#: en/git-fast-export.txt:107
+#: en/git-fast-export.txt:116
#, priority:100
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:108
+#: en/git-fast-export.txt:117
#, ignore-same, no-wrap, priority:100
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
-#: en/git-fast-export.txt:112
+#: en/git-fast-export.txt:121
#, priority:100
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:113
+#: en/git-fast-export.txt:122
#, ignore-same, no-wrap, priority:100
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
-#: en/git-fast-export.txt:124
+#: en/git-fast-export.txt:133
#, priority:100
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:125
+#: en/git-fast-export.txt:134
#, ignore-same, no-wrap, priority:100
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
-#: en/git-fast-export.txt:131
+#: en/git-fast-export.txt:140
#, priority:100
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:132
+#: en/git-fast-export.txt:141
#, no-wrap, priority:100
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:138
+#: en/git-fast-export.txt:147
#, priority:100
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be reencoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:139
+#: en/git-fast-export.txt:148
#, ignore-same, no-wrap, priority:100
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
-#: en/git-fast-export.txt:142
+#: en/git-fast-export.txt:151
#, priority:100
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:143
+#: en/git-fast-export.txt:152
#, ignore-ellipsis, no-wrap, priority:100
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:160
#, priority:100
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:157
+#: en/git-fast-export.txt:166
#, no-wrap, priority:100
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:162
+#: en/git-fast-export.txt:171
#, priority:100
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:167
+#: en/git-fast-export.txt:176
#, no-wrap, priority:100
msgid ""
"$ git fast-export master~5..master |\n"
@@ -20148,55 +20248,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:180
#, priority:100
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:175
+#: en/git-fast-export.txt:184
#, priority:100
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
-#: en/git-fast-export.txt:178
+#: en/git-fast-export.txt:187
#, no-wrap, priority:100
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:186
+#: en/git-fast-export.txt:195
#, priority:100
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:198
+#: en/git-fast-export.txt:207
#, priority:100
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:201
+#: en/git-fast-export.txt:210
#, priority:100
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:204
+#: en/git-fast-export.txt:213
#, no-wrap, priority:100
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:209
+#: en/git-fast-export.txt:218
#, priority:100
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:215
+#: en/git-fast-export.txt:224
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git init anon-repo\n"
@@ -20206,25 +20306,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:222
+#: en/git-fast-export.txt:231
#, priority:100
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:225
+#: en/git-fast-export.txt:234
#, no-wrap, priority:100
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:240
#, priority:100
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:239
+#: en/git-fast-export.txt:248
#, priority:100
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
@@ -20458,7 +20558,7 @@ msgid "See linkgit:git-config[1]"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:144 en/git-p4.txt:507
+#: en/git-fast-import.txt:144 en/git-filter-branch.txt:463 en/git-p4.txt:507
#, no-wrap, priority:100
msgid "PERFORMANCE"
msgstr ""
@@ -20692,7 +20792,7 @@ msgid "fast-import accepts several commands to update the current repository and
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:319 en/git-fast-import.txt:381
+#: en/git-fast-import.txt:319 en/git-fast-import.txt:388
#, ignore-same, no-wrap, priority:100
msgid "`commit`"
msgstr "`commit`"
@@ -20704,7 +20804,7 @@ msgid "Creates a new branch or updates an existing branch by creating a new comm
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:324 en/git-fast-import.txt:771
+#: en/git-fast-import.txt:324 en/git-fast-import.txt:778
#, ignore-same, no-wrap, priority:100
msgid "`tag`"
msgstr "`tag`"
@@ -20716,7 +20816,7 @@ msgid "Creates an annotated tag object from an existing commit or branch. Light
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:330 en/git-fast-import.txt:815
+#: en/git-fast-import.txt:330 en/git-fast-import.txt:823
#, ignore-same, no-wrap, priority:100
msgid "`reset`"
msgstr "`reset`"
@@ -20728,7 +20828,7 @@ msgid "Reset an existing branch (or a new branch) to a specific revision. This
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:335 en/git-fast-import.txt:844
+#: en/git-fast-import.txt:335 en/git-fast-import.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`blob`"
msgstr "`blob`"
@@ -20740,109 +20840,121 @@ msgid "Convert raw file data into a blob, for future use in a `commit` command.
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:340 en/git-fast-import.txt:917
+#: en/git-fast-import.txt:340 en/git-fast-import.txt:925
+#, ignore-same, no-wrap, priority:100
+msgid "`alias`"
+msgstr "`alias`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:346
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
+msgstr ""
+
+#. type: Title ~
+#: en/git-fast-import.txt:347 en/git-fast-import.txt:940
#, ignore-same, no-wrap, priority:100
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
-#: en/git-fast-import.txt:345
+#: en/git-fast-import.txt:352
#, priority:100
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:346 en/git-fast-import.txt:945
+#: en/git-fast-import.txt:353 en/git-fast-import.txt:968
#, ignore-same, no-wrap, priority:100
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
-#: en/git-fast-import.txt:350
+#: en/git-fast-import.txt:357
#, priority:100
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:351 en/git-fast-import.txt:1152
+#: en/git-fast-import.txt:358 en/git-fast-import.txt:1175
#, ignore-same, no-wrap, priority:100
msgid "`done`"
msgstr "`done`"
#. type: Plain text
-#: en/git-fast-import.txt:355
+#: en/git-fast-import.txt:362
#, priority:100
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:356 en/git-fast-import.txt:970
+#: en/git-fast-import.txt:363 en/git-fast-import.txt:993
#, ignore-same, no-wrap, priority:100
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
-#: en/git-fast-import.txt:360
+#: en/git-fast-import.txt:367
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:361 en/git-fast-import.txt:985
+#: en/git-fast-import.txt:368 en/git-fast-import.txt:1008
#, ignore-same, no-wrap, priority:100
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
-#: en/git-fast-import.txt:365
+#: en/git-fast-import.txt:372
#, priority:100
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:366 en/git-fast-import.txt:1016
+#: en/git-fast-import.txt:373 en/git-fast-import.txt:1039
#, ignore-same, no-wrap, priority:100
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
-#: en/git-fast-import.txt:370
+#: en/git-fast-import.txt:377
#, priority:100
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:371 en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:378 en/git-fast-import.txt:1092
#, ignore-same, no-wrap, priority:100
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
#, priority:100
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:1124
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:1147
#, ignore-same, no-wrap, priority:100
msgid "`option`"
msgstr "`option`"
#. type: Plain text
-#: en/git-fast-import.txt:379
+#: en/git-fast-import.txt:386
#, priority:100
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:384
+#: en/git-fast-import.txt:391
#, priority:100
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
#, no-wrap, priority:100
msgid ""
"\t'commit' SP <ref> LF\n"
@@ -20853,247 +20965,247 @@ msgid ""
"\t('encoding' SP <encoding>)?\n"
"\tdata\n"
"\t('from' SP <commit-ish> LF)?\n"
-"\t('merge' SP <commit-ish> LF)?\n"
+"\t('merge' SP <commit-ish> LF)*\n"
"\t(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*\n"
"\tLF?\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:405
+#: en/git-fast-import.txt:412
#, priority:100
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:411
+#: en/git-fast-import.txt:418
#, priority:100
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:417
+#: en/git-fast-import.txt:424
#, priority:100
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:425
+#: en/git-fast-import.txt:432
#, priority:100
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:432
+#: en/git-fast-import.txt:439
#, priority:100
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:434
+#: en/git-fast-import.txt:441
#, ignore-same, no-wrap, priority:100
msgid "`author`"
msgstr "`author`"
#. type: Plain text
-#: en/git-fast-import.txt:440
+#: en/git-fast-import.txt:447
#, priority:100
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:442
+#: en/git-fast-import.txt:449
#, ignore-same, no-wrap, priority:100
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
-#: en/git-fast-import.txt:445
+#: en/git-fast-import.txt:452
#, priority:100
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
#, priority:100
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:458
+#: en/git-fast-import.txt:465
#, priority:100
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:460
+#: en/git-fast-import.txt:467
#, ignore-same, no-wrap, priority:100
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
-#: en/git-fast-import.txt:464
+#: en/git-fast-import.txt:471
#, priority:100
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:466
+#: en/git-fast-import.txt:473
#, ignore-same, no-wrap, priority:100
msgid "`from`"
msgstr "`from`"
#. type: Plain text
-#: en/git-fast-import.txt:472
+#: en/git-fast-import.txt:479
#, priority:100
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
#, priority:100
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:485
+#: en/git-fast-import.txt:492
#, priority:100
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
#, priority:100
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:491
+#: en/git-fast-import.txt:498
#, priority:100
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:493
+#: en/git-fast-import.txt:500
#, priority:100
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:499
+#: en/git-fast-import.txt:506
#, priority:100
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:501
+#: en/git-fast-import.txt:508
#, priority:100
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:503
+#: en/git-fast-import.txt:510
#, priority:100
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
#, priority:100
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:509
+#: en/git-fast-import.txt:516
#, priority:100
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:512
+#: en/git-fast-import.txt:519
#, priority:100
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
#, no-wrap, priority:100
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:521
+#: en/git-fast-import.txt:528
#, priority:100
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:523
+#: en/git-fast-import.txt:530
#, ignore-same, no-wrap, priority:100
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
-#: en/git-fast-import.txt:531
+#: en/git-fast-import.txt:538
#, priority:100
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:534
+#: en/git-fast-import.txt:541
#, priority:100
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:536
+#: en/git-fast-import.txt:543
#, ignore-same, no-wrap, priority:100
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:540
+#: en/git-fast-import.txt:547
#, priority:100
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:541 en/git-fast-import.txt:708
+#: en/git-fast-import.txt:548 en/git-fast-import.txt:715
#, no-wrap, priority:100
msgid "External data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:544
+#: en/git-fast-import.txt:551
#, priority:100
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:547
+#: en/git-fast-import.txt:554
#, no-wrap, priority:100
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
#, priority:100
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:555 en/git-fast-import.txt:721
+#: en/git-fast-import.txt:562 en/git-fast-import.txt:728
#, no-wrap, priority:100
msgid "Inline data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:559
+#: en/git-fast-import.txt:566
#, priority:100
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
#, no-wrap, priority:100
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -21101,259 +21213,259 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:566 en/git-fast-import.txt:732
+#: en/git-fast-import.txt:573 en/git-fast-import.txt:739
#, priority:100
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:569
+#: en/git-fast-import.txt:576
#, priority:100
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
#, priority:100
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:574
+#: en/git-fast-import.txt:581
#, priority:100
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:575
+#: en/git-fast-import.txt:582
#, priority:100
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
#, priority:100
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:580
+#: en/git-fast-import.txt:587
#, priority:100
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:583
+#: en/git-fast-import.txt:590
#, priority:100
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:587
+#: en/git-fast-import.txt:594
#, priority:100
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:594
+#: en/git-fast-import.txt:601
#, priority:100
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
#, priority:100
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:598
+#: en/git-fast-import.txt:605
#, priority:100
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:599
+#: en/git-fast-import.txt:606
#, priority:100
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:600
+#: en/git-fast-import.txt:607
#, priority:100
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:602
+#: en/git-fast-import.txt:609
#, priority:100
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:604
+#: en/git-fast-import.txt:611
#, priority:100
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:606
+#: en/git-fast-import.txt:613
#, priority:100
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:608
+#: en/git-fast-import.txt:615
#, ignore-same, no-wrap, priority:100
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
-#: en/git-fast-import.txt:614
+#: en/git-fast-import.txt:621
#, priority:100
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
#, no-wrap, priority:100
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
#, priority:100
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:624
+#: en/git-fast-import.txt:631
#, ignore-same, no-wrap, priority:100
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
#, priority:100
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:632
+#: en/git-fast-import.txt:639
#, no-wrap, priority:100
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:638 en/git-fast-import.txt:658
+#: en/git-fast-import.txt:645 en/git-fast-import.txt:665
#, priority:100
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:643
+#: en/git-fast-import.txt:650
#, priority:100
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:645
+#: en/git-fast-import.txt:652
#, ignore-same, no-wrap, priority:100
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
-#: en/git-fast-import.txt:649
+#: en/git-fast-import.txt:656
#, priority:100
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:652
+#: en/git-fast-import.txt:659
#, no-wrap, priority:100
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:663
+#: en/git-fast-import.txt:670
#, priority:100
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:672
+#: en/git-fast-import.txt:679
#, priority:100
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
-#: en/git-fast-import.txt:679
+#: en/git-fast-import.txt:686
#, priority:100
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:682
+#: en/git-fast-import.txt:689
#, no-wrap, priority:100
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:688
+#: en/git-fast-import.txt:695
#, priority:100
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:696
+#: en/git-fast-import.txt:703
#, priority:100
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:698
+#: en/git-fast-import.txt:705
#, ignore-same, no-wrap, priority:100
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:707
+#: en/git-fast-import.txt:714
#, priority:100
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:712
+#: en/git-fast-import.txt:719
#, priority:100
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:715
+#: en/git-fast-import.txt:722
#, no-wrap, priority:100
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:720
+#: en/git-fast-import.txt:727
#, priority:100
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:725
+#: en/git-fast-import.txt:732
#, priority:100
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:729
+#: en/git-fast-import.txt:736
#, no-wrap, priority:100
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -21361,76 +21473,77 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:735
+#: en/git-fast-import.txt:742
#, priority:100
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:737
+#: en/git-fast-import.txt:744
#, ignore-same, no-wrap, priority:100
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
-#: en/git-fast-import.txt:743
+#: en/git-fast-import.txt:750
#, priority:100
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:746
+#: en/git-fast-import.txt:753
#, no-wrap, priority:100
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:752
+#: en/git-fast-import.txt:759
#, priority:100
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:756
+#: en/git-fast-import.txt:763
#, priority:100
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:758
+#: en/git-fast-import.txt:765
#, ignore-same, no-wrap, priority:100
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
-#: en/git-fast-import.txt:763
+#: en/git-fast-import.txt:770
#, priority:100
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:766
+#: en/git-fast-import.txt:773
#, no-wrap, priority:100
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:769
+#: en/git-fast-import.txt:776
#, priority:100
msgid "where `<object-identifer>` is any string not containing LF."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:774
+#: en/git-fast-import.txt:781
#, priority:100
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:781
+#: en/git-fast-import.txt:789
#, no-wrap, priority:100
msgid ""
"\t'tag' SP <name> LF\n"
+"\tmark?\n"
"\t'from' SP <commit-ish> LF\n"
"\toriginal-oid?\n"
"\t'tagger' (SP <name>)? SP LT <email> GT SP <when> LF\n"
@@ -21438,55 +21551,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:784
+#: en/git-fast-import.txt:792
#, priority:100
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:789
+#: en/git-fast-import.txt:797
#, priority:100
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:793
+#: en/git-fast-import.txt:801
#, priority:100
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:796
+#: en/git-fast-import.txt:804
#, priority:100
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:799
+#: en/git-fast-import.txt:807
#, priority:100
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:813
#, priority:100
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:813
+#: en/git-fast-import.txt:821
#, priority:100
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:820
+#: en/git-fast-import.txt:828
#, priority:100
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:825
+#: en/git-fast-import.txt:833
#, no-wrap, priority:100
msgid ""
"\t'reset' SP <ref> LF\n"
@@ -21495,25 +21608,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:829
+#: en/git-fast-import.txt:837
#, priority:100
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:831 en/git-fast-import.txt:943
+#: en/git-fast-import.txt:839 en/git-fast-import.txt:966
#, priority:100
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:834
+#: en/git-fast-import.txt:842
#, priority:100
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:838
+#: en/git-fast-import.txt:846
#, no-wrap, priority:100
msgid ""
"\treset refs/tags/938\n"
@@ -21521,19 +21634,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:850
#, priority:100
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:849
+#: en/git-fast-import.txt:857
#, priority:100
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:855
+#: en/git-fast-import.txt:863
#, no-wrap, priority:100
msgid ""
"\t'blob' LF\n"
@@ -21543,43 +21656,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:861
+#: en/git-fast-import.txt:869
#, priority:100
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:871
#, ignore-same, no-wrap, priority:100
msgid "`data`"
msgstr "`data`"
#. type: Plain text
-#: en/git-fast-import.txt:870
+#: en/git-fast-import.txt:878
#, priority:100
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:875
+#: en/git-fast-import.txt:883
#, priority:100
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:876
+#: en/git-fast-import.txt:884
#, no-wrap, priority:100
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:878
+#: en/git-fast-import.txt:886
#, priority:100
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:882
+#: en/git-fast-import.txt:890
#, no-wrap, priority:100
msgid ""
"\t'data' SP <count> LF\n"
@@ -21587,31 +21700,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:888
+#: en/git-fast-import.txt:896
#, priority:100
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:893
+#: en/git-fast-import.txt:901
#, priority:100
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:894
+#: en/git-fast-import.txt:902
#, no-wrap, priority:100
msgid "Delimited format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:899
+#: en/git-fast-import.txt:907
#, priority:100
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:905
+#: en/git-fast-import.txt:913
#, no-wrap, priority:100
msgid ""
"\t'data' SP '<<' <delim> LF\n"
@@ -21621,25 +21734,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:921
#, priority:100
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:915
+#: en/git-fast-import.txt:923
#, priority:100
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:920
+#: en/git-fast-import.txt:928
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object."
+msgstr ""
+
+#. type: delimited block .
+#: en/git-fast-import.txt:934
+#, no-wrap, priority:100
+msgid ""
+"\t'alias' LF\n"
+"\tmark\n"
+"\t'to' SP <commit-ish> LF\n"
+"\tLF?\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:937
+#, priority:100
+msgid "For a detailed description of `<commit-ish>` see above under `from`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:943
#, priority:100
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:924
+#: en/git-fast-import.txt:947
#, no-wrap, priority:100
msgid ""
"\t'checkpoint' LF\n"
@@ -21647,31 +21782,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:930
+#: en/git-fast-import.txt:953
#, priority:100
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:935
+#: en/git-fast-import.txt:958
#, priority:100
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:941
+#: en/git-fast-import.txt:964
#, priority:100
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:950
+#: en/git-fast-import.txt:973
#, priority:100
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:954
+#: en/git-fast-import.txt:977
#, no-wrap, priority:100
msgid ""
"\t'progress' SP <any> LF\n"
@@ -21679,67 +21814,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:960
+#: en/git-fast-import.txt:983
#, priority:100
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:986
#, no-wrap, priority:100
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:968
+#: en/git-fast-import.txt:991
#, priority:100
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:976
+#: en/git-fast-import.txt:999
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:979
+#: en/git-fast-import.txt:1002
#, no-wrap, priority:100
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:983 en/git-fast-import.txt:1014 en/git-fast-import.txt:1067
+#: en/git-fast-import.txt:1006 en/git-fast-import.txt:1037 en/git-fast-import.txt:1090
#, priority:100
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:991
+#: en/git-fast-import.txt:1014
#, priority:100
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:994
+#: en/git-fast-import.txt:1017
#, no-wrap, priority:100
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1022
#, priority:100
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:1024
#, priority:100
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1005
+#: en/git-fast-import.txt:1028
#, no-wrap, priority:100
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21747,283 +21882,283 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1011
+#: en/git-fast-import.txt:1034
#, priority:100
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1022
+#: en/git-fast-import.txt:1045
#, priority:100
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1025
+#: en/git-fast-import.txt:1048
#, priority:100
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1049
#, no-wrap, priority:100
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1030
+#: en/git-fast-import.txt:1053
#, priority:100
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1033
+#: en/git-fast-import.txt:1056
#, no-wrap, priority:100
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1035
+#: en/git-fast-import.txt:1058
#, no-wrap, priority:100
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1041
+#: en/git-fast-import.txt:1064
#, priority:100
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1044
+#: en/git-fast-import.txt:1067
#, no-wrap, priority:100
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1047
+#: en/git-fast-import.txt:1070
#, priority:100
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1072
#, priority:100
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1075
#, no-wrap, priority:100
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1080
#, priority:100
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1060
+#: en/git-fast-import.txt:1083
#, priority:100
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1086
#, no-wrap, priority:100
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1072
+#: en/git-fast-import.txt:1095
#, priority:100
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1075
+#: en/git-fast-import.txt:1098
#, no-wrap, priority:100
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1078
+#: en/git-fast-import.txt:1101
#, priority:100
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1079 en/git-fast-import.txt:1146
+#: en/git-fast-import.txt:1102 en/git-fast-import.txt:1169
#, no-wrap, priority:100
msgid "date-format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1080 en/git-fast-import.txt:1148
+#: en/git-fast-import.txt:1103 en/git-fast-import.txt:1171
#, no-wrap, priority:100
msgid "export-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1081
+#: en/git-fast-import.txt:1104
#, no-wrap, priority:100
msgid "relative-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1082
+#: en/git-fast-import.txt:1105
#, no-wrap, priority:100
msgid "no-relative-marks"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1083 en/git-fast-import.txt:1150
+#: en/git-fast-import.txt:1106 en/git-fast-import.txt:1173
#, no-wrap, priority:100
msgid "force"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1087
+#: en/git-fast-import.txt:1110
#, priority:100
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1088 en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1111 en/git-fast-import.txt:1170
#, no-wrap, priority:100
msgid "import-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1089
+#: en/git-fast-import.txt:1112
#, no-wrap, priority:100
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1097
+#: en/git-fast-import.txt:1120
#, priority:100
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1098
+#: en/git-fast-import.txt:1121
#, no-wrap, priority:100
msgid "get-mark"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1122
#, no-wrap, priority:100
msgid "cat-blob"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1100
+#: en/git-fast-import.txt:1123
#, no-wrap, priority:100
msgid "ls"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1108
+#: en/git-fast-import.txt:1131
#, priority:100
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1109
+#: en/git-fast-import.txt:1132
#, no-wrap, priority:100
msgid "notes"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1114
+#: en/git-fast-import.txt:1137
#, priority:100
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1138
#, no-wrap, priority:100
msgid "done"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1122
+#: en/git-fast-import.txt:1145
#, priority:100
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1129
+#: en/git-fast-import.txt:1152
#, priority:100
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1132
+#: en/git-fast-import.txt:1155
#, no-wrap, priority:100
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1137
+#: en/git-fast-import.txt:1160
#, priority:100
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1141
+#: en/git-fast-import.txt:1164
#, priority:100
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1144
+#: en/git-fast-import.txt:1167
#, priority:100
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1149
+#: en/git-fast-import.txt:1172
#, priority:100
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1178
#, priority:100
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1159
+#: en/git-fast-import.txt:1182
#, priority:100
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1161
+#: en/git-fast-import.txt:1184
#, no-wrap, priority:100
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1168
+#: en/git-fast-import.txt:1191
#, priority:100
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1175
+#: en/git-fast-import.txt:1198
#, priority:100
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1203
#, no-wrap, priority:100
msgid ""
"\tmkfifo fast-import-output\n"
@@ -22032,49 +22167,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1184
+#: en/git-fast-import.txt:1207
#, priority:100
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1188
+#: en/git-fast-import.txt:1211
#, priority:100
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1213
#, no-wrap, priority:100
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1196
+#: en/git-fast-import.txt:1219
#, priority:100
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1203
+#: en/git-fast-import.txt:1226
#, priority:100
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1211
+#: en/git-fast-import.txt:1234
#, priority:100
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1236
#, priority:100
msgid "An example crash:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1229
+#: en/git-fast-import.txt:1252
#, no-wrap, priority:100
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
@@ -22094,7 +22229,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1256
#, no-wrap, priority:100
msgid ""
"\t$ git fast-import <in\n"
@@ -22103,7 +22238,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1239
+#: en/git-fast-import.txt:1262
#, no-wrap, priority:100
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
@@ -22114,13 +22249,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1241
+#: en/git-fast-import.txt:1264
#, no-wrap, priority:100
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1251
+#: en/git-fast-import.txt:1274
#, no-wrap, priority:100
msgid ""
"\tMost Recent Commands Before Crash\n"
@@ -22135,13 +22270,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1252
+#: en/git-fast-import.txt:1275
#, no-wrap, priority:100
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1255
+#: en/git-fast-import.txt:1278
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
@@ -22149,25 +22284,25 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1256
+#: en/git-fast-import.txt:1279
#, no-wrap, priority:100
msgid "active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1259
+#: en/git-fast-import.txt:1282
#, priority:100
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1260
+#: en/git-fast-import.txt:1283
#, priority:100
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1264
+#: en/git-fast-import.txt:1287
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
@@ -22176,7 +22311,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1270
+#: en/git-fast-import.txt:1293
#, no-wrap, priority:100
msgid ""
"status : active loaded dirty\n"
@@ -22188,307 +22323,307 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1274
+#: en/git-fast-import.txt:1297
#, priority:100
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1277
+#: en/git-fast-import.txt:1300
#, no-wrap, priority:100
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1280
+#: en/git-fast-import.txt:1303
#, priority:100
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1282
+#: en/git-fast-import.txt:1305
#, no-wrap, priority:100
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1290
+#: en/git-fast-import.txt:1313
#, priority:100
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1294
+#: en/git-fast-import.txt:1317
#, priority:100
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1296
+#: en/git-fast-import.txt:1319
#, no-wrap, priority:100
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1301
+#: en/git-fast-import.txt:1324
#, priority:100
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1305
+#: en/git-fast-import.txt:1328
#, priority:100
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1307
+#: en/git-fast-import.txt:1330
#, no-wrap, priority:100
msgid "Handling Renames"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1312
+#: en/git-fast-import.txt:1335
#, priority:100
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1337
#, no-wrap, priority:100
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1341
#, priority:100
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1325
+#: en/git-fast-import.txt:1348
#, priority:100
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1331
+#: en/git-fast-import.txt:1354
#, priority:100
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1337
+#: en/git-fast-import.txt:1360
#, priority:100
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1363
#, priority:100
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1342
+#: en/git-fast-import.txt:1365
#, no-wrap, priority:100
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1346
+#: en/git-fast-import.txt:1369
#, priority:100
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1353
+#: en/git-fast-import.txt:1376
#, priority:100
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1358
+#: en/git-fast-import.txt:1381
#, priority:100
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1360
+#: en/git-fast-import.txt:1383
#, no-wrap, priority:100
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1367
+#: en/git-fast-import.txt:1390
#, priority:100
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1369
+#: en/git-fast-import.txt:1392
#, no-wrap, priority:100
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1399
#, priority:100
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1379
+#: en/git-fast-import.txt:1402
#, no-wrap, priority:100
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1385
+#: en/git-fast-import.txt:1408
#, priority:100
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1393
+#: en/git-fast-import.txt:1416
#, priority:100
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1423
#, priority:100
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1407
+#: en/git-fast-import.txt:1430
#, priority:100
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1415
+#: en/git-fast-import.txt:1438
#, priority:100
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1417
+#: en/git-fast-import.txt:1440
#, no-wrap, priority:100
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1423
+#: en/git-fast-import.txt:1446
#, priority:100
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1448
#, no-wrap, priority:100
msgid "per object"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1432
+#: en/git-fast-import.txt:1455
#, priority:100
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1438
+#: en/git-fast-import.txt:1461
#, priority:100
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1440
+#: en/git-fast-import.txt:1463
#, no-wrap, priority:100
msgid "per mark"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1446
+#: en/git-fast-import.txt:1469
#, priority:100
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1448
+#: en/git-fast-import.txt:1471
#, no-wrap, priority:100
msgid "per branch"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1474
#, priority:100
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1457
+#: en/git-fast-import.txt:1480
#, priority:100
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1464
+#: en/git-fast-import.txt:1487
#, priority:100
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1468
+#: en/git-fast-import.txt:1491
#, priority:100
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1496
#, priority:100
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1498
#, no-wrap, priority:100
msgid "per active tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1480
+#: en/git-fast-import.txt:1503
#, priority:100
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1482
+#: en/git-fast-import.txt:1505
#, no-wrap, priority:100
msgid "per active file entry"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1488
+#: en/git-fast-import.txt:1511
#, priority:100
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1493
+#: en/git-fast-import.txt:1516
#, priority:100
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1495
+#: en/git-fast-import.txt:1518
#, no-wrap, priority:100
msgid "SIGNALS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1501
+#: en/git-fast-import.txt:1524
#, priority:100
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -23049,7 +23184,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1041
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -23165,20 +23300,32 @@ msgid ""
"\t[--state-branch <branch>] [--] [<rev-list options>...]\n"
msgstr ""
+#. type: Title -
+#: en/git-filter-branch.txt:20
+#, no-wrap, priority:100
+msgid "WARNING"
+msgstr ""
+
#. type: Plain text
-#: en/git-filter-branch.txt:27
+#: en/git-filter-branch.txt:31
+#, priority:100
+msgid "'git filter-branch' has a plethora of pitfalls that can produce non-obvious manglings of the intended history rewrite (and can leave you with little time to investigate such problems since it has such abysmal performance). These safety and performance issues cannot be backward compatibly fixed and as such, its use is not recommended. Please use an alternative history filtering tool such as https://github.com/newren/git-filter-repo/[git filter-repo]. If you still need to use 'git filter-branch', please carefully read <<SAFETY>> (and <<PERFORMANCE>>) to learn about the land mines of filter-branch, and then vigilantly avoid as many of the hazards listed there as reasonably possible."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:40
#, priority:100
msgid "Lets you rewrite Git revision history by rewriting the branches mentioned in the <rev-list options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge information) will be preserved."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:34
+#: en/git-filter-branch.txt:47
#, priority:100
msgid "The command will only rewrite the _positive_ refs mentioned in the command line (e.g. if you pass 'a..b', only 'b' will be rewritten). If you specify no filters, the commits will be recommitted without any changes, which would normally have no effect. Nevertheless, this may be useful in the future for compensating for some Git bugs or such, therefore such a usage is permitted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:39
+#: en/git-filter-branch.txt:52
#, no-wrap, priority:100
msgid ""
"*NOTE*: This command honors `.git/info/grafts` file and refs in\n"
@@ -23188,7 +23335,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:48
+#: en/git-filter-branch.txt:61
#, no-wrap, priority:100
msgid ""
"*WARNING*! The rewritten history will have different object names for all\n"
@@ -23202,337 +23349,337 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:52
+#: en/git-filter-branch.txt:65
#, priority:100
msgid "Always verify that the rewritten version is correct: The original refs, if different from the rewritten ones, will be stored in the namespace 'refs/original/'."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:56
+#: en/git-filter-branch.txt:69
#, priority:100
msgid "Note that since this operation is very I/O expensive, it might be a good idea to redirect the temporary directory off-disk with the `-d` option, e.g. on tmpfs. Reportedly the speedup is very noticeable."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:59
+#: en/git-filter-branch.txt:72
#, no-wrap, priority:100
msgid "Filters"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:71
+#: en/git-filter-branch.txt:84
#, priority:100
msgid "The filters are applied in the order as listed below. The <command> argument is always evaluated in the shell context using the 'eval' command (with the notable exception of the commit filter, for technical reasons). Prior to that, the `$GIT_COMMIT` environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, and GIT_COMMITTER_DATE are taken from the current commit and exported to the environment, in order to affect the author and committer identities of the replacement commit created by linkgit:git-commit-tree[1] after the filters have run."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:74
+#: en/git-filter-branch.txt:87
#, priority:100
msgid "If any evaluation of <command> returns a non-zero exit status, the whole operation will be aborted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:80
+#: en/git-filter-branch.txt:93
#, priority:100
msgid "A 'map' function is available that takes an \"original sha1 id\" argument and outputs a \"rewritten sha1 id\" if the commit has been already rewritten, and \"original sha1 id\" otherwise; the 'map' function can return several ids on separate lines if your commit filter emitted multiple commits."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:85
+#: en/git-filter-branch.txt:98
#, no-wrap, priority:100
msgid "--setup <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:91
+#: en/git-filter-branch.txt:104
#, priority:100
msgid "This is not a real filter executed for each commit but a one time setup just before the loop. Therefore no commit-specific variables are defined yet. Functions or variables defined here can be used or modified in the following filter steps except the commit filter, for technical reasons."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:92
+#: en/git-filter-branch.txt:105
#, no-wrap, priority:100
msgid "--subdirectory-filter <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:96
+#: en/git-filter-branch.txt:109
#, priority:100
msgid "Only look at the history which touches the given subdirectory. The result will contain that directory (and only that) as its project root. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:97
+#: en/git-filter-branch.txt:110
#, no-wrap, priority:100
msgid "--env-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:102
+#: en/git-filter-branch.txt:115
#, priority:100
msgid "This filter may be used if you only need to modify the environment in which the commit will be performed. Specifically, you might want to rewrite the author/committer name/email/time environment variables (see linkgit:git-commit-tree[1] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:103
+#: en/git-filter-branch.txt:116
#, no-wrap, priority:100
msgid "--tree-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:110
+#: en/git-filter-branch.txt:123
#, priority:100
msgid "This is the filter for rewriting the tree and its contents. The argument is evaluated in shell with the working directory set to the root of the checked out tree. The new tree is then used as-is (new files are auto-added, disappeared files are auto-removed - neither .gitignore files nor any other ignore rules *HAVE ANY EFFECT*!)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:111
+#: en/git-filter-branch.txt:124
#, no-wrap, priority:100
msgid "--index-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:117
+#: en/git-filter-branch.txt:130
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the index. It is similar to the tree filter but does not check out the tree, which makes it much faster. Frequently used with `git rm --cached --ignore-unmatch ...`, see EXAMPLES below. For hairy cases, see linkgit:git-update-index[1]."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:118
+#: en/git-filter-branch.txt:131
#, no-wrap, priority:100
msgid "--parent-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:125
+#: en/git-filter-branch.txt:138
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the commit's parent list. It will receive the parent string on stdin and shall output the new parent string on stdout. The parent string is in the format described in linkgit:git-commit-tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and \"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:126
+#: en/git-filter-branch.txt:139
#, no-wrap, priority:100
msgid "--msg-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:131
+#: en/git-filter-branch.txt:144
#, priority:100
msgid "This is the filter for rewriting the commit messages. The argument is evaluated in the shell with the original commit message on standard input; its standard output is used as the new commit message."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:132
+#: en/git-filter-branch.txt:145
#, no-wrap, priority:100
msgid "--commit-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:138
+#: en/git-filter-branch.txt:151
#, ignore-ellipsis, priority:100
msgid "This is the filter for performing the commit. If this filter is specified, it will be called instead of the 'git commit-tree' command, with arguments of the form \"<TREE_ID> [(-p <PARENT_COMMIT_ID>)...]\" and the log message on stdin. The commit id is expected on stdout."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:142
+#: en/git-filter-branch.txt:155
#, priority:100
msgid "As a special extension, the commit filter may emit multiple commit ids; in that case, the rewritten children of the original commit will have all of them as parents."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:147
+#: en/git-filter-branch.txt:160
#, priority:100
msgid "You can use the 'map' convenience function in this filter, and other convenience functions, too. For example, calling 'skip_commit \"$@\"' will leave out the current commit (but not its changes! If you want that, use 'git rebase' instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:151
+#: en/git-filter-branch.txt:164
#, priority:100
msgid "You can also use the `git_commit_non_empty_tree \"$@\"` instead of `git commit-tree \"$@\"` if you don't wish to keep commits with a single parent and that makes no change to the tree."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:152
+#: en/git-filter-branch.txt:165
#, no-wrap, priority:100
msgid "--tag-name-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:158
+#: en/git-filter-branch.txt:171
#, priority:100
msgid "This is the filter for rewriting tag names. When passed, it will be called for every tag ref that points to a rewritten object (or to a tag object which points to a rewritten object). The original tag name is passed via standard input, and the new tag name is expected on standard output."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:163
+#: en/git-filter-branch.txt:176
#, priority:100
msgid "The original tags are not deleted, but can be overwritten; use \"--tag-name-filter cat\" to simply update the tags. In this case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:174
+#: en/git-filter-branch.txt:187
#, priority:100
msgid "Nearly proper rewriting of tag objects is supported. If the tag has a message attached, a new tag object will be created with the same message, author, and timestamp. If the tag has a signature attached, the signature will be stripped. It is by definition impossible to preserve signatures. The reason this is \"nearly\" proper, is because ideally if the tag did not change (points to the same object, has the same name, etc.) it should retain any signature. That is not the case, signatures will always be removed, buyer beware. There is also no support for changing the author or timestamp (or the tag message for that matter). Tags which point to other tags will be rewritten to point to the underlying commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:175
+#: en/git-filter-branch.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--prune-empty"
msgstr "--prune-empty"
#. type: Plain text
-#: en/git-filter-branch.txt:182
+#: en/git-filter-branch.txt:195
#, priority:100
msgid "Some filters will generate empty commits that leave the tree untouched. This option instructs git-filter-branch to remove such commits if they have exactly one or zero non-pruned parents; merge commits will therefore remain intact. This option cannot be used together with `--commit-filter`, though the same effect can be achieved by using the provided `git_commit_non_empty_tree` function in a commit filter."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:183
+#: en/git-filter-branch.txt:196
#, no-wrap, priority:100
msgid "--original <namespace>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:186
+#: en/git-filter-branch.txt:199
#, priority:100
msgid "Use this option to set the namespace where the original commits will be stored. The default value is 'refs/original'."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:187
+#: en/git-filter-branch.txt:200
#, no-wrap, priority:100
msgid "-d <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:194
+#: en/git-filter-branch.txt:207
#, priority:100
msgid "Use this option to set the path to the temporary directory used for rewriting. When applying a tree filter, the command needs to temporarily check out the tree to some directory, which may consume considerable space in case of large projects. By default it does this in the `.git-rewrite/` directory but you can override that choice by this parameter."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:200
+#: en/git-filter-branch.txt:213
#, priority:100
msgid "'git filter-branch' refuses to start with an existing temporary directory or when there are already refs starting with 'refs/original/', unless forced."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:201
+#: en/git-filter-branch.txt:214
#, no-wrap, priority:100
msgid "--state-branch <branch>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:206
+#: en/git-filter-branch.txt:219
#, priority:100
msgid "This option will cause the mapping from old to new objects to be loaded from named branch upon startup and saved as a new commit to that branch upon exit, enabling incremental of large trees. If '<branch>' does not exist it will be created."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:207
+#: en/git-filter-branch.txt:220
#, ignore-ellipsis, no-wrap, priority:100
msgid "<rev-list options>..."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:212
+#: en/git-filter-branch.txt:225
#, priority:100
msgid "Arguments for 'git rev-list'. All positive refs included by these options are rewritten. You may also specify options such as `--all`, but you must use `--` to separate them from the 'git filter-branch' options. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:216
+#: en/git-filter-branch.txt:229
#, no-wrap, priority:100
msgid "Remap to ancestor"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:223
+#: en/git-filter-branch.txt:236
#, priority:100
msgid "By using linkgit:git-rev-list[1] arguments, e.g., path limiters, you can limit the set of revisions which get rewritten. However, positive refs on the command line are distinguished: we don't let them be excluded by such limiters. For this purpose, they are instead rewritten to point at the nearest ancestor that was not excluded."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:231
+#: en/git-filter-branch.txt:244
#, priority:100
msgid "On success, the exit status is `0`. If the filter can't find any commits to rewrite, the exit status is `2`. On any other error, the exit status may be any other non-zero value."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:238
+#: en/git-filter-branch.txt:251
#, priority:100
msgid "Suppose you want to remove a file (containing confidential information or copyright violation) from all commits:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:241
+#: en/git-filter-branch.txt:254
#, no-wrap, priority:100
msgid "git filter-branch --tree-filter 'rm filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:246
+#: en/git-filter-branch.txt:259
#, priority:100
msgid "However, if the file is absent from the tree of some commit, a simple `rm filename` will fail for that tree and commit. Thus you may instead want to use `rm -f filename` as the script."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:252
+#: en/git-filter-branch.txt:265
#, priority:100
msgid "Using `--index-filter` with 'git rm' yields a significantly faster version. Like with using `rm filename`, `git rm --cached filename` will fail if the file is absent from the tree of a commit. If you want to \"completely forget\" a file, it does not matter when it entered history, so we also add `--ignore-unmatch`:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:255
+#: en/git-filter-branch.txt:268
#, no-wrap, priority:100
msgid "git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:258
+#: en/git-filter-branch.txt:271
#, priority:100
msgid "Now, you will get the rewritten history saved in HEAD."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:261
+#: en/git-filter-branch.txt:274
#, priority:100
msgid "To rewrite the repository to look as if `foodir/` had been its project root, and discard all other history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:264
+#: en/git-filter-branch.txt:277
#, no-wrap, priority:100
msgid "git filter-branch --subdirectory-filter foodir -- --all\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:269
+#: en/git-filter-branch.txt:282
#, priority:100
msgid "Thus you can, e.g., turn a library subdirectory into a repository of its own. Note the `--` that separates 'filter-branch' options from revision options, and the `--all` to rewrite all branches and tags."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:273
+#: en/git-filter-branch.txt:286
#, priority:100
msgid "To set a commit (which typically is at the tip of another history) to be the parent of the current initial commit, in order to paste the other history behind the current history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:276
+#: en/git-filter-branch.txt:289
#, no-wrap, priority:100
msgid "git filter-branch --parent-filter 'sed \"s/^\\$/-p <graft-id>/\"' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:282
+#: en/git-filter-branch.txt:295
#, priority:100
msgid "(if the parent string is empty - which happens when we are dealing with the initial commit - add graftcommit as a parent). Note that this assumes history with a single root (that is, no merge without common ancestors happened). If this is not the case, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:286
+#: en/git-filter-branch.txt:299
#, no-wrap, priority:100
msgid ""
"git filter-branch --parent-filter \\\n"
@@ -23540,13 +23687,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:289
+#: en/git-filter-branch.txt:302
#, priority:100
msgid "or even simpler:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:293
+#: en/git-filter-branch.txt:306
#, no-wrap, priority:100
msgid ""
"git replace --graft $commit-id $graft-id\n"
@@ -23554,13 +23701,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:296
+#: en/git-filter-branch.txt:309
#, priority:100
msgid "To remove commits authored by \"Darl McBribe\" from the history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:305
+#: en/git-filter-branch.txt:318
#, no-wrap, priority:100
msgid ""
"git filter-branch --commit-filter '\n"
@@ -23573,13 +23720,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:308
+#: en/git-filter-branch.txt:321
#, priority:100
msgid "The function 'skip_commit' is defined as follows:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:320
+#: en/git-filter-branch.txt:333
#, no-wrap, priority:100
msgid ""
"skip_commit()\n"
@@ -23595,13 +23742,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:327
+#: en/git-filter-branch.txt:340
#, priority:100
msgid "The shift magic first throws away the tree id and then the -p parameters. Note that this handles merges properly! In case Darl committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 as their parents instead of the merge commit."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:332
+#: en/git-filter-branch.txt:345
#, no-wrap, priority:100
msgid ""
"*NOTE* the changes introduced by the commits, and which are not reverted\n"
@@ -23611,13 +23758,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:336
+#: en/git-filter-branch.txt:349
#, priority:100
msgid "You can rewrite the commit log messages using `--msg-filter`. For example, 'git svn-id' strings in a repository created by 'git svn' can be removed this way:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:341
+#: en/git-filter-branch.txt:354
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23626,13 +23773,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:345
+#: en/git-filter-branch.txt:358
#, priority:100
msgid "If you need to add 'Acked-by' lines to, say, the last 10 commits (none of which is a merge), use this command:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:351
+#: en/git-filter-branch.txt:364
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23642,13 +23789,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:357
+#: en/git-filter-branch.txt:370
#, priority:100
msgid "The `--env-filter` option can be used to modify committer and/or author identity. For example, if you found out that your commits have the wrong identity due to a misconfigured user.email, you can make a correction, before publishing the project, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:369
+#: en/git-filter-branch.txt:382
#, no-wrap, priority:100
msgid ""
"git filter-branch --env-filter '\n"
@@ -23664,19 +23811,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:375
+#: en/git-filter-branch.txt:388
#, priority:100
msgid "To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will point to the top-most revision that a 'git rev-list' of this range will print."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:377
+#: en/git-filter-branch.txt:390
#, priority:100
msgid "Consider this history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:382
+#: en/git-filter-branch.txt:395
#, no-wrap, priority:100
msgid ""
" D--E--F--G--H\n"
@@ -23685,25 +23832,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:385
+#: en/git-filter-branch.txt:398
#, priority:100
msgid "To rewrite only commits D,E,F,G,H, but leave A, B and C alone, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:388
+#: en/git-filter-branch.txt:401
#, ignore-ellipsis, no-wrap, priority:100
msgid "git filter-branch ... C..H\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:391
+#: en/git-filter-branch.txt:404
#, priority:100
msgid "To rewrite commits E,F,G,H, use one of these:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:395
+#: en/git-filter-branch.txt:408
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"git filter-branch ... C..H --not D\n"
@@ -23711,13 +23858,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:398
+#: en/git-filter-branch.txt:411
#, priority:100
msgid "To move the whole tree into a subdirectory, or remove it from there:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:405
+#: en/git-filter-branch.txt:418
#, no-wrap, priority:100
msgid ""
"git filter-branch --index-filter \\\n"
@@ -23728,87 +23875,279 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-filter-branch.txt:410
+#: en/git-filter-branch.txt:423
#, no-wrap, priority:100
msgid "CHECKLIST FOR SHRINKING A REPOSITORY"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:418
+#: en/git-filter-branch.txt:431
#, priority:100
msgid "git-filter-branch can be used to get rid of a subset of files, usually with some combination of `--index-filter` and `--subdirectory-filter`. People expect the resulting repository to be smaller than the original, but you need a few more steps to actually make it smaller, because Git tries hard not to lose your objects until you tell it to. First make sure that:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:422
+#: en/git-filter-branch.txt:435
#, priority:100
msgid "You really removed all variants of a filename, if a blob was moved over its lifetime. `git log --name-only --follow --all -- filename` can help you find renames."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:425
+#: en/git-filter-branch.txt:438
#, priority:100
msgid "You really filtered all refs: use `--tag-name-filter cat -- --all` when calling git-filter-branch."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:428
+#: en/git-filter-branch.txt:441
#, priority:100
msgid "Then there are two ways to get a smaller repository. A safer way is to clone, that keeps your original intact."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:432
+#: en/git-filter-branch.txt:445
#, priority:100
msgid "Clone it with `git clone file:///path/to/repo`. The clone will not have the removed objects. See linkgit:git-clone[1]. (Note that cloning with a plain path just hardlinks everything!)"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:437
+#: en/git-filter-branch.txt:450
#, priority:100
msgid "If you really don't want to clone it, for whatever reasons, check the following points instead (in this order). This is a very destructive approach, so *make a backup* or go back to cloning it. You have been warned."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:441
+#: en/git-filter-branch.txt:454
#, priority:100
msgid "Remove the original refs backed up by git-filter-branch: say `git for-each-ref --format=\"%(refname)\" refs/original/ | xargs -n 1 git update-ref -d`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:443
+#: en/git-filter-branch.txt:456
#, priority:100
msgid "Expire all reflogs with `git reflog expire --expire=now --all`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:447
+#: en/git-filter-branch.txt:460
#, priority:100
msgid "Garbage collect all unreferenced objects with `git gc --prune=now` (or if your git-gc is not new enough to support arguments to `--prune`, use `git repack -ad; git prune` instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:459
+#: en/git-filter-branch.txt:467
#, priority:100
-msgid "git-filter-branch allows you to make complex shell-scripted rewrites of your Git history, but you probably don't need this flexibility if you're simply _removing unwanted data_ like large files or passwords. For those operations you may want to consider http://rtyley.github.io/bfg-repo-cleaner/[The BFG Repo-Cleaner], a JVM-based alternative to git-filter-branch, typically at least 10-50x faster for those use-cases, and with quite different characteristics:"
+msgid "The performance of git-filter-branch is glacially slow; its design makes it impossible for a backward-compatible implementation to ever be fast:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:467
+#: en/git-filter-branch.txt:473
#, priority:100
-msgid "Any particular version of a file is cleaned exactly _once_. The BFG, unlike git-filter-branch, does not give you the opportunity to handle a file differently based on where or when it was committed within your history. This constraint gives the core performance benefit of The BFG, and is well-suited to the task of cleansing bad data - you don't care _where_ the bad data is, you just want it _gone_."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:473
+#: en/git-filter-branch.txt:476
+#, priority:100
+msgid "If you try and cheat and try to make git-filter-branch only work on files modified in a commit, then two things happen"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:482
+#, priority:100
+msgid "you run into problems with deletions whenever the user is simply trying to rename files (because attempting to delete files that don't exist looks like a no-op; it takes some chicanery to remap deletes across file renames when the renames happen via arbitrary user-provided shell)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:488
+#, priority:100
+msgid "even if you succeed at the map-deletes-for-renames chicanery, you still technically violate backward compatibility because users are allowed to filter files in ways that depend upon topology of commits instead of filtering solely based on file contents or names (though this has not been observed in the wild)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:494
+#, priority:100
+msgid "Even if you don't need to edit files but only want to e.g. rename or remove some and thus can avoid checking out each file (i.e. you can use --index-filter), you still are passing shell snippets for your filters. This means that for every commit, you have to have a prepared git repo where those filters can be run. That's a significant setup."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:505
+#, priority:100
+msgid "Further, several additional files are created or updated per commit by git-filter-branch. Some of these are for supporting the convenience functions provided by git-filter-branch (such as map()), while others are for keeping track of internal state (but could have also been accessed by user filters; one of git-filter-branch's regression tests does so). This essentially amounts to using the filesystem as an IPC mechanism between git-filter-branch and the user-provided filters. Disks tend to be a slow IPC mechanism, and writing these files also effectively represents a forced synchronization point between separate processes that we hit with every commit."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:511
+#, priority:100
+msgid "The user-provided shell commands will likely involve a pipeline of commands, resulting in the creation of many processes per commit. Creating and running another process takes a widely varying amount of time between operating systems, but on any platform it is very slow relative to invoking a function."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:517
+#, priority:100
+msgid "git-filter-branch itself is written in shell, which is kind of slow. This is the one performance issue that could be backward-compatibly fixed, but compared to the above problems that are intrinsic to the design of git-filter-branch, the language of the tool itself is a relatively minor issue."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:528
+#, priority:100
+msgid "Side note: Unfortunately, people tend to fixate on the written-in-shell aspect and periodically ask if git-filter-branch could be rewritten in another language to fix the performance issues. Not only does that ignore the bigger intrinsic problems with the design, it'd help less than you'd expect: if git-filter-branch itself were not shell, then the convenience functions (map(), skip_commit(), etc) and the `--setup` argument could no longer be executed once at the beginning of the program but would instead need to be prepended to every user filter (and thus re-executed with every commit)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:539
+#, priority:100
+msgid "The https://github.com/newren/git-filter-repo/[git filter-repo] tool is an alternative to git-filter-branch which does not suffer from these performance problems or the safety problems (mentioned below). For those with existing tooling which relies upon git-filter-branch, 'git repo-filter' also provides https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], a drop-in git-filter-branch replacement (with a few caveats). While filter-lamely suffers from all the same safety issues as git-filter-branch, it at least ameloriates the performance issues a little."
+msgstr ""
+
+#. type: Title -
+#: en/git-filter-branch.txt:542
+#, no-wrap, priority:100
+msgid "SAFETY"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:547
+#, priority:100
+msgid "git-filter-branch is riddled with gotchas resulting in various ways to easily corrupt repos or end up with a mess worse than what you started with:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:560
+#, priority:100
+msgid "Someone can have a set of \"working and tested filters\" which they document or provide to a coworker, who then runs them on a different OS where the same commands are not working/tested (some examples in the git-filter-branch manpage are also affected by this). BSD vs. GNU userland differences can really bite. If lucky, error messages are spewed. But just as likely, the commands either don't do the filtering requested, or silently corrupt by making some unwanted change. The unwanted change may only affect a few commits, so it's not necessarily obvious either. (The fact that problems won't necessarily be obvious means they are likely to go unnoticed until the rewritten history is in use for quite a while, at which point it's really hard to justify another flag-day for another rewrite.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:570
+#, priority:100
+msgid "Filenames with spaces are often mishandled by shell snippets since they cause problems for shell pipelines. Not everyone is familiar with find -print0, xargs -0, git-ls-files -z, etc. Even people who are familiar with these may assume such flags are not relevant because someone else renamed any such files in their repo back before the person doing the filtering joined the project. And often, even those familiar with handling arguments with spaces may not do so just because they aren't in the mindset of thinking about everything that could possibly go wrong."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:580
+#, priority:100
+msgid "Non-ascii filenames can be silently removed despite being in a desired directory. Keeping only wanted paths is often done using pipelines like `git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`. ls-files will only quote filenames if needed, so folks may not notice that one of the files didn't match the regex (at least not until it's much too late). Yes, someone who knows about core.quotePath can avoid this (unless they have other special characters like \\t, \\n, or \"), and people who use ls-files -z with something other than grep can avoid this, but that doesn't mean they will."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:586
+#, priority:100
+msgid "Similarly, when moving files around, one can find that filenames with non-ascii or special characters end up in a different directory, one that includes a double quote character. (This is technically the same issue as above with quoting, but perhaps an interesting different way that it can and has manifested as a problem.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:594
+#, priority:100
+msgid "It's far too easy to accidentally mix up old and new history. It's still possible with any tool, but git-filter-branch almost invites it. If lucky, the only downside is users getting frustrated that they don't know how to shrink their repo and remove the old stuff. If unlucky, they merge old and new history and end up with multiple \"copies\" of each commit, some of which have unwanted or sensitive files and others which don't. This comes about in multiple different ways:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:597
+#, priority:100
+msgid "the default to only doing a partial history rewrite ('--all' is not the default and few examples show it)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:599
+#, priority:100
+msgid "the fact that there's no automatic post-run cleanup"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:602
+#, priority:100
+msgid "the fact that --tag-name-filter (when used to rename tags) doesn't remove the old tags but just adds new ones with the new name"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:611
+#, priority:100
+msgid "the fact that little educational information is provided to inform users of the ramifications of a rewrite and how to avoid mixing old and new history. For example, this man page discusses how users need to understand that they need to rebase their changes for all their branches on top of new history (or delete and reclone), but that's only one of multiple concerns to consider. See the \"DISCUSSION\" section of the git filter-repo manual page for more details."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:614
+#, priority:100
+msgid "Annotated tags can be accidentally converted to lightweight tags, due to either of two issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:619
+#, priority:100
+msgid "Someone can do a history rewrite, realize they messed up, restore from the backups in refs/original/, and then redo their git-filter-branch command. (The backup in refs/original/ is not a real backup; it dereferences tags first.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:624
+#, priority:100
+msgid "Running git-filter-branch with either --tags or --all in your <rev-list options>. In order to retain annotated tags as annotated, you must use --tag-name-filter (and must not have restored from refs/original/ in a previously botched rewrite)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:629
+#, priority:100
+msgid "Any commit messages that specify an encoding will become corrupted by the rewrite; git-filter-branch ignores the encoding, takes the original bytes, and feeds it to commit-tree without telling it the proper encoding. (This happens whether or not --msg-filter is used.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:633
+#, priority:100
+msgid "Commit messages (even if they are all UTF-8) by default become corrupted due to not being updated -- any references to other commit hashes in commit messages will now refer to no-longer-extant commits."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:644
+#, priority:100
+msgid "There are no facilities for helping users find what unwanted crud they should delete, which means they are much more likely to have incomplete or partial cleanups that sometimes result in confusion and people wasting time trying to understand. (For example, folks tend to just look for big files to delete instead of big directories or extensions, and once they do so, then sometime later folks using the new repository who are going through history will notice a build artifact directory that has some files but not others, or a cache of dependencies (node_modules or similar) which couldn't have ever been functional since it's missing some files.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:647
+#, priority:100
+msgid "If --prune-empty isn't specified, then the filtering process can create hoards of confusing empty commits"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:651
+#, priority:100
+msgid "If --prune-empty is specified, then intentionally placed empty commits from before the filtering operation are also pruned instead of just pruning commits that became empty due to filtering rules."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:654
+#, ignore-ellipsis, priority:100
+msgid "If --prune empty is specified, sometimes empty commits are missed and left around anyway (a somewhat rare bug, but it happens...)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:658
#, priority:100
-msgid "By default The BFG takes full advantage of multi-core machines, cleansing commit file-trees in parallel. git-filter-branch cleans commits sequentially (i.e. in a single-threaded manner), though it _is_ possible to write filters that include their own parallelism, in the scripts executed against each commit."
+msgid "A minor issue, but users who have a goal to update all names and emails in a repository may be led to --env-filter which will only update authors and committers, missing taggers."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:478
+#: en/git-filter-branch.txt:664
#, priority:100
-msgid "The http://rtyley.github.io/bfg-repo-cleaner/#examples[command options] are much more restrictive than git-filter branch, and dedicated just to the tasks of removing unwanted data- e.g: `--strip-blobs-bigger-than 1M`."
+msgid "If the user provides a --tag-name-filter that maps multiple tags to the same name, no warning or error is provided; git-filter-branch simply overwrites each tag in some undocumented pre-defined order resulting in only one tag at the end. (A git-filter-branch regression test requires this surprising behavior.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:667
+#, priority:100
+msgid "Also, the poor performance of git-filter-branch often leads to safety issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:683
+#, priority:100
+msgid "Coming up with the correct shell snippet to do the filtering you want is sometimes difficult unless you're just doing a trivial modification such as deleting a couple files. Unfortunately, people often learn if the snippet is right or wrong by trying it out, but the rightness or wrongness can vary depending on special circumstances (spaces in filenames, non-ascii filenames, funny author names or emails, invalid timezones, presence of grafts or replace objects, etc.), meaning they may have to wait a long time, hit an error, then restart. The performance of git-filter-branch is so bad that this cycle is painful, reducing the time available to carefully re-check (to say nothing about what it does to the patience of the person doing the rewrite even if they do technically have more time available). This problem is extra compounded because errors from broken filters may not be shown for a long time and/or get lost in a sea of output. Even worse, broken filters often just result in silent incorrect rewrites."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:691
+#, priority:100
+msgid "To top it all off, even when users finally find working commands, they naturally want to share them. But they may be unaware that their repo didn't have some special cases that someone else's does. So, when someone else with a different repository runs the same commands, they get hit by the problems above. Or, the user just runs commands that really were vetted for special cases, but they run it on a different OS where it doesn't work, as noted above."
msgstr ""
#. type: Title =
@@ -23844,7 +24183,7 @@ msgid "This command is intended mostly for internal use by scripts automatically
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:64
+#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:68
#, no-wrap, priority:240
msgid "--log[=<n>]"
msgstr ""
@@ -23856,7 +24195,7 @@ msgid "In addition to branch names, populate the log message with one-line descr
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:65
+#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:69
#, ignore-same, no-wrap, priority:240
msgid "--no-log"
msgstr "--no-log"
@@ -24527,9 +24866,9 @@ msgid ""
"\t\t [--signature-file=<file>]\n"
"\t\t [-n | --numbered | -N | --no-numbered]\n"
"\t\t [--start-number <n>] [--numbered-files]\n"
-"\t\t [--in-reply-to=Message-Id] [--suffix=.<sfx>]\n"
+"\t\t [--in-reply-to=<message id>] [--suffix=.<sfx>]\n"
"\t\t [--ignore-if-in-upstream]\n"
-"\t\t [--rfc] [--subject-prefix=Subject-Prefix]\n"
+"\t\t [--rfc] [--subject-prefix=<subject prefix>]\n"
"\t\t [(--reroll-count|-v) <n>]\n"
"\t\t [--to=<email>] [--cc=<email>]\n"
"\t\t [--[no-]cover-letter] [--quiet]\n"
@@ -24578,523 +24917,525 @@ msgid "By default, each output file is numbered sequentially from 1, and uses th
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:70
+#: en/git-format-patch.txt:71
#, priority:100
-msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`."
+msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`. All directory components will be created."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:74
+#: en/git-format-patch.txt:75
#, priority:100
msgid "By default, the subject of a single patch is \"[PATCH] \" followed by the concatenation of lines from the commit message up to the first blank line (see the DISCUSSION section of linkgit:git-commit[1])."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:78
+#: en/git-format-patch.txt:79
#, priority:100
msgid "When multiple patches are output, the subject prefix will instead be \"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. To omit patch numbers from the subject, use `-N`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:83
+#: en/git-format-patch.txt:84
#, priority:100
msgid "If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a `Message-Id` header to reference."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:89
+#: en/git-format-patch.txt:90
#, no-wrap, priority:100
msgid "-<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:91
+#: en/git-format-patch.txt:92
#, priority:100
msgid "Prepare patches from the topmost <n> commits."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:92
+#: en/git-format-patch.txt:93
#, no-wrap, priority:100
msgid "-o <dir>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:93
+#: en/git-format-patch.txt:94
#, no-wrap, priority:100
msgid "--output-directory <dir>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:96
+#: en/git-format-patch.txt:97
#, priority:100
msgid "Use <dir> to store the resulting files, instead of the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:98 en/git-shortlog.txt:30
+#: en/git-format-patch.txt:99 en/git-shortlog.txt:30
#, ignore-same, no-wrap, priority:260
msgid "--numbered"
msgstr "--numbered"
#. type: Plain text
-#: en/git-format-patch.txt:100
+#: en/git-format-patch.txt:101
#, priority:100
msgid "Name output in '[PATCH n/m]' format, even with a single patch."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:102
+#: en/git-format-patch.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-numbered"
msgstr "--no-numbered"
#. type: Plain text
-#: en/git-format-patch.txt:104
+#: en/git-format-patch.txt:105
#, priority:100
msgid "Name output in '[PATCH]' format."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:105
+#: en/git-format-patch.txt:106
#, no-wrap, priority:100
msgid "--start-number <n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:107
+#: en/git-format-patch.txt:108
#, priority:100
msgid "Start numbering the patches at <n> instead of 1."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:108
+#: en/git-format-patch.txt:109
#, ignore-same, no-wrap, priority:100
msgid "--numbered-files"
msgstr "--numbered-files"
#. type: Plain text
-#: en/git-format-patch.txt:111
+#: en/git-format-patch.txt:112
#, priority:100
msgid "Output file names will be a simple number sequence without the default first line of the commit appended."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:113
+#: en/git-format-patch.txt:114
#, ignore-same, no-wrap, priority:100
msgid "--keep-subject"
msgstr "--keep-subject"
#. type: Plain text
-#: en/git-format-patch.txt:116
+#: en/git-format-patch.txt:117
#, priority:100
msgid "Do not strip/add '[PATCH]' from the first line of the commit log message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:122
+#: en/git-format-patch.txt:123
#, priority:100
msgid "Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:123 en/git-pack-objects.txt:59
+#: en/git-format-patch.txt:124 en/git-pack-objects.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--stdout"
msgstr "--stdout"
#. type: Plain text
-#: en/git-format-patch.txt:126
+#: en/git-format-patch.txt:127
#, priority:100
msgid "Print all commits to the standard output in mbox format, instead of creating a file for each one."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:127
+#: en/git-format-patch.txt:128
#, no-wrap, priority:100
msgid "--attach[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:131
+#: en/git-format-patch.txt:132
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: attachment`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:132
+#: en/git-format-patch.txt:133
#, ignore-same, no-wrap, priority:100
msgid "--no-attach"
msgstr "--no-attach"
#. type: Plain text
-#: en/git-format-patch.txt:135
+#: en/git-format-patch.txt:136
#, priority:100
msgid "Disable the creation of an attachment, overriding the configuration setting."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:136
+#: en/git-format-patch.txt:137
#, no-wrap, priority:100
msgid "--inline[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:140
+#: en/git-format-patch.txt:141
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: inline`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:141
+#: en/git-format-patch.txt:142
#, no-wrap, priority:100
msgid "--thread[=<style>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:142
+#: en/git-format-patch.txt:143
#, ignore-same, no-wrap, priority:100
msgid "--no-thread"
msgstr "--no-thread"
#. type: Plain text
-#: en/git-format-patch.txt:147
+#: en/git-format-patch.txt:148
#, priority:100
msgid "Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the first. Also controls generation of the `Message-Id` header to reference."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:153
+#: en/git-format-patch.txt:154
#, priority:100
msgid "The optional <style> argument can be either `shallow` or `deep`. 'shallow' threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order. 'deep' threading makes every mail a reply to the previous one."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:157
+#: en/git-format-patch.txt:158
#, priority:100
msgid "The default is `--no-thread`, unless the `format.thread` configuration is set. If `--thread` is specified without a style, it defaults to the style specified by `format.thread` if any, or else `shallow`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:161
+#: en/git-format-patch.txt:162
#, priority:100
msgid "Beware that the default for 'git send-email' is to thread emails itself. If you want `git format-patch` to take care of threading, you will want to ensure that threading is disabled for `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:162
-#, no-wrap, priority:100
-msgid "--in-reply-to=Message-Id"
-msgstr ""
+#: en/git-format-patch.txt:163
+#, fuzzy, no-wrap, priority:100
+#| msgid "--no-message-id"
+msgid "--in-reply-to=<message id>"
+msgstr "--no-message-id"
#. type: Plain text
-#: en/git-format-patch.txt:166
+#: en/git-format-patch.txt:167
#, priority:100
-msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given Message-Id, which avoids breaking threads to provide a new patch series."
+msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given <message id>, which avoids breaking threads to provide a new patch series."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:167
+#: en/git-format-patch.txt:168
#, ignore-same, no-wrap, priority:100
msgid "--ignore-if-in-upstream"
msgstr "--ignore-if-in-upstream"
#. type: Plain text
-#: en/git-format-patch.txt:173
+#: en/git-format-patch.txt:174
#, priority:100
msgid "Do not include a patch that matches a commit in <until>..<since>. This will examine all patches reachable from <since> but not from <until> and compare them with the patches being generated, and any patch that matches is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:174
-#, no-wrap, priority:100
-msgid "--subject-prefix=<Subject-Prefix>"
-msgstr ""
+#: en/git-format-patch.txt:175
+#, fuzzy, no-wrap, priority:100
+#| msgid "--dst-prefix=<prefix>"
+msgid "--subject-prefix=<subject prefix>"
+msgstr "--dst-prefixo=<prefix>"
#. type: Plain text
-#: en/git-format-patch.txt:179
+#: en/git-format-patch.txt:180
#, priority:100
-msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<Subject-Prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
+msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<subject prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:180
+#: en/git-format-patch.txt:181
#, ignore-same, no-wrap, priority:100
msgid "--rfc"
msgstr "--rfc"
#. type: Plain text
-#: en/git-format-patch.txt:184
+#: en/git-format-patch.txt:185
#, priority:100
msgid "Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For Comments\"; use this when sending an experimental patch for discussion rather than application."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:185
+#: en/git-format-patch.txt:186
#, no-wrap, priority:100
msgid "-v <n>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:186
+#: en/git-format-patch.txt:187
#, no-wrap, priority:100
msgid "--reroll-count=<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:193
+#: en/git-format-patch.txt:194
#, priority:100
msgid "Mark the series as the <n>-th iteration of the topic. The output filenames have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default, but configurable via the `--subject-prefix` option) has ` v<n>` appended to it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:194
+#: en/git-format-patch.txt:195
#, no-wrap, priority:100
msgid "--to=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:199
+#: en/git-format-patch.txt:200
#, priority:100
msgid "Add a `To:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-to` discards all `To:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:200
+#: en/git-format-patch.txt:201
#, no-wrap, priority:100
msgid "--cc=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:205
+#: en/git-format-patch.txt:206
#, priority:100
msgid "Add a `Cc:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-cc` discards all `Cc:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:206
+#: en/git-format-patch.txt:207
#, ignore-same, no-wrap, priority:100
msgid "--from"
msgstr "--from"
#. type: Labeled list
-#: en/git-format-patch.txt:207
+#: en/git-format-patch.txt:208
#, no-wrap, priority:100
msgid "--from=<ident>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:213
+#: en/git-format-patch.txt:214
#, priority:100
msgid "Use `ident` in the `From:` header of each commit email. If the author ident of the commit is not textually identical to the provided `ident`, place a `From:` header in the body of the message with the original author. If no `ident` is given, use the committer ident."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:220
+#: en/git-format-patch.txt:221
#, priority:100
msgid "Note that this option is only useful if you are actually sending the emails and want to identify yourself as the sender, but retain the original author (and `git am` will correctly pick up the in-body header). Note also that `git send-email` already handles this transformation for you, and this option should not be used if you are feeding the result to `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:221
+#: en/git-format-patch.txt:222
#, no-wrap, priority:100
msgid "--add-header=<header>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:228
+#: en/git-format-patch.txt:229
#, priority:100
msgid "Add an arbitrary header to the email headers. This is in addition to any configured headers, and may be used multiple times. For example, `--add-header=\"Organization: git-foo\"`. The negated form `--no-add-header` discards *all* (`To:`, `Cc:`, and custom) headers added so far from config or command line."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:229
+#: en/git-format-patch.txt:230
#, ignore-same, no-wrap, priority:100
msgid "--[no-]cover-letter"
msgstr "--[no-]cover-letter"
#. type: Plain text
-#: en/git-format-patch.txt:233
+#: en/git-format-patch.txt:234
#, priority:100
msgid "In addition to the patches, generate a cover letter file containing the branch description, shortlog and the overall diffstat. You can fill in a description in the file before sending it out."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:234
+#: en/git-format-patch.txt:235
#, no-wrap, priority:100
msgid "--interdiff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:242
+#: en/git-format-patch.txt:243
#, priority:100
msgid "As a reviewer aid, insert an interdiff into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` is a single revision naming the tip of the previous series which shares a common base with the series being formatted (for example `git format-patch --cover-letter --interdiff=feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:243
+#: en/git-format-patch.txt:244
#, no-wrap, priority:100
msgid "--range-diff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:254
+#: en/git-format-patch.txt:255
#, priority:100
msgid "As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1]) into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` can be a single revision naming the tip of the previous series if it shares a common base with the series being formatted (for example `git format-patch --cover-letter --range-diff=feature/v1 -3 feature/v2`), or a revision range if the two versions of the series are disjoint (for example `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:259
+#: en/git-format-patch.txt:260
#, priority:100
msgid "Note that diff options passed to the command affect how the primary product of `format-patch` is generated, and they are not passed to the underlying `range-diff` machinery used to generate the cover-letter material (this may change in the future)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:260
+#: en/git-format-patch.txt:261
#, no-wrap, priority:100
msgid "--creation-factor=<percent>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:265
+#: en/git-format-patch.txt:266
#, priority:100
msgid "Used with `--range-diff`, tweak the heuristic which matches up commits between the previous and current series of patches by adjusting the creation/deletion cost fudge factor. See linkgit:git-range-diff[1]) for details."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:266
+#: en/git-format-patch.txt:267
#, no-wrap, priority:100
msgid "--notes[=<ref>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:267 en/pretty-options.txt:81
+#: en/git-format-patch.txt:268 en/pretty-options.txt:81
#, ignore-same, no-wrap, priority:260
msgid "--no-notes"
msgstr "--no-notes"
#. type: Plain text
-#: en/git-format-patch.txt:270
+#: en/git-format-patch.txt:271
#, priority:100
msgid "Append the notes (see linkgit:git-notes[1]) for the commit after the three-dash line."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:278
+#: en/git-format-patch.txt:279
#, priority:100
msgid "The expected use case of this is to write supporting explanation for the commit that does not belong to the commit log message proper, and include it with the patch submission. While one can simply write these explanations after `format-patch` has run but before sending, keeping them as Git notes allows them to be maintained between versions of the patch series (but see the discussion of the `notes.rewrite` configuration options in linkgit:git-notes[1] to use this workflow)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:281
+#: en/git-format-patch.txt:282
#, priority:100
msgid "The default is `--no-notes`, unless the `format.notes` configuration is set."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:282
+#: en/git-format-patch.txt:283
#, no-wrap, priority:100
msgid "--[no-]signature=<signature>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:287
+#: en/git-format-patch.txt:288
#, priority:100
msgid "Add a signature to each message produced. Per RFC 3676 the signature is separated from the body by a line with '-- ' on it. If the signature option is omitted the signature defaults to the Git version number."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:288
+#: en/git-format-patch.txt:289
#, no-wrap, priority:100
msgid "--signature-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:290
+#: en/git-format-patch.txt:291
#, priority:100
msgid "Works just like --signature except the signature is read from a file."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:291
+#: en/git-format-patch.txt:292
#, no-wrap, priority:100
msgid "--suffix=.<sfx>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:296
+#: en/git-format-patch.txt:297
#, priority:100
msgid "Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is `--suffix=.txt`. Leaving this empty will remove the `.patch` suffix."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:299
+#: en/git-format-patch.txt:300
#, priority:100
msgid "Note that the leading character does not have to be a dot; for example, you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:303
+#: en/git-format-patch.txt:304
#, priority:100
msgid "Do not print the names of the generated files to standard output."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:304
+#: en/git-format-patch.txt:305
#, ignore-same, no-wrap, priority:100
msgid "--no-binary"
msgstr "--no-binary"
#. type: Plain text
-#: en/git-format-patch.txt:309
+#: en/git-format-patch.txt:310
#, priority:100
msgid "Do not output contents of changes in binary files, instead display a notice that those files changed. Patches generated using this option cannot be applied properly, but they are still useful for code review."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:310
+#: en/git-format-patch.txt:311
#, ignore-same, no-wrap, priority:100
msgid "--zero-commit"
msgstr "--zero-commit"
#. type: Plain text
-#: en/git-format-patch.txt:313
+#: en/git-format-patch.txt:314
#, priority:100
msgid "Output an all-zero hash in each patch's From header instead of the hash of the commit."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:314
+#: en/git-format-patch.txt:315
#, no-wrap, priority:100
msgid "--base=<commit>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:318
+#: en/git-format-patch.txt:320
#, priority:100
-msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details."
+msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details. If <commit> is \"auto\", a base commit is automatically chosen."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:325
+#: en/git-format-patch.txt:327
#, priority:100
msgid "Treat the revision argument as a <revision range>, even if it is just a single commit (that would normally be treated as a <since>). Note that root commits included in the specified range are always formatted as creation patches, independently of this flag."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:328
+#: en/git-format-patch.txt:330
#, priority:100
msgid "Show progress reports on stderr as patches are generated."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:335
+#: en/git-format-patch.txt:338
#, priority:100
-msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To\" or \"Cc:\" headers, configure attachments, and sign off patches with configuration variables."
+msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To:\" or \"Cc:\" headers, configure attachments, change the patch output directory, and sign off patches with configuration variables."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:347
+#: en/git-format-patch.txt:351
#, no-wrap, priority:100
msgid ""
"[format]\n"
@@ -25106,17 +25447,18 @@ msgid ""
"\tcc = <email>\n"
"\tattach [ = mime-boundary-string ]\n"
"\tsignOff = true\n"
-"\tcoverletter = auto\n"
+"\toutputDirectory = <directory>\n"
+"\tcoverLetter = auto\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:356
+#: en/git-format-patch.txt:360
#, priority:100
msgid "The patch produced by 'git format-patch' is in UNIX mailbox format, with a fixed \"magic\" time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:366
+#: en/git-format-patch.txt:370
#, no-wrap, priority:100
msgid ""
"From 8f72bad1baf19a53459661343e21d6491c3908d3 Mon Sep 17 00:00:00 2001\n"
@@ -25130,7 +25472,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:369
+#: en/git-format-patch.txt:373
#, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -25138,7 +25480,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:372
+#: en/git-format-patch.txt:376
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"Do the same for ia64 so we can have sleek & trim looking\n"
@@ -25146,19 +25488,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:380
+#: en/git-format-patch.txt:384
#, ignore-ellipsis, priority:100
msgid "Typically it will be placed in a MUA's drafts folder, edited to add timely commentary that should not go in the changelog after the three dashes, and then sent as a message whose body, in our example, starts with \"arch/arm config files were...\". On the receiving end, readers can save interesting patches in a UNIX mailbox and apply them with linkgit:git-am[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:386
+#: en/git-format-patch.txt:390
#, priority:100
msgid "When a patch is part of an ongoing discussion, the patch generated by 'git format-patch' can be tweaked to take advantage of the 'git am --scissors' feature. After your response to the discussion comes a line that consists solely of \"`-- >8 --`\" (scissors and perforation), followed by the patch with unnecessary header fields removed:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:390
+#: en/git-format-patch.txt:394
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"...\n"
@@ -25166,13 +25508,13 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:392
+#: en/git-format-patch.txt:396
#, no-wrap, priority:100
msgid "Makes sense to me. How about this patch?\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:395
+#: en/git-format-patch.txt:399
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
@@ -25180,7 +25522,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:398
+#: en/git-format-patch.txt:402
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -25188,61 +25530,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:406
+#: en/git-format-patch.txt:410
#, priority:100
msgid "When sending a patch this way, most often you are sending your own patch, so in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit `From:` and `Date:` lines from the patch file. The patch title is likely to be different from the subject of the discussion the patch is in response to, so it is likely that you would want to keep the Subject: line, like the example above."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:408
+#: en/git-format-patch.txt:412
#, no-wrap, priority:100
msgid "Checking for patch corruption"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:411
+#: en/git-format-patch.txt:415
#, priority:100
msgid "Many mailers if not set up properly will corrupt whitespace. Here are two common types of corruption:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:413
+#: en/git-format-patch.txt:417
#, priority:100
msgid "Empty context lines that do not have _any_ whitespace."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:416
+#: en/git-format-patch.txt:420
#, priority:100
msgid "Non-empty context lines that have one extra whitespace at the beginning."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:418
+#: en/git-format-patch.txt:422
#, priority:100
msgid "One way to test if your MUA is set up correctly is:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:422
+#: en/git-format-patch.txt:426
#, priority:100
msgid "Send the patch to yourself, exactly the way you would, except with To: and Cc: lines that do not contain the list and maintainer address."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:425
+#: en/git-format-patch.txt:429
#, priority:100
msgid "Save that patch to a file in UNIX mailbox format. Call it a.patch, say."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:427
+#: en/git-format-patch.txt:431
#, priority:100
msgid "Apply it:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:432
+#: en/git-format-patch.txt:436
#, no-wrap, priority:100
msgid ""
"$ git fetch <project> master:test-apply\n"
@@ -25252,175 +25594,175 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:434
+#: en/git-format-patch.txt:438
#, priority:100
msgid "If it does not apply correctly, there can be various reasons."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:439
+#: en/git-format-patch.txt:443
#, priority:100
msgid "The patch itself does not apply cleanly. That is _bad_ but does not have much to do with your MUA. You might want to rebase the patch with linkgit:git-rebase[1] before regenerating it in this case."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:444
+#: en/git-format-patch.txt:448
#, priority:100
msgid "The MUA corrupted your patch; \"am\" would complain that the patch does not apply. Look in the .git/rebase-apply/ subdirectory and see what 'patch' file contains and check for the common corruption patterns mentioned above."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:452
+#: en/git-format-patch.txt:456
#, priority:100
msgid "While at it, check the 'info' and 'final-commit' files as well. If what is in 'final-commit' is not exactly what you would want to see in the commit log message, it is very likely that the receiver would end up hand editing the log message when applying your patch. Things like \"Hi, this is my first patch.\\n\" in the patch e-mail should come after the three-dash line that signals the end of the commit message."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:454
+#: en/git-format-patch.txt:458
#, no-wrap, priority:100
msgid "MUA-SPECIFIC HINTS"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:457
+#: en/git-format-patch.txt:461
#, priority:100
msgid "Here are some hints on how to successfully submit patches inline using various mailers."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:459
+#: en/git-format-patch.txt:463
#, no-wrap, priority:100
msgid "GMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:465
+#: en/git-format-patch.txt:469
#, priority:100
msgid "GMail does not have any way to turn off line wrapping in the web interface, so it will mangle any emails that you send. You can however use \"git send-email\" and send your patches through the GMail SMTP server, or use any IMAP email client to connect to the google IMAP server and forward the emails through that."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:468
+#: en/git-format-patch.txt:472
#, priority:100
msgid "For hints on using 'git send-email' to send your patches through the GMail SMTP server, see the EXAMPLE section of linkgit:git-send-email[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:471
+#: en/git-format-patch.txt:475
#, priority:100
msgid "For hints on submission using the IMAP interface, see the EXAMPLE section of linkgit:git-imap-send[1]."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:473
+#: en/git-format-patch.txt:477
#, no-wrap, priority:100
msgid "Thunderbird"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:477
+#: en/git-format-patch.txt:481
#, priority:100
msgid "By default, Thunderbird will both wrap emails as well as flag them as being 'format=flowed', both of which will make the resulting email unusable by Git."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:481
+#: en/git-format-patch.txt:485
#, priority:100
msgid "There are three different approaches: use an add-on to turn off line wraps, configure Thunderbird to not mangle patches, or use an external editor to keep Thunderbird from mangling the patches."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:483
+#: en/git-format-patch.txt:487
#, no-wrap, priority:100
msgid "Approach #1 (add-on)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:491
+#: en/git-format-patch.txt:495
#, priority:100
msgid "Install the Toggle Word Wrap add-on that is available from https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you can tick off. Now you can compose the message as you otherwise do (cut + paste, 'git format-patch' | 'git imap-send', etc), but you have to insert line breaks manually in any text that you type."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:493
+#: en/git-format-patch.txt:497
#, no-wrap, priority:100
msgid "Approach #2 (configuration)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:495
+#: en/git-format-patch.txt:499
#, priority:100
msgid "Three steps:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:499
+#: en/git-format-patch.txt:503
#, ignore-ellipsis, priority:100
msgid "Configure your mail server composition as plain text: Edit...Account Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:501
+#: en/git-format-patch.txt:505
#, priority:100
msgid "Configure your general composition window to not wrap."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:504
+#: en/git-format-patch.txt:508
#, priority:100
msgid "In Thunderbird 2: Edit..Preferences..Composition, wrap plain text messages at 0"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:510
+#: en/git-format-patch.txt:514
#, priority:100
msgid "In Thunderbird 3: Edit..Preferences..Advanced..Config Editor. Search for \"mail.wrap_long_lines\". Toggle it to make sure it is set to `false`. Also, search for \"mailnews.wraplength\" and set the value to 0."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:515
+#: en/git-format-patch.txt:519
#, priority:100
msgid "Disable the use of format=flowed: Edit..Preferences..Advanced..Config Editor. Search for \"mailnews.send_plaintext_flowed\". Toggle it to make sure it is set to `false`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:519
+#: en/git-format-patch.txt:523
#, priority:100
msgid "After that is done, you should be able to compose email as you otherwise would (cut + paste, 'git format-patch' | 'git imap-send', etc), and the patches will not be mangled."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:521
+#: en/git-format-patch.txt:525
#, no-wrap, priority:100
msgid "Approach #3 (external editor)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:526
+#: en/git-format-patch.txt:530
#, priority:100
msgid "The following Thunderbird extensions are needed: AboutConfig from http://aboutconfig.mozdev.org/ and External Editor from http://globs.org/articles.php?lng=en&pg=8"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:528
+#: en/git-format-patch.txt:532
#, priority:100
msgid "Prepare the patch as a text file using your method of choice."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:533
+#: en/git-format-patch.txt:537
#, priority:100
msgid "Before opening a compose window, use Edit->Account Settings to uncheck the \"Compose messages in HTML format\" setting in the \"Composition & Addressing\" panel of the account to be used to send the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:537
+#: en/git-format-patch.txt:541
#, priority:100
msgid "In the main Thunderbird window, 'before' you open the compose window for the patch, use Tools->about:config to set the following to the indicated values:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:541
+#: en/git-format-patch.txt:545
#, no-wrap, priority:100
msgid ""
"\tmailnews.send_plaintext_flowed => false\n"
@@ -25428,25 +25770,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:544
+#: en/git-format-patch.txt:548
#, priority:100
msgid "Open a compose window and click the external editor icon."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:547
+#: en/git-format-patch.txt:551
#, priority:100
msgid "In the external editor window, read in the patch file and exit the editor normally."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:550
+#: en/git-format-patch.txt:554
#, priority:100
msgid "Side note: it may be possible to do step 2 with about:config and the following settings but no one's tried yet."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:555
+#: en/git-format-patch.txt:559
#, no-wrap, priority:100
msgid ""
"\tmail.html_compose => false\n"
@@ -25455,91 +25797,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:560
+#: en/git-format-patch.txt:564
#, priority:100
msgid "There is a script in contrib/thunderbird-patch-inline which can help you include patches with Thunderbird in an easy way. To use it, do the steps above and then use the script as the external editor."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:562
+#: en/git-format-patch.txt:566
#, no-wrap, priority:100
msgid "KMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:564
+#: en/git-format-patch.txt:568
#, priority:100
msgid "This should help you to submit patches inline using KMail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:566
+#: en/git-format-patch.txt:570
#, priority:100
msgid "Prepare the patch as a text file."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:568
+#: en/git-format-patch.txt:572
#, priority:100
msgid "Click on New Mail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:571
+#: en/git-format-patch.txt:575
#, priority:100
msgid "Go under \"Options\" in the Composer window and be sure that \"Word wrap\" is not set."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:573
+#: en/git-format-patch.txt:577
#, ignore-ellipsis, priority:100
msgid "Use Message -> Insert file... and insert the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:576
+#: en/git-format-patch.txt:580
#, priority:100
msgid "Back in the compose window: add whatever other text you wish to the message, complete the addressing and subject fields, and press send."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:578
+#: en/git-format-patch.txt:582
#, no-wrap, priority:100
msgid "BASE TREE INFORMATION"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:587
+#: en/git-format-patch.txt:591
#, priority:100
msgid "The base tree information block is used for maintainers or third party testers to know the exact state the patch series applies to. It consists of the 'base commit', which is a well-known commit that is part of the stable part of the project history everybody else works off of, and zero or more 'prerequisite patches', which are well-known patches in flight that is not yet part of the 'base commit' that need to be applied on top of 'base commit' in topological order before the patches can be applied."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:593
+#: en/git-format-patch.txt:597
#, priority:100
msgid "The 'base commit' is shown as \"base-commit: \" followed by the 40-hex of the commit object name. A 'prerequisite patch' is shown as \"prerequisite-patch-id: \" followed by the 40-hex 'patch id', which can be obtained by passing the patch through the `git patch-id --stable` command."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:597
+#: en/git-format-patch.txt:601
#, priority:100
msgid "Imagine that on top of the public commit P, you applied well-known patches X, Y and Z from somebody else, and then built your three-patch series A, B, C, the history would be like:"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:600
+#: en/git-format-patch.txt:604
#, no-wrap, priority:100
msgid "---P---X---Y---Z---A---B---C\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:607
+#: en/git-format-patch.txt:611
#, priority:100
msgid "With `git format-patch --base=P -3 C` (or variants thereof, e.g. with `--cover-letter` or using `Z..C` instead of `-3 C` to specify the range), the base tree information block is shown at the end of the first message the command outputs (either the first patch, or the cover letter), like this:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:613
+#: en/git-format-patch.txt:617
#, no-wrap, priority:100
msgid ""
"base-commit: P\n"
@@ -25549,13 +25891,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:616
+#: en/git-format-patch.txt:620
#, priority:100
msgid "For non-linear topology, such as"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:621
+#: en/git-format-patch.txt:625
#, no-wrap, priority:100
msgid ""
"---P---X---A---M---C\n"
@@ -25564,91 +25906,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:626
+#: en/git-format-patch.txt:630
#, priority:100
msgid "You can also use `git format-patch --base=P -3 C` to generate patches for A, B and C, and the identifiers for P, X, Y, Z are appended at the end of the first message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:632
+#: en/git-format-patch.txt:636
#, priority:100
msgid "If set `--base=auto` in cmdline, it will track base commit automatically, the base commit will be the merge base of tip commit of the remote-tracking branch and revision-range specified in cmdline. For a local branch, you need to track a remote branch by `git branch --set-upstream-to` before using this option."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:638
+#: en/git-format-patch.txt:642
#, priority:100
msgid "Extract commits between revisions R1 and R2, and apply them on top of the current branch using 'git am' to cherry-pick them:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:641
+#: en/git-format-patch.txt:645
#, no-wrap, priority:100
msgid "$ git format-patch -k --stdout R1..R2 | git am -3 -k\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:645
+#: en/git-format-patch.txt:649
#, priority:100
msgid "Extract all commits which are in the current branch but not in the origin branch:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:648
+#: en/git-format-patch.txt:652
#, no-wrap, priority:100
msgid "$ git format-patch origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:651
+#: en/git-format-patch.txt:655
#, priority:100
msgid "For each commit a separate file is created in the current directory."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:654
+#: en/git-format-patch.txt:658
#, priority:100
msgid "Extract all commits that lead to 'origin' since the inception of the project:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:657
+#: en/git-format-patch.txt:661
#, no-wrap, priority:100
msgid "$ git format-patch --root origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:660
+#: en/git-format-patch.txt:664
#, priority:100
msgid "The same as the previous one:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:663
+#: en/git-format-patch.txt:667
#, no-wrap, priority:100
msgid "$ git format-patch -M -B origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:670
+#: en/git-format-patch.txt:674
#, priority:100
msgid "Additionally, it detects and handles renames and complete rewrites intelligently to produce a renaming patch. A renaming patch reduces the amount of text output, and generally makes it easier to review. Note that non-Git \"patch\" programs won't understand renaming patches, so use it only when you know the recipient uses Git to apply your patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:673
+#: en/git-format-patch.txt:677
#, priority:100
msgid "Extract three topmost commits from the current branch and format them as e-mailable patches:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:676
+#: en/git-format-patch.txt:680
#, no-wrap, priority:100
msgid "$ git format-patch -3\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:681
+#: en/git-format-patch.txt:685
#, ignore-same, priority:100
msgid "linkgit:git-am[1], linkgit:git-send-email[1]"
msgstr "linkgit:git-am[1], linkgit:git-send-email[1]"
@@ -26144,43 +26486,43 @@ msgid "The below documentation is the same as what's found in linkgit:git-config
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:127
+#: en/git-gc.txt:126
#, priority:100
-msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, refs saved by 'git filter-branch' in refs/original/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
+msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, notes saved by 'git notes' under refs/notes/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:134
+#: en/git-gc.txt:133
#, priority:100
msgid "On the other hand, when 'git gc' runs concurrently with another process, there is a risk of it deleting an object that the other process is using but hasn't created a reference to. This may just cause the other process to fail or may corrupt the repository if the other process later adds a reference to the deleted object. Git has two features that significantly mitigate this problem:"
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:137
+#: en/git-gc.txt:136
#, priority:100
msgid "Any object with modification time newer than the `--prune` date is kept, along with everything reachable from it."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:141
+#: en/git-gc.txt:140
#, priority:100
msgid "Most operations that add an object to the database update the modification time of the object if it is already present so that #1 applies."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:145
+#: en/git-gc.txt:144
#, priority:100
msgid "However, these features fall short of a complete solution, so users who run commands concurrently have to live with some risk of corruption (which seems to be low in practice)."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:151
+#: en/git-gc.txt:150
#, priority:100
msgid "The 'git gc --auto' command will run the 'pre-auto-gc' hook. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:159
+#: en/git-gc.txt:158
#, ignore-same, priority:100
msgid "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
msgstr "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
@@ -26446,7 +26788,7 @@ msgid "For each <pathspec> given on command line, descend at most <depth> levels
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:399
+#: en/git-grep.txt:128 en/git-submodule.txt:400
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
@@ -26662,7 +27004,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:951
+#: en/git-grep.txt:217 en/rev-list-options.txt:967
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -26812,127 +27154,151 @@ msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:280
+#: en/git-grep.txt:277
+#, priority:100
+msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:282
+#, priority:100
+msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:287
+#, priority:100
+msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:291
+#, priority:100
+msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:297
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:281
+#: en/git-grep.txt:298
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:282
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:283 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:284
+#: en/git-grep.txt:301
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:289
+#: en/git-grep.txt:306
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:290 en/rev-list-options.txt:65
+#: en/git-grep.txt:307 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:294
+#: en/git-grep.txt:311
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:299
+#: en/git-grep.txt:316
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:300
+#: en/git-grep.txt:317
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:303
+#: en/git-grep.txt:320
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:307
+#: en/git-grep.txt:324
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:328
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:318
+#: en/git-grep.txt:335
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:321
+#: en/git-grep.txt:338
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:322
+#: en/git-grep.txt:339
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:325
+#: en/git-grep.txt:342
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:326
+#: en/git-grep.txt:343
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:329
+#: en/git-grep.txt:346
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:330
+#: en/git-grep.txt:347
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:332
+#: en/git-grep.txt:349
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
@@ -27150,25 +27516,13 @@ msgstr ""
#. type: Plain text
#: en/git-gui.txt:116
#, priority:100
-msgid "A 'git gui' development repository can be obtained from:"
+msgid "The official repository of the 'git gui' project can be found at:"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:118
#, no-wrap, priority:100
-msgid " git clone git://repo.or.cz/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:122
-#, no-wrap, priority:100
-msgid " git clone http://repo.or.cz/r/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:124
-#, priority:100
-msgid "or browsed online at http://repo.or.cz/w/git-gui.git/[]."
+msgid " https://github.com/prati0100/git-gui.git/\n"
msgstr ""
#. type: Title =
@@ -30781,29 +31135,29 @@ msgstr ""
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
-#. type: Plain text
-#: en/git-ls-remote.txt:110
+#. type: delimited block -
+#: en/git-ls-remote.txt:111
#, no-wrap, priority:100
msgid ""
-"\t$ git ls-remote --tags ./.\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"\t$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
-"\t5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"\tc781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
-"\t$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
-"\t$ git ls-remote --tags korg v\\*\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"$ git ls-remote --tags ./.\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
+"$ git ls-remote --tags korg v\\*\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:114
+#: en/git-ls-remote.txt:116
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -31311,7 +31665,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:358
+#: en/git-merge-base.txt:60 en/git-rebase.txt:376
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -31340,235 +31694,235 @@ msgstr ""
msgid "For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:86
+#. type: delimited block .
+#: en/git-merge-base.txt:87
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---B\n"
-"\t /\n"
-"\t---o---1---o---o---o---A\n"
+"\t o---o---o---B\n"
+"\t/\n"
+"---o---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:88
+#: en/git-merge-base.txt:90
#, priority:100
msgid "the merge base between 'A' and 'B' is '1'."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:92
+#: en/git-merge-base.txt:94
#, priority:100
msgid "Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the merge base between 'A' and a hypothetical commit 'M', which is a merge between 'B' and 'C'. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:98
+#. type: delimited block .
+#: en/git-merge-base.txt:101
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---C\n"
-"\t /\n"
-"\t / o---o---o---B\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---C\n"
+" /\n"
+" / o---o---o---B\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:101
+#: en/git-merge-base.txt:105
#, priority:100
msgid "the result of `git merge-base A B C` is '1'. This is because the equivalent topology with a merge commit 'M' between 'B' and 'C' is:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:108
+#. type: delimited block .
+#: en/git-merge-base.txt:113
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---o\n"
-"\t / \\\n"
-"\t / o---o---o---o---M\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---o\n"
+" / \\\n"
+" / o---o---o---o---M\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:112
+#: en/git-merge-base.txt:118
#, priority:100
msgid "and the result of `git merge-base A M` is '1'. Commit '2' is also a common ancestor between 'A' and 'M', but '1' is a better common ancestor, because '2' is an ancestor of '1'. Hence, '2' is not a merge base."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:115
+#: en/git-merge-base.txt:121
#, priority:100
msgid "The result of `git merge-base --octopus A B C` is '2', because '2' is the best common ancestor of all commits."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:118
+#: en/git-merge-base.txt:124
#, priority:100
msgid "When the history involves criss-cross merges, there can be more than one 'best' common ancestor for two commits. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:124
+#. type: delimited block .
+#: en/git-merge-base.txt:131
#, no-wrap, priority:100
msgid ""
-"\t---1---o---A\n"
-"\t \\ /\n"
-"\t X\n"
-"\t / \\\n"
-"\t---2---o---o---B\n"
+"---1---o---A\n"
+" \\ /\n"
+" X\n"
+" / \\\n"
+"---2---o---o---B\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:128
+#: en/git-merge-base.txt:136
#, priority:100
msgid "both '1' and '2' are merge-bases of A and B. Neither one is better than the other (both are 'best' merge bases). When the `--all` option is not given, it is unspecified which best one is output."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:133
+#: en/git-merge-base.txt:141
#, priority:100
msgid "A common idiom to check \"fast-forward-ness\" between two commits A and B is (or at least used to be) to compute the merge base between A and B, and check if it is the same as A, in which case, A is an ancestor of B. You will see this idiom used often in older scripts."
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:139
+#. type: delimited block .
+#: en/git-merge-base.txt:148
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tA=$(git rev-parse --verify A)\n"
-"\tif test \"$A\" = \"$(git merge-base A B)\"\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"A=$(git rev-parse --verify A)\n"
+"if test \"$A\" = \"$(git merge-base A B)\"\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:141
+#: en/git-merge-base.txt:151
#, priority:100
msgid "In modern git, you can say this in a more direct way:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:146
+#. type: delimited block .
+#: en/git-merge-base.txt:157
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tif git merge-base --is-ancestor A B\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"if git merge-base --is-ancestor A B\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:148
+#: en/git-merge-base.txt:160
#, priority:100
msgid "instead."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:150
+#: en/git-merge-base.txt:162
#, no-wrap, priority:100
msgid "Discussion on fork-point mode"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:156
+#: en/git-merge-base.txt:168
#, priority:100
msgid "After working on the `topic` branch created with `git switch -c topic origin/master`, the history of remote-tracking branch `origin/master` may have been rewound and rebuilt, leading to a history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:164
+#. type: delimited block .
+#: en/git-merge-base.txt:177
#, no-wrap, priority:100
msgid ""
-"\t o---B2\n"
-"\t /\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t \\\n"
-"\t B0\n"
-"\t \\\n"
-"\t D0---D1---D (topic)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\\n"
+"\t B0\n"
+"\t \\\n"
+"\t D0---D1---D (topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:170
+#: en/git-merge-base.txt:184
#, priority:100
msgid "where `origin/master` used to point at commits B0, B1, B2 and now it points at B, and your `topic` branch was started on top of it back when `origin/master` was at B0, and you built three commits, D0, D1, and D, on top of it. Imagine that you now want to rebase the work you did on the topic on top of the updated origin/master."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:176
+#: en/git-merge-base.txt:190
#, priority:100
msgid "In such a case, `git merge-base origin/master topic` would return the parent of B0 in the above picture, but B0^..D is *not* the range of commits you would want to replay on top of B (it includes B0, which is not what you wrote; it is a commit the other side discarded when it moved its tip from B0 to B1)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:184
+#: en/git-merge-base.txt:198
#, priority:100
msgid "`git merge-base --fork-point origin/master topic` is designed to help in such a case. It takes not only B but also B0, B1, and B2 (i.e. old tips of the remote-tracking branches your repository's reflog knows about) into account to see on which commit your topic branch was built and finds B0, allowing you to replay only the commits on your topic, excluding the commits the other side later discarded."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:186
+#: en/git-merge-base.txt:200
#, priority:100
msgid "Hence"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:188
+#: en/git-merge-base.txt:202
#, no-wrap, priority:100
msgid " $ fork_point=$(git merge-base --fork-point origin/master topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:190
+#: en/git-merge-base.txt:204
#, priority:100
msgid "will find B0, and"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:192
+#: en/git-merge-base.txt:206
#, no-wrap, priority:100
msgid " $ git rebase --onto origin/master $fork_point topic\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:195
+#: en/git-merge-base.txt:209
#, priority:100
msgid "will replay D0, D1 and D on top of B to create a new history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:203
+#. type: delimited block .
+#: en/git-merge-base.txt:218
#, no-wrap, priority:100
msgid ""
-"\t\t\t o---B2\n"
-"\t\t\t/\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t\t\\ \\\n"
-"\t\t B0 D0'--D1'--D' (topic - updated)\n"
-"\t\t \\\n"
-"\t\t D0---D1---D (topic - old)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\ \\\n"
+"\t B0 D0'--D1'--D' (topic - updated)\n"
+"\t \\\n"
+"\t D0---D1---D (topic - old)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:210
+#: en/git-merge-base.txt:226
#, priority:100
msgid "A caveat is that older reflog entries in your repository may be expired by `git gc`. If B0 no longer appears in the reflog of the remote-tracking branch `origin/master`, the `--fork-point` mode obviously cannot find it and fails, avoiding to give a random and useless result (such as the parent of B0, like the same command without the `--fork-point` option gives)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:221
+#: en/git-merge-base.txt:237
#, priority:100
msgid "Also, the remote-tracking branch you use the `--fork-point` mode with must be the one your topic forked from its tip. If you forked from an older commit than the tip, this mode would not find the fork point (imagine in the above sample history B0 did not exist, origin/master started at B1, moved to B2 and then B, and you forked your topic at origin/master^ when origin/master was B1; the shape of the history would be the same as above, without B0, and the parent of B1 is what `git merge-base origin/master topic` correctly finds, but the `--fork-point` mode will not, because it is not one of the commits that used to be at the tip of origin/master)."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:224
+#: en/git-merge-base.txt:240
#, no-wrap, priority:100
msgid "See also"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:228
+#: en/git-merge-base.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
msgstr "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
@@ -31779,31 +32133,31 @@ msgstr ""
msgid "Examples:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:62
+#. type: delimited block -
+#: en/git-merge-index.txt:63
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
-" This is MM from the original tree.\t\t\t# original\n"
-" This is modified MM in the branch A.\t\t\t# merge1\n"
-" This is modified MM in the branch B.\t\t\t# merge2\n"
-" This is modified MM in the branch B.\t\t\t# current contents\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
+"This is MM from the original tree.\t\t# original\n"
+"This is modified MM in the branch A.\t\t# merge1\n"
+"This is modified MM in the branch B.\t\t# merge2\n"
+"This is modified MM in the branch B.\t\t# current contents\n"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:71
+#. type: delimited block -
+#: en/git-merge-index.txt:74
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
-" cat: : No such file or directory\n"
-" This is added AA in the branch A.\n"
-" This is added AA in the branch B.\n"
-" This is added AA in the branch B.\n"
-" fatal: merge program failed\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
+"cat: : No such file or directory\n"
+"This is added AA in the branch A.\n"
+"This is added AA in the branch B.\n"
+"This is added AA in the branch B.\n"
+"fatal: merge program failed\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-index.txt:76
+#: en/git-merge-index.txt:80
#, priority:100
msgid "where the latter example shows how 'git merge-index' will stop trying to merge once anything has returned an error (i.e., `cat` returned an error for the AA file, because it didn't exist in the original, and thus 'git merge-index' didn't even try to merge the MM thing)."
msgstr ""
@@ -32101,7 +32455,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n"
-"\t[-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
+"\t[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
"\t[--[no-]allow-unrelated-histories]\n"
"\t[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]\n"
"'git merge' (--continue | --abort | --quit)\n"
@@ -33183,7 +33537,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:281 en/merge-options.txt:108
+#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -34163,7 +34517,7 @@ msgid "Conflicts can occur when applying a commit to p4. When this happens, the
msgstr ""
#. type: Labeled list
-#: en/git-p4.txt:359 en/git-submodule.txt:270
+#: en/git-p4.txt:359 en/git-submodule.txt:271
#, no-wrap, priority:220
msgid "--branch <branch>"
msgstr ""
@@ -35299,7 +35653,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:263 en/rev-list-options.txt:760
+#: en/git-pack-objects.txt:263 en/rev-list-options.txt:776
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -35311,13 +35665,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:266 en/rev-list-options.txt:767
+#: en/git-pack-objects.txt:266 en/rev-list-options.txt:783
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:269 en/rev-list-options.txt:770
+#: en/git-pack-objects.txt:269 en/rev-list-options.txt:786
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -35329,7 +35683,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:276 en/rev-list-options.txt:777
+#: en/git-pack-objects.txt:276 en/rev-list-options.txt:793
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -35341,7 +35695,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:281 en/rev-list-options.txt:785
+#: en/git-pack-objects.txt:281 en/rev-list-options.txt:801
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -36100,13 +36454,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:502
+#: en/git-pull.txt:136 en/git-rebase.txt:524
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:503
+#: en/git-pull.txt:137 en/git-rebase.txt:525
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -37899,8 +38253,8 @@ msgstr ""
#: en/git-rebase.txt:16
#, no-wrap, priority:100
msgid ""
-"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
-"\t[<upstream> [<branch>]]\n"
+"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>]\n"
+"\t[--onto <newbase> | --keep-base] [<upstream> [<branch>]]\n"
"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
"\t--root [<branch>]\n"
"'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch)\n"
@@ -38219,512 +38573,542 @@ msgstr ""
msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:220
+#, ignore-same, no-wrap, priority:100
+msgid "--keep-base"
+msgstr "--keep-base"
+
+#. type: Plain text
+#: en/git-rebase.txt:225
+#, ignore-ellipsis, priority:100
+msgid "Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running 'git rebase --keep-base <upstream> <branch>' is equivalent to running 'git rebase --onto <upstream>... <upstream>'."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:230
+#, priority:100
+msgid "This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:235
+#, priority:100
+msgid "Although both this option and --fork-point find the merge base between <upstream> and <branch>, this option uses the merge base as the _starting point_ on which new commits will be created, whereas --fork-point uses the merge base to determine the _set of commits_ which will be rebased."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#, priority:100
+msgid "See also INCOMPATIBLE OPTIONS below."
+msgstr ""
+
#. type: Plain text
-#: en/git-rebase.txt:224
+#: en/git-rebase.txt:242
#, priority:100
msgid "Upstream branch to compare against. May be any valid commit, not just an existing branch name. Defaults to the configured upstream for the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:230
+#: en/git-rebase.txt:248
#, priority:100
msgid "Restart the rebasing process after having resolved a merge conflict."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237
+#: en/git-rebase.txt:255
#, priority:100
msgid "Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:242
+#: en/git-rebase.txt:260
#, priority:100
msgid "Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:243 en/git-rebase.txt:538
+#: en/git-rebase.txt:261 en/git-rebase.txt:560
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:246
+#: en/git-rebase.txt:264
#, priority:100
msgid "Keep the commits that do not change anything from its parents in the result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:248 en/git-rebase.txt:255 en/git-rebase.txt:280 en/git-rebase.txt:293 en/git-rebase.txt:302 en/git-rebase.txt:344 en/git-rebase.txt:379 en/git-rebase.txt:386 en/git-rebase.txt:393 en/git-rebase.txt:405 en/git-rebase.txt:445 en/git-rebase.txt:470 en/git-rebase.txt:482 en/git-rebase.txt:501
-#, priority:100
-msgid "See also INCOMPATIBLE OPTIONS below."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rebase.txt:253
+#: en/git-rebase.txt:271
#, priority:100
msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:258
+#: en/git-rebase.txt:276
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:259 en/git-rebase.txt:539
+#: en/git-rebase.txt:277 en/git-rebase.txt:561
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:261
+#: en/git-rebase.txt:279
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:266
+#: en/git-rebase.txt:284
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:272
+#: en/git-rebase.txt:290
#, priority:100
msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:278
+#: en/git-rebase.txt:296
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:286
+#: en/git-rebase.txt:304
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:291
+#: en/git-rebase.txt:309
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:294
+#: en/git-rebase.txt:312
#, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:295
+#: en/git-rebase.txt:313
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:300
+#: en/git-rebase.txt:318
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:317
+#: en/git-rebase.txt:335
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:321
+#: en/git-rebase.txt:339
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:325
+#: en/git-rebase.txt:343
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:329
+#: en/git-rebase.txt:347
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:332
+#: en/git-rebase.txt:350
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:333 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:336
+#: en/git-rebase.txt:354
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:345 en/merge-options.txt:47
+#: en/git-rebase.txt:363 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:346
+#: en/git-rebase.txt:364
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:351
+#: en/git-rebase.txt:369
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:357
+#: en/git-rebase.txt:375
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:359
+#: en/git-rebase.txt:377
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:363
+#: en/git-rebase.txt:381
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:387
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:372
+#: en/git-rebase.txt:390
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:394
+#, priority:100
+msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:399
#, priority:100
msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:384
+#: en/git-rebase.txt:406
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:391
+#: en/git-rebase.txt:413
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:421
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:403
+#: en/git-rebase.txt:425
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:407
+#: en/git-rebase.txt:429
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:415
+#: en/git-rebase.txt:437
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:422
+#: en/git-rebase.txt:444
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:426
+#: en/git-rebase.txt:448
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges`, but in contrast to that option works well in interactive rebases: commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:430
+#: en/git-rebase.txt:452
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:432
+#: en/git-rebase.txt:454
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:434 en/git-rebase.txt:535 en/git-svn.txt:680
+#: en/git-rebase.txt:456 en/git-rebase.txt:557 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:439
+#: en/git-rebase.txt:461
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:443
+#: en/git-rebase.txt:465
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:446
+#: en/git-rebase.txt:468
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:447
+#: en/git-rebase.txt:469
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:474
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:455
+#: en/git-rebase.txt:477
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:457
+#: en/git-rebase.txt:479
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:459
+#: en/git-rebase.txt:481
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:483
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:487
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:490
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:480
+#: en/git-rebase.txt:502
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:505
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:484
+#: en/git-rebase.txt:506
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:495
+#: en/git-rebase.txt:517
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:499
+#: en/git-rebase.txt:521
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:509
+#: en/git-rebase.txt:531
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:510
+#: en/git-rebase.txt:532
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:511
+#: en/git-rebase.txt:533
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:514
+#: en/git-rebase.txt:536
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:516
+#: en/git-rebase.txt:538
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:519
+#: en/git-rebase.txt:541
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:523
+#: en/git-rebase.txt:545
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:527
+#: en/git-rebase.txt:549
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:530
+#: en/git-rebase.txt:552
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:553
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:555
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Plain text
-#: en/git-rebase.txt:534
+#: en/git-rebase.txt:556
#, ignore-same, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:537
+#: en/git-rebase.txt:559
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:540
+#: en/git-rebase.txt:562
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:542
+#: en/git-rebase.txt:564
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:544
+#: en/git-rebase.txt:566
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:567
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:546
+#: en/git-rebase.txt:568
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:547
+#: en/git-rebase.txt:569
#, priority:100
-msgid "--rebase-merges and --strategy"
+msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:548
+#: en/git-rebase.txt:570
#, priority:100
-msgid "--rebase-merges and --strategy-option"
+msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:550
+#: en/git-rebase.txt:572
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:575
#, no-wrap, priority:100
msgid "There are some subtle differences how the backends behave.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:556
+#: en/git-rebase.txt:578
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38732,7 +39116,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:561
+#: en/git-rebase.txt:583
#, no-wrap, priority:100
msgid ""
"The am backend drops any \"empty\" commits, regardless of whether the\n"
@@ -38742,7 +39126,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:588
#, no-wrap, priority:100
msgid ""
"The interactive backend drops commits by default that\n"
@@ -38752,7 +39136,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:591
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38760,7 +39144,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:573
+#: en/git-rebase.txt:595
#, no-wrap, priority:100
msgid ""
"Directory rename heuristics are enabled in the merge and interactive\n"
@@ -38769,145 +39153,145 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:597
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:577
+#: en/git-rebase.txt:599
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:582
+#: en/git-rebase.txt:604
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:587
+#: en/git-rebase.txt:609
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:589
+#: en/git-rebase.txt:611
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:596
+#: en/git-rebase.txt:618
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:598
+#: en/git-rebase.txt:620
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:600
+#: en/git-rebase.txt:622
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:601
+#: en/git-rebase.txt:623
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:602
+#: en/git-rebase.txt:624
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:603
+#: en/git-rebase.txt:625
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:605
+#: en/git-rebase.txt:627
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:607
+#: en/git-rebase.txt:629
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:631
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:610
+#: en/git-rebase.txt:632
#, priority:100
msgid "commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:612
+#: en/git-rebase.txt:634
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:614
+#: en/git-rebase.txt:636
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:615
+#: en/git-rebase.txt:637
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:616
+#: en/git-rebase.txt:638
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:644
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:646
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:626
+#: en/git-rebase.txt:648
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:653
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:658
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -38916,73 +39300,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:641
+#: en/git-rebase.txt:663
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:668
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:649
+#: en/git-rebase.txt:671
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:652
+#: en/git-rebase.txt:674
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:655
+#: en/git-rebase.txt:677
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:685
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:667
+#: en/git-rebase.txt:689
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:693
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:696
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:699
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:680
+#: en/git-rebase.txt:702
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:687
+#: en/git-rebase.txt:709
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -38993,25 +39377,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:691
+#: en/git-rebase.txt:713
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:694
+#: en/git-rebase.txt:716
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:701
+#: en/git-rebase.txt:723
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:710
+#: en/git-rebase.txt:732
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -39024,31 +39408,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:715
+#: en/git-rebase.txt:737
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:720
+#: en/git-rebase.txt:742
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:745
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:727
+#: en/git-rebase.txt:749
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:759
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -39062,85 +39446,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:740
+#: en/git-rebase.txt:762
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:746
+#: en/git-rebase.txt:768
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:750
+#: en/git-rebase.txt:772
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:752
+#: en/git-rebase.txt:774
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:756
+#: en/git-rebase.txt:778
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:760
+#: en/git-rebase.txt:782
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:763
+#: en/git-rebase.txt:785
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:765
+#: en/git-rebase.txt:787
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:767
+#: en/git-rebase.txt:789
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:794
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:775
+#: en/git-rebase.txt:797
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:804
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:809
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:816
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39151,13 +39535,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:819
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:826
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39168,13 +39552,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:808
+#: en/git-rebase.txt:830
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:815
+#: en/git-rebase.txt:837
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39185,73 +39569,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:822
+#: en/git-rebase.txt:844
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:824
+#: en/git-rebase.txt:846
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:825
+#: en/git-rebase.txt:847
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:829
+#: en/git-rebase.txt:851
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:836
+#: en/git-rebase.txt:859
#, priority:100
-msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or `filter-branch`."
+msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:839
+#: en/git-rebase.txt:862
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:867
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:848
+#: en/git-rebase.txt:871
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:850
+#: en/git-rebase.txt:873
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:875
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:858
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39262,19 +39646,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:885
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:866
+#: en/git-rebase.txt:889
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:894
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -39284,67 +39668,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:876
+#: en/git-rebase.txt:899
#, priority:100
-msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge-base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
+msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:880
+#: en/git-rebase.txt:903
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:883
+#: en/git-rebase.txt:906
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:886
+#: en/git-rebase.txt:909
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:888
+#: en/git-rebase.txt:911
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:893
+#: en/git-rebase.txt:916
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:895
+#: en/git-rebase.txt:918
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:926
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:907
+#: en/git-rebase.txt:930
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:912
+#: en/git-rebase.txt:935
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:922
+#: en/git-rebase.txt:945
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -39358,25 +39742,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:929
+#: en/git-rebase.txt:952
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:932
+#: en/git-rebase.txt:955
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:935 en/git-rebase.txt:1012
+#: en/git-rebase.txt:958 en/git-rebase.txt:1035
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:941
+#: en/git-rebase.txt:964
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39387,7 +39771,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:946
+#: en/git-rebase.txt:969
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39397,7 +39781,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:950
+#: en/git-rebase.txt:973
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39406,55 +39790,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:954
+#: en/git-rebase.txt:977
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:962
+#: en/git-rebase.txt:985
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:992
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:975
+#: en/git-rebase.txt:998
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:978
+#: en/git-rebase.txt:1001
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1008
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:989
+#: en/git-rebase.txt:1012
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:996
+#: en/git-rebase.txt:1019
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1003
+#: en/git-rebase.txt:1026
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39465,13 +39849,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1009
+#: en/git-rebase.txt:1032
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1015
+#: en/git-rebase.txt:1038
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39479,7 +39863,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1022
+#: en/git-rebase.txt:1045
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39491,7 +39875,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1049
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39500,37 +39884,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1035
+#: en/git-rebase.txt:1058
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1037
+#: en/git-rebase.txt:1060
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1039
+#: en/git-rebase.txt:1062
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1043
+#: en/git-rebase.txt:1066
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1068
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1072
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -39838,117 +40222,118 @@ msgstr ""
msgid "Using this hook, it is easy to generate mails describing the updates to the repository. This example script sends one mail message per ref listing the commits pushed to the repository, and logs the push certificates of signed pushes with good signatures to a logger service:"
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:191
+#. type: delimited block -
+#: en/git-receive-pack.txt:192
#, no-wrap, priority:100
msgid ""
-"\t#!/bin/sh\n"
-"\t# mail out commit update information.\n"
-"\twhile read oval nval ref\n"
-"\tdo\n"
-"\t\tif expr \"$oval\" : '0*$' >/dev/null\n"
-"\t\tthen\n"
-"\t\t\techo \"Created a new ref, with the following commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\"\n"
-"\t\telse\n"
-"\t\t\techo \"New commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
-"\t\tfi |\n"
-"\t\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
-"\tdone\n"
-"\t# log signed push certificate, if any\n"
-"\tif test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"#!/bin/sh\n"
+"# mail out commit update information.\n"
+"while read oval nval ref\n"
+"do\n"
+"\tif expr \"$oval\" : '0*$' >/dev/null\n"
"\tthen\n"
-"\t\t(\n"
-"\t\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
-"\t\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
-"\t\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
-"\tfi\n"
-"\texit 0\n"
+"\t\techo \"Created a new ref, with the following commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\"\n"
+"\telse\n"
+"\t\techo \"New commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
+"\tfi |\n"
+"\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
+"done\n"
+"# log signed push certificate, if any\n"
+"if test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"then\n"
+"\t(\n"
+"\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
+"\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
+"\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
+"fi\n"
+"exit 0\n"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:194
+#: en/git-receive-pack.txt:196
#, priority:100
msgid "The exit code from this hook invocation is ignored, however a non-zero exit code will generate an error message."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:200
+#: en/git-receive-pack.txt:202
#, priority:100
msgid "Note that it is possible for refname to not have sha1-new when this hook runs. This can easily occur if another user modifies the ref after it was updated by 'git-receive-pack', but before the hook was able to evaluate it. It is recommended that hooks rely on sha1-new rather than the current value of refname."
msgstr ""
#. type: Title -
-#: en/git-receive-pack.txt:202
+#: en/git-receive-pack.txt:204
#, no-wrap, priority:100
msgid "POST-UPDATE HOOK"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:207
+#: en/git-receive-pack.txt:209
#, priority:100
msgid "After all other processing, if at least one ref was updated, and if $GIT_DIR/hooks/post-update file exists and is executable, then post-update will be called with the list of refs that have been updated. This can be used to implement any repository wide cleanup tasks."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:211
+#: en/git-receive-pack.txt:213
#, priority:100
msgid "The exit code from this hook invocation is ignored; the only thing left for 'git-receive-pack' to do at that point is to exit itself anyway."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:214
+#: en/git-receive-pack.txt:216
#, priority:100
msgid "This hook can be used, for example, to run `git update-server-info` if the repository is packed and is served via a dumb transport."
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:217
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/git-receive-pack.txt:220
+#, fuzzy, no-wrap, priority:100
+#| msgid "git-update-server-info(1)"
msgid ""
-"\t#!/bin/sh\n"
-"\texec git update-server-info\n"
-msgstr ""
+"#!/bin/sh\n"
+"exec git update-server-info\n"
+msgstr "git-update-server-info(1)"
#. type: Title -
-#: en/git-receive-pack.txt:220
+#: en/git-receive-pack.txt:224
#, no-wrap, priority:100
msgid "QUARANTINE ENVIRONMENT"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:227
+#: en/git-receive-pack.txt:231
#, priority:100
msgid "When `receive-pack` takes in objects, they are placed into a temporary \"quarantine\" directory within the `$GIT_DIR/objects` directory and migrated into the main object store only after the `pre-receive` hook has completed. If the push fails before then, the temporary directory is removed entirely."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:229
+#: en/git-receive-pack.txt:233
#, priority:100
msgid "This has a few user-visible effects and caveats:"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:235
+#: en/git-receive-pack.txt:239
#, priority:100
msgid "Pushes which fail due to problems with the incoming pack, missing objects, or due to the `pre-receive` hook will not leave any on-disk data. This is usually helpful to prevent repeated failed pushes from filling up your disk, but can make debugging more challenging."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:238
+#: en/git-receive-pack.txt:242
#, priority:100
msgid "Any objects created by the `pre-receive` hook will be created in the quarantine directory (and migrated only if it succeeds)."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:244
+#: en/git-receive-pack.txt:248
#, priority:100
msgid "The `pre-receive` hook MUST NOT update any refs to point to quarantined objects. Other programs accessing the repository will not be able to see the objects (and if the pre-receive hook fails, those refs would become corrupted). For safety, any ref updates from within `pre-receive` are automatically rejected."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:249
+#: en/git-receive-pack.txt:253
#, ignore-same, priority:100
msgid "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
msgstr "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
@@ -41276,7 +41661,7 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:131
#, priority:100
-msgid "linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and linkgit:git-rebase[1], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
+msgid "linkgit:git-hash-object[1], linkgit:git-rebase[1], and https://github.com/newren/git-filter-repo[git-filter-repo], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
msgstr ""
#. type: Plain text
@@ -41299,9 +41684,10 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:158
-#, priority:100
-msgid "linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1]"
-msgstr ""
+#, fuzzy, priority:100
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] https://github.com/newren/git-filter-repo[git-filter-repo]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title =
#: en/git-request-pull.txt:2
@@ -42100,7 +42486,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:228 en/git-stash.txt:229
+#: en/git-reset.txt:228 en/git-stash.txt:230
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -42853,102 +43239,50 @@ msgid "git-rev-list - Lists commit objects in reverse chronological order"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:65
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"'git rev-list' [ --max-count=<number> ]\n"
-"\t [ --skip=<number> ]\n"
-"\t [ --max-age=<timestamp> ]\n"
-"\t [ --min-age=<timestamp> ]\n"
-"\t [ --sparse ]\n"
-"\t [ --merges ]\n"
-"\t [ --no-merges ]\n"
-"\t [ --min-parents=<number> ]\n"
-"\t [ --no-min-parents ]\n"
-"\t [ --max-parents=<number> ]\n"
-"\t [ --no-max-parents ]\n"
-"\t [ --first-parent ]\n"
-"\t [ --remove-empty ]\n"
-"\t [ --full-history ]\n"
-"\t [ --not ]\n"
-"\t [ --all ]\n"
-"\t [ --branches[=<pattern>] ]\n"
-"\t [ --tags[=<pattern>] ]\n"
-"\t [ --remotes[=<pattern>] ]\n"
-"\t [ --glob=<glob-pattern> ]\n"
-"\t [ --ignore-missing ]\n"
-"\t [ --stdin ]\n"
-"\t [ --quiet ]\n"
-"\t [ --topo-order ]\n"
-"\t [ --parents ]\n"
-"\t [ --timestamp ]\n"
-"\t [ --left-right ]\n"
-"\t [ --left-only ]\n"
-"\t [ --right-only ]\n"
-"\t [ --cherry-mark ]\n"
-"\t [ --cherry-pick ]\n"
-"\t [ --encoding=<encoding> ]\n"
-"\t [ --(author|committer|grep)=<pattern> ]\n"
-"\t [ --regexp-ignore-case | -i ]\n"
-"\t [ --extended-regexp | -E ]\n"
-"\t [ --fixed-strings | -F ]\n"
-"\t [ --date=<format>]\n"
-"\t [ [ --objects | --objects-edge | --objects-edge-aggressive ]\n"
-"\t [ --unpacked ]\n"
-"\t [ --object-names | --no-object-names ]\n"
-"\t [ --filter=<filter-spec> [ --filter-print-omitted ] ] ]\n"
-"\t [ --missing=<missing-action> ]\n"
-"\t [ --pretty | --header ]\n"
-"\t [ --bisect ]\n"
-"\t [ --bisect-vars ]\n"
-"\t [ --bisect-all ]\n"
-"\t [ --merge ]\n"
-"\t [ --reverse ]\n"
-"\t [ --walk-reflogs ]\n"
-"\t [ --no-walk ] [ --do-walk ]\n"
-"\t [ --count ]\n"
-"\t [ --use-bitmap-index ]\n"
-"\t <commit>... [ \\-- <paths>... ]\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:73
+#: en/git-rev-list.txt:13
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
+#| msgid "'git check-mailmap' [<options>] <contact>...\n"
+msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n"
+msgstr "'git verificar-mailmap' [<op챌천es>] <contato>...\n"
+
+#. type: Plain text
+#: en/git-rev-list.txt:21
#, priority:100
msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:80
+#: en/git-rev-list.txt:28
#, priority:100
msgid "You can think of this as a set operation. Commits given on the command line form a set of commits that are reachable from any of them, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:82
+#: en/git-rev-list.txt:30
#, priority:100
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:85
+#: en/git-rev-list.txt:33
#, no-wrap, priority:100
msgid "\t$ git rev-list foo bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:89
+#: en/git-rev-list.txt:37
#, priority:100
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:93
+#: en/git-rev-list.txt:41
#, priority:100
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:97
+#: en/git-rev-list.txt:45
#, no-wrap, priority:100
msgid ""
"\t$ git rev-list origin..HEAD\n"
@@ -42956,13 +43290,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:102
+#: en/git-rev-list.txt:50
#, ignore-ellipsis, priority:100
msgid "Another special notation is \"'<commit1>'...'<commit2>'\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:106
+#: en/git-rev-list.txt:54
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git rev-list A B --not $(git merge-base --all A B)\n"
@@ -42970,7 +43304,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:113
+#: en/git-rev-list.txt:61
#, priority:100
msgid "'rev-list' is a very essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For this reason, it has a lot of different options that enables it to be used by commands as different as 'git bisect' and 'git repack'."
msgstr ""
@@ -45092,31 +45426,31 @@ msgstr ""
msgid "To use 'git send-email' to send your patches through the GMail SMTP server, edit ~/.gitconfig to specify your account settings:"
msgstr ""
-#. type: Plain text
-#: en/git-send-email.txt:494
+#. type: delimited block -
+#: en/git-send-email.txt:495
#, no-wrap, priority:100
msgid ""
-"\t[sendemail]\n"
-"\t\tsmtpEncryption = tls\n"
-"\t\tsmtpServer = smtp.gmail.com\n"
-"\t\tsmtpUser = yourname@gmail.com\n"
-"\t\tsmtpServerPort = 587\n"
+"[sendemail]\n"
+"\tsmtpEncryption = tls\n"
+"\tsmtpServer = smtp.gmail.com\n"
+"\tsmtpUser = yourname@gmail.com\n"
+"\tsmtpServerPort = 587\n"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:498
+#: en/git-send-email.txt:500
#, priority:100
msgid "If you have multifactor authentication setup on your gmail account, you will need to generate an app-specific password for use with 'git send-email'. Visit https://security.google.com/settings/security/apppasswords to create it."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:501
+#: en/git-send-email.txt:503
#, priority:100
msgid "Once your commits are ready to be sent to the mailing list, run the following commands:"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:505
+#: en/git-send-email.txt:507
#, no-wrap, priority:100
msgid ""
"\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -45125,19 +45459,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:510
+#: en/git-send-email.txt:512
#, priority:100
msgid "The first time you run it, you will be prompted for your credentials. Enter the app-specific or your regular password as appropriate. If you have credential helper configured (see linkgit:git-credential[1]), the password will be saved in the credential store so you won't have to type it the next time."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:518
#, priority:100
msgid "Note: the following core Perl modules that may be installed with your distribution of Perl are required: MIME::Base64, MIME::QuotedPrint, Net::Domain and Net::SMTP. These additional Perl modules are also required: Authen::SASL and Mail::Address."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:521
+#: en/git-send-email.txt:523
#, priority:100
msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
msgstr ""
@@ -46726,25 +47060,25 @@ msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--a
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:92
+#: en/git-stash.txt:93
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs, and any non-option arguments form the message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:93
+#: en/git-stash.txt:94
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:100
+#: en/git-stash.txt:101
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:104
+#: en/git-stash.txt:105
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46752,139 +47086,139 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:108
+#: en/git-stash.txt:109
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:109
+#: en/git-stash.txt:110
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:119
+#: en/git-stash.txt:120
#, priority:240
msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:120
+#: en/git-stash.txt:121
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:126
+#: en/git-stash.txt:127
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:130
+#: en/git-stash.txt:131
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:135
+#: en/git-stash.txt:136
#, priority:240
msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:138
+#: en/git-stash.txt:139
#, priority:240
msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:139
+#: en/git-stash.txt:140
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:145
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:145
+#: en/git-stash.txt:146
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:153
+#: en/git-stash.txt:154
#, priority:240
msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:159
+#: en/git-stash.txt:160
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:160
+#: en/git-stash.txt:161
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:164
+#: en/git-stash.txt:165
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:165
+#: en/git-stash.txt:166
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:171
+#: en/git-stash.txt:172
#, priority:240
msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:172 en/git-update-ref.txt:100
+#: en/git-stash.txt:173 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:179
+#: en/git-stash.txt:180
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:180
+#: en/git-stash.txt:181
#, no-wrap, priority:240
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:186
+#: en/git-stash.txt:187
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:195
+#: en/git-stash.txt:196
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:199
+#: en/git-stash.txt:200
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46893,31 +47227,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:203
+#: en/git-stash.txt:204
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:208
+#: en/git-stash.txt:209
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:214
+#: en/git-stash.txt:215
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:219
+#: en/git-stash.txt:220
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:227
+#: en/git-stash.txt:228
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -46929,13 +47263,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:235
+#: en/git-stash.txt:236
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:246
+#: en/git-stash.txt:247
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46950,13 +47284,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:249
+#: en/git-stash.txt:250
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:257
+#: en/git-stash.txt:258
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46968,19 +47302,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:259
+#: en/git-stash.txt:260
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:264
+#: en/git-stash.txt:265
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:275
+#: en/git-stash.txt:276
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46995,19 +47329,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:277
+#: en/git-stash.txt:278
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:283
+#: en/git-stash.txt:284
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:288
+#: en/git-stash.txt:289
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -47016,7 +47350,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:298
+#: en/git-stash.txt:299
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -47094,61 +47428,61 @@ msgid "In addition to the names of files that have been changed, also show the t
msgstr ""
#. type: Plain text
-#: en/git-status.txt:65
+#: en/git-status.txt:66
#, priority:280
msgid "The mode parameter is used to specify the handling of untracked files. It is optional: it defaults to 'all', and if specified, it must be stuck to the option (e.g. `-uno`, but not `-u no`)."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:69
+#: en/git-status.txt:70
#, no-wrap, priority:280
msgid "'no' - Show no untracked files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:70
+#: en/git-status.txt:71
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:81
+#: en/git-status.txt:82
#, priority:280
msgid "When `-u` option is not used, untracked files and directories are shown (i.e. the same as specifying `normal`), to help you avoid forgetting to add newly created files. Because it takes extra work to find untracked files in the filesystem, this mode may take some time in a large working tree. Consider enabling untracked cache and split index if supported (see `git update-index --untracked-cache` and `git update-index --split-index`), Otherwise you can use `no` to have `git status` return more quickly without showing untracked files."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:99
+#: en/git-status.txt:101
#, priority:280
msgid "Ignore changes to submodules when looking for changes. <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 before 1.7.0). Using \"all\" hides all changes to submodules (and suppresses the output of submodule summaries when the config option `status.submoduleSummary` is set)."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:100
+#: en/git-status.txt:102
#, no-wrap, priority:280
msgid "--ignored[=<mode>]"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:102
+#: en/git-status.txt:104
#, priority:280
msgid "Show ignored files as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:105
+#: en/git-status.txt:108
#, priority:280
msgid "The mode parameter is used to specify the handling of ignored files. It is optional: it defaults to 'traditional'."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:109
+#: en/git-status.txt:112
#, priority:280
msgid "'traditional' - Shows ignored files and directories, unless"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:112
+#: en/git-status.txt:115
#, no-wrap, priority:280
msgid ""
"--untracked-files=all is specified, in which case\n"
@@ -47157,109 +47491,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:113
+#: en/git-status.txt:116
#, no-wrap, priority:280
msgid "'no'\t - Show no ignored files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:114
+#: en/git-status.txt:117
#, no-wrap, priority:280
msgid "'matching' - Shows ignored files and directories matching an\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:115
+#: en/git-status.txt:118
#, no-wrap, priority:280
msgid "ignore pattern.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:121
+#: en/git-status.txt:124
#, priority:280
msgid "When 'matching' mode is specified, paths that explicitly match an ignored pattern are shown. If a directory matches an ignore pattern, then it is shown, but not paths contained in the ignored directory. If a directory does not match an ignore pattern, but all contents are ignored, then the directory is not shown, but all contents are shown."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:125
+#: en/git-status.txt:129
#, priority:280
msgid "Terminate entries with NUL, instead of LF. This implies the `--porcelain=v1` output format if no other format is given."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:132
+#: en/git-status.txt:136
#, priority:280
msgid "Display untracked files in columns. See configuration variable column.status for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:133
+#: en/git-status.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--ahead-behind"
msgstr "--ahead-behind"
#. type: Labeled list
-#: en/git-status.txt:134
+#: en/git-status.txt:138
#, ignore-same, no-wrap, priority:280
msgid "--no-ahead-behind"
msgstr "--no-ahead-behind"
#. type: Plain text
-#: en/git-status.txt:137
+#: en/git-status.txt:141
#, priority:280
msgid "Display or do not display detailed ahead/behind counts for the branch relative to its upstream branch. Defaults to true."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:138
+#: en/git-status.txt:142
#, ignore-same, no-wrap, priority:280
msgid "--renames"
msgstr "--renames"
#. type: Plain text
-#: en/git-status.txt:142
+#: en/git-status.txt:146
#, priority:280
msgid "Turn on/off rename detection regardless of user configuration. See also linkgit:git-diff[1] `--no-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:147
+#: en/git-status.txt:151
#, priority:280
msgid "Turn on rename detection, optionally setting the similarity threshold. See also linkgit:git-diff[1] `--find-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:150
+#: en/git-status.txt:154
#, priority:280
msgid "See the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:158
+#: en/git-status.txt:162
#, priority:280
msgid "The output from this command is designed to be used as a commit template comment. The default, long format, is designed to be human readable, verbose and descriptive. Its contents and format are subject to change at any time."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:163
+#: en/git-status.txt:167
#, priority:280
msgid "The paths mentioned in the output, unlike many other Git commands, are made relative to the current directory if you are working in a subdirectory (this is on purpose, to help cutting and pasting). See the status.relativePaths config option below."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:165
+#: en/git-status.txt:169
#, no-wrap, priority:280
msgid "Short Format"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:169
+#: en/git-status.txt:173
#, priority:280
msgid "In the short-format, the status of each path is shown as one of these forms"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:172
+#: en/git-status.txt:176
#, no-wrap, priority:280
msgid ""
"\tXY PATH\n"
@@ -47267,73 +47601,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:176
+#: en/git-status.txt:180
#, priority:280
msgid "where `ORIG_PATH` is where the renamed/copied contents came from. `ORIG_PATH` is only shown when the entry is renamed or copied. The `XY` is a two-letter status code."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:182
+#: en/git-status.txt:186
#, priority:280
msgid "The fields (including the `->`) are separated from each other by a single space. If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash-escaped."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:188
+#: en/git-status.txt:192
#, priority:280
msgid "For paths with merge conflicts, `X` and `Y` show the modification states of each side of the merge. For paths that do not have merge conflicts, `X` shows the status of the index, and `Y` shows the status of the work tree. For untracked paths, `XY` are `??`. Other status codes can be interpreted as follows:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:190
+#: en/git-status.txt:194
#, priority:280
msgid "' ' = unmodified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:191
+#: en/git-status.txt:195
#, priority:280
msgid "'M' = modified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:192
+#: en/git-status.txt:196
#, priority:280
msgid "'A' = added"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:193
+#: en/git-status.txt:197
#, priority:280
msgid "'D' = deleted"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:194
+#: en/git-status.txt:198
#, priority:280
msgid "'R' = renamed"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:195
+#: en/git-status.txt:199
#, priority:280
msgid "'C' = copied"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:196
+#: en/git-status.txt:200
#, priority:280
msgid "'U' = updated but unmerged"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:199
+#: en/git-status.txt:203
#, priority:280
msgid "Ignored files are not listed, unless `--ignored` option is in effect, in which case `XY` are `!!`."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:226
+#: en/git-status.txt:230
#, no-wrap, priority:280
msgid ""
"X Y Meaning\n"
@@ -47364,7 +47698,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:235
+#: en/git-status.txt:239
#, no-wrap, priority:280
msgid ""
"Submodules have more state and instead report\n"
@@ -47377,91 +47711,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:238
+#: en/git-status.txt:242
#, priority:280
msgid "'m' and '?' are applied recursively. For example if a nested submodule in a submodule contains an untracked file, this is reported as '?' as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:240
+#: en/git-status.txt:244
#, priority:280
msgid "If -b is used the short-format status is preceded by a line"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:242
+#: en/git-status.txt:246
#, no-wrap, priority:280
msgid " ## branchname tracking info\n"
msgstr ""
#. type: Title ~
-#: en/git-status.txt:244
+#: en/git-status.txt:248
#, no-wrap, priority:280
msgid "Porcelain Format Version 1"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:251
+#: en/git-status.txt:255
#, priority:280
msgid "Version 1 porcelain format is similar to the short format, but is guaranteed not to change in a backwards-incompatible way between Git versions or based on user configuration. This makes it ideal for parsing by scripts. The description of the short format above also describes the porcelain format, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:254
+#: en/git-status.txt:258
#, priority:280
msgid "The user's color.status configuration is not respected; color will always be off."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:257
+#: en/git-status.txt:261
#, priority:280
msgid "The user's status.relativePaths configuration is not respected; paths shown will always be relative to the repository root."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:267
+#: en/git-status.txt:271
#, priority:280
msgid "There is also an alternate -z format recommended for machine parsing. In that format, the status field is the same, but some other things change. First, the '\\->' is omitted from rename entries and the field order is reversed (e.g 'from \\-> to' becomes 'to from'). Second, a NUL (ASCII 0) follows each filename, replacing space as a field separator and the terminating newline (but a space still separates the status field from the first filename). Third, filenames containing special characters are not specially formatted; no quoting or backslash-escaping is performed."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:269
+#: en/git-status.txt:273
#, priority:280
msgid "Any submodule changes are reported as modified `M` instead of `m` or single `?`."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:271
+#: en/git-status.txt:275
#, no-wrap, priority:280
msgid "Porcelain Format Version 2"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:276
+#: en/git-status.txt:280
#, priority:280
msgid "Version 2 format adds more detailed information about the state of the worktree and changed items. Version 2 also defines an extensible set of easy to parse optional headers."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:280
+#: en/git-status.txt:284
#, priority:280
msgid "Header lines start with \"#\" and are added in response to specific command line arguments. Parsers should ignore headers they don't recognize."
msgstr ""
#. type: Title ^
-#: en/git-status.txt:282
+#: en/git-status.txt:286
#, no-wrap, priority:280
msgid "Branch Headers"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:286
+#: en/git-status.txt:290
#, priority:280
msgid "If `--branch` is given, a series of header lines are printed with information about the current branch."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:296
+#: en/git-status.txt:300
#, no-wrap, priority:280
msgid ""
"Line Notes\n"
@@ -47475,43 +47809,43 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:299
+#: en/git-status.txt:303
#, no-wrap, priority:280
msgid "Changed Tracked Entries"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:306
+#: en/git-status.txt:310
#, priority:280
msgid "Following the headers, a series of lines are printed for tracked entries. One of three different line formats may be used to describe an entry depending on the type of change. Tracked entries are printed in an undefined order; parsers should allow for a mixture of the 3 line types in any order."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:308
+#: en/git-status.txt:312
#, priority:280
msgid "Ordinary changed entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:310
+#: en/git-status.txt:314
#, no-wrap, priority:280
msgid " 1 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:312
+#: en/git-status.txt:316
#, priority:280
msgid "Renamed or copied entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:314
+#: en/git-status.txt:318
#, no-wrap, priority:280
msgid " 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:345
+#: en/git-status.txt:349
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47546,19 +47880,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:349
+#: en/git-status.txt:353
#, priority:280
msgid "Unmerged entries have the following format; the first character is a \"u\" to distinguish from ordinary changed entries."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:351
+#: en/git-status.txt:355
#, no-wrap, priority:280
msgid " u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:368
+#: en/git-status.txt:372
#, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47579,85 +47913,85 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:371
+#: en/git-status.txt:375
#, no-wrap, priority:280
msgid "Other Items"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:376
+#: en/git-status.txt:380
#, priority:280
msgid "Following the tracked entries (and if requested), a series of lines will be printed for untracked and then ignored items found in the worktree."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:378
+#: en/git-status.txt:382
#, priority:280
msgid "Untracked items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:380
+#: en/git-status.txt:384
#, no-wrap, priority:280
msgid " ? <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:382
+#: en/git-status.txt:386
#, priority:280
msgid "Ignored items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:384
+#: en/git-status.txt:388
#, no-wrap, priority:280
msgid " ! <path>\n"
msgstr ""
#. type: Title ^
-#: en/git-status.txt:386
+#: en/git-status.txt:390
#, no-wrap, priority:280
msgid "Pathname Format Notes and -z"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:391
+#: en/git-status.txt:395
#, priority:280
msgid "When the `-z` option is given, pathnames are printed as is and without any quoting and lines are terminated with a NUL (ASCII 0x00) byte."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:395
+#: en/git-status.txt:399
#, 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])."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:404
+#: en/git-status.txt:408
#, priority:280
msgid "The command honors `color.status` (or `status.color` -- they mean the same thing and the latter is kept for backward compatibility) and `color.status.<slot>` configuration variables to colorize its output."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:408
+#: en/git-status.txt:412
#, priority:280
msgid "If the config variable `status.relativePaths` is set to false, then all paths shown are relative to the repository root, not to the current directory."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:419
+#: en/git-status.txt:423
#, priority:280
msgid "If `status.submoduleSummary` is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). Please note that the summary output from the status command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings."
msgstr ""
#. type: Title -
-#: en/git-status.txt:421
+#: en/git-status.txt:425
#, no-wrap, priority:280
msgid "BACKGROUND REFRESH"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:432
+#: en/git-status.txt:436
#, priority:280
msgid "By default, `git status` will automatically refresh the index, updating the cached stat information from the working tree and writing out the result. Writing out the updated index is an optimization that isn't strictly necessary (`status` computes the values for itself, but writing them out is just to save subsequent programs from repeating our computation). When `status` is run in the background, the lock held during the write may conflict with other simultaneous processes, causing them to fail. Scripts running `status` in the background should consider using `git --no-optional-locks status` (see linkgit:git[1] for details)."
msgstr ""
@@ -48101,282 +48435,288 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:176
#, no-wrap, priority:220
-msgid "set-branch ((-d|--default)|(-b|--branch <branch>)) [--] <path>"
+msgid "set-branch (-b|--branch) <branch> [--] <path>"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-submodule.txt:177
+#, no-wrap, priority:220
+msgid "set-branch (-d|--default) [--] <path>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:181
+#: en/git-submodule.txt:182
#, priority:220
msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:182
+#: en/git-submodule.txt:183
#, ignore-ellipsis, no-wrap, priority:220
msgid "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:191
+#: en/git-submodule.txt:192
#, priority:220
msgid "Show commit summary between the given commit (defaults to HEAD) and working tree/index. For a submodule in question, a series of commits in the submodule between the given super project commit and the index or working tree (switched by `--cached`) are shown. If the option `--files` is given, show the series of commits in the submodule between the index of the super project and the working tree of the submodule (this option doesn't allow to use the `--cached` option or to provide an explicit commit)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:194
+#: en/git-submodule.txt:195
#, priority:220
msgid "Using the `--submodule=log` option with linkgit:git-diff[1] will provide that information too."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:195
+#: en/git-submodule.txt:196
#, no-wrap, priority:220
msgid "foreach [--recursive] <command>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:216
+#: en/git-submodule.txt:217
#, priority:220
msgid "Evaluates an arbitrary shell command in each checked out submodule. The command has access to the variables $name, $sm_path, $displaypath, $sha1 and $toplevel: $name is the name of the relevant submodule section in `.gitmodules`, $sm_path is the path of the submodule as recorded in the immediate superproject, $displaypath contains the relative path from the current working directory to the submodules root directory, $sha1 is the commit as recorded in the immediate superproject, and $toplevel is the absolute path to the top-level of the immediate superproject. Note that to avoid conflicts with '$PATH' on Windows, the '$path' variable is now a deprecated synonym of '$sm_path' variable. Any submodules defined in the superproject but not checked out are ignored by this command. Unless given `--quiet`, foreach prints the name of each submodule before evaluating the command. If `--recursive` is given, submodules are traversed recursively (i.e. the given shell command is evaluated in nested submodules as well). A non-zero return from the command in any submodule causes the processing to terminate. This can be overridden by adding '|| :' to the end of the command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:219
+#: en/git-submodule.txt:220
#, priority:220
msgid "As an example, the command below will show the path and currently checked out commit for each submodule:"
msgstr ""
#. type: delimited block -
-#: en/git-submodule.txt:222
+#: en/git-submodule.txt:223
#, no-wrap, priority:220
msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:224
+#: en/git-submodule.txt:225
#, ignore-ellipsis, no-wrap, priority:220
msgid "sync [--recursive] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:231
+#: en/git-submodule.txt:232
#, priority:220
msgid "Synchronizes submodules' remote URL configuration setting to the value specified in `.gitmodules`. It will only affect those submodules which already have a URL entry in .git/config (that is the case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:234
+#: en/git-submodule.txt:235
#, priority:220
msgid "`git submodule sync` synchronizes all submodules while `git submodule sync -- A` synchronizes submodule \"A\" only."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:237
+#: en/git-submodule.txt:238
#, priority:220
msgid "If `--recursive` is specified, this command will recurse into the registered submodules, and sync any nested submodules within."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:238
+#: en/git-submodule.txt:239
#, no-wrap, priority:220
msgid "absorbgitdirs"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:245
+#: en/git-submodule.txt:246
#, priority:220
msgid "If a git directory of a submodule is inside the submodule, move the git directory of the submodule into its superprojects `$GIT_DIR/modules` path and then connect the git directory and its working directory by setting the `core.worktree` and adding a .git file pointing to the git directory embedded in the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:249
+#: en/git-submodule.txt:250
#, priority:220
msgid "A repository that was cloned independently and later added as a submodule or old setups have the submodules git directory inside the submodule instead of embedded into the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:251
+#: en/git-submodule.txt:252
#, priority:220
msgid "This command is recursive by default."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:257
+#: en/git-submodule.txt:258
#, priority:220
msgid "Only print error messages."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:264
+#: en/git-submodule.txt:265
#, priority:220
msgid "This option is only valid for add and update commands. Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:268
+#: en/git-submodule.txt:269
#, priority:220
msgid "This option is only valid for the deinit command. Unregister all submodules in the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:269
+#: en/git-submodule.txt:270
#, fuzzy, no-wrap, priority:220
#| msgid "-b <new_branch>"
msgid "-b <branch>"
msgstr "-b <novo_branch>"
#. type: Plain text
-#: en/git-submodule.txt:277
+#: en/git-submodule.txt:278
#, priority:220
msgid "Branch of repository to add as submodule. The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository. If the option is not specified, it defaults to 'master'."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:290
+#: en/git-submodule.txt:291
#, priority:220
msgid "This option is only valid for add, deinit and update commands. When running add, allow adding an otherwise ignored submodule path. When running deinit the submodule working trees will be removed even if they contain local changes. When running update (only effective with the checkout procedure), throw away local changes in submodules when switching to a different commit; and always run a checkout operation in the submodule, even if the commit listed in the index of the containing repository matches the commit checked out in the submodule."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:295
+#: en/git-submodule.txt:296
#, priority:220
msgid "This option is only valid for status and summary commands. These commands typically use the commit found in the submodule HEAD, but with this option, the commit stored in the index is used instead."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:296
+#: en/git-submodule.txt:297
#, ignore-same, no-wrap, priority:220
msgid "--files"
msgstr "--files"
#. type: Plain text
-#: en/git-submodule.txt:300
+#: en/git-submodule.txt:301
#, priority:220
msgid "This option is only valid for the summary command. This command compares the commit in the index with that in the submodule HEAD when this option is used."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:302
+#: en/git-submodule.txt:303
#, ignore-same, no-wrap, priority:220
msgid "--summary-limit"
msgstr "--summary-limit"
#. type: Plain text
-#: en/git-submodule.txt:308
+#: en/git-submodule.txt:309
#, priority:220
msgid "This option is only valid for the summary command. Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:309
+#: en/git-submodule.txt:310
#, ignore-same, no-wrap, priority:220
msgid "--remote"
msgstr "--remote"
#. type: Plain text
-#: en/git-submodule.txt:318
+#: en/git-submodule.txt:319
#, priority:220
msgid "This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:324
+#: en/git-submodule.txt:325
#, priority:220
msgid "This works for any of the supported update procedures (`--checkout`, `--rebase`, etc.). The only change is the source of the target SHA-1. For example, `submodule update --remote --merge` will merge upstream submodule changes into the submodules, while `submodule update --merge` will merge superproject gitlink changes into the submodules."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:329
+#: en/git-submodule.txt:330
#, priority:220
msgid "In order to ensure a current tracking branch state, `update --remote` fetches the submodule's remote repository before calculating the SHA-1. If you don't want to fetch, you should use `submodule update --remote --no-fetch`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:339
+#: en/git-submodule.txt:340
#, priority:220
msgid "Use this option to integrate changes from the upstream subproject with your submodule's current HEAD. Alternatively, you can run `git pull` from the submodule, which is equivalent except for the remote branch name: `update --remote` uses the default upstream repository and `submodule.<name>.branch`, while `git pull` uses the submodule's `branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want to distribute the default upstream branch with the superproject and `branch.<name>.merge` if you want a more native feel while working in the submodule itself."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:341
+#: en/git-submodule.txt:342
#, ignore-same, no-wrap, priority:220
msgid "--no-fetch"
msgstr "--no-fetch"
#. type: Plain text
-#: en/git-submodule.txt:344
+#: en/git-submodule.txt:345
#, priority:220
msgid "This option is only valid for the update command. Don't fetch new objects from the remote site."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:345
+#: en/git-submodule.txt:346
#, ignore-same, no-wrap, priority:220
msgid "--checkout"
msgstr "--checkout"
#. type: Plain text
-#: en/git-submodule.txt:353
+#: en/git-submodule.txt:354
#, priority:220
msgid "This option is only valid for the update command. Checkout the commit recorded in the superproject on a detached HEAD in the submodule. This is the default behavior, the main use of this option is to override `submodule.$name.update` when set to a value other than `checkout`. If the key `submodule.$name.update` is either not explicitly set or set to `checkout`, this option is implicit."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:363
+#: en/git-submodule.txt:364
#, priority:220
msgid "This option is only valid for the update command. Merge the commit recorded in the superproject into the current branch of the submodule. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve the resulting conflicts within the submodule with the usual conflict resolution tools. If the key `submodule.$name.update` is set to `merge`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:364
+#: en/git-submodule.txt:365
#, ignore-same, no-wrap, priority:220
msgid "--rebase"
msgstr "--rebase"
#. type: Plain text
-#: en/git-submodule.txt:372
+#: en/git-submodule.txt:373
#, priority:220
msgid "This option is only valid for the update command. Rebase the current branch onto the commit recorded in the superproject. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve these failures with linkgit:git-rebase[1]. If the key `submodule.$name.update` is set to `rebase`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:373
+#: en/git-submodule.txt:374
#, ignore-same, no-wrap, priority:220
msgid "--init"
msgstr "--init"
#. type: Plain text
-#: en/git-submodule.txt:377
+#: en/git-submodule.txt:378
#, priority:220
msgid "This option is only valid for the update command. Initialize all submodules for which \"git submodule init\" has not been called so far before updating."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:378
+#: en/git-submodule.txt:379
#, ignore-same, no-wrap, priority:220
msgid "--name"
msgstr "--name"
#. type: Plain text
-#: en/git-submodule.txt:382
+#: en/git-submodule.txt:383
#, priority:220
msgid "This option is only valid for the add command. It sets the submodule's name to the given string instead of defaulting to its path. The name must be valid as a directory name and may not end with a '/'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:383
+#: en/git-submodule.txt:384
#, no-wrap, priority:220
msgid "--reference <repository>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:387 en/git-submodule.txt:396
+#: en/git-submodule.txt:388 en/git-submodule.txt:397
#, priority:220
msgid "This option is only valid for add and update commands. These commands sometimes need to clone a remote repository. In this case, this option will be passed to the linkgit:git-clone[1] command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:391
+#: en/git-submodule.txt:392
#, no-wrap, priority:220
msgid ""
"*NOTE*: Do *not* use this option unless you have read the note\n"
@@ -48385,61 +48725,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:398
+#: en/git-submodule.txt:399
#, no-wrap, priority:220
msgid "*NOTE*: see the NOTE for the `--reference` option.\n"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:404
+#: en/git-submodule.txt:405
#, priority:220
msgid "This option is only valid for foreach, update, status and sync commands. Traverse submodules recursively. The operation is performed not only in the submodules of the current repo, but also in any nested submodules inside those submodules (and so on)."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:405
+#: en/git-submodule.txt:406
#, ignore-same, no-wrap, priority:220
msgid "--depth"
msgstr "--depth"
#. type: Plain text
-#: en/git-submodule.txt:409
+#: en/git-submodule.txt:410
#, priority:220
msgid "This option is valid for add and update commands. Create a 'shallow' clone with a history truncated to the specified number of revisions. See linkgit:git-clone[1]"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:410
+#: en/git-submodule.txt:411
#, ignore-same, no-wrap, priority:220
msgid "--[no-]recommend-shallow"
msgstr "--[no-]recommend-shallow"
#. type: Plain text
-#: en/git-submodule.txt:415
+#: en/git-submodule.txt:416
#, priority:220
msgid "This option is only valid for the update command. The initial clone of a submodule will use the recommended `submodule.<name>.shallow` as provided by the `.gitmodules` file by default. To ignore the suggestions use `--no-recommend-shallow`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:421
+#: en/git-submodule.txt:422
#, priority:220
msgid "This option is only valid for the update command. Clone new submodules in parallel with as many jobs. Defaults to the `submodule.fetchJobs` option."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:426
+#: en/git-submodule.txt:427
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:434
+#: en/git-submodule.txt:435
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:438
+#: en/git-submodule.txt:439
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -49071,7 +49411,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:889
+#: en/git-svn.txt:346 en/rev-list-options.txt:905
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -49884,7 +50224,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:777
#, priority:100
-msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider linkgit:git-filter-branch[1] instead. filter-branch also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
+msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports, and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider https://github.com/newren/git-filter-repo[git-filter-repo] instead. filter-repo also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
msgstr ""
#. type: Labeled list
@@ -51845,16 +52185,6 @@ msgid ""
"#\n"
msgstr ""
-#. type: delimited block -
-#: en/git.txt:310
-#, 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/git.txt:315
#, no-wrap, priority:100
@@ -55896,98 +56226,104 @@ msgstr ""
msgid "This option determines how the merge message will be cleaned up before commiting. See linkgit:git-commit[1] for more details. In addition, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on to the commit machinery in the case of a merge conflict."
msgstr ""
+#. type: Labeled list
+#: en/merge-options.txt:44
+#, ignore-same, no-wrap, priority:240
+msgid "--ff-only"
+msgstr "--ff-only"
+
#. type: Plain text
-#: en/merge-options.txt:46
+#: en/merge-options.txt:50
#, priority:240
-msgid "When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. This is the default behavior."
+msgid "Specifies how a merge is handled when the merged-in history is already a descendant of the current history. `--ff` is the default unless merging an annotated (and possibly signed) tag that is not stored in its natural place in the `refs/tags/` hierarchy, in which case `--no-ff` is assumed."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:52
+#: en/merge-options.txt:55
#, priority:240
-msgid "Create a merge commit even when the merge resolves as a fast-forward. This is the default behaviour when merging an annotated (and possibly signed) tag that is not stored in its natural place in 'refs/tags/' hierarchy."
+msgid "With `--ff`, when possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit."
msgstr ""
-#. type: Labeled list
-#: en/merge-options.txt:53
-#, ignore-same, no-wrap, priority:240
-msgid "--ff-only"
-msgstr "--ff-only"
+#. type: Plain text
+#: en/merge-options.txt:58
+#, priority:240
+msgid "With `--no-ff`, create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward."
+msgstr ""
#. type: Plain text
-#: en/merge-options.txt:57
+#: en/merge-options.txt:61
#, priority:240
-msgid "Refuse to merge and exit with a non-zero status unless the current `HEAD` is already up to date or the merge can be resolved as a fast-forward."
+msgid "With `--ff-only`, resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:63
+#: en/merge-options.txt:67
#, priority:240
msgid "GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:69
+#: en/merge-options.txt:73
#, priority:240
msgid "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also linkgit:git-fmt-merge-msg[1]."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:72
+#: en/merge-options.txt:76
#, priority:240
msgid "With --no-log do not list one-line descriptions from the actual commits being merged."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:74
+#: en/merge-options.txt:78
#, ignore-same, no-wrap, priority:240
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
-#: en/merge-options.txt:83
+#: en/merge-options.txt:87
#, priority:240
msgid "With --no-signoff do not add a Signed-off-by line."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:89
+#: en/merge-options.txt:93
#, priority:240
msgid "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:92
+#: en/merge-options.txt:96
#, priority:240
msgid "With -n or --no-stat do not show a diffstat at the end of the merge."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:93
+#: en/merge-options.txt:97
#, ignore-same, no-wrap, priority:240
msgid "--squash"
msgstr "--squash"
#. type: Labeled list
-#: en/merge-options.txt:94
+#: en/merge-options.txt:98
#, ignore-same, no-wrap, priority:240
msgid "--no-squash"
msgstr "--no-squash"
#. type: Plain text
-#: en/merge-options.txt:102
+#: en/merge-options.txt:106
#, priority:240
msgid "Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:105
+#: en/merge-options.txt:109
#, priority:240
msgid "With --no-squash perform the merge and commit the result. This option can be used to override --squash."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:107
+#: en/merge-options.txt:111
#, priority:240
msgid "With --squash, --commit is not allowed, and will fail."
msgstr ""
@@ -55995,71 +56331,77 @@ msgstr ""
#. type: Plain text
#: en/merge-options.txt:115
#, priority:240
+msgid "This option bypasses the pre-merge and commit-msg hooks. See also linkgit:githooks[5]."
+msgstr ""
+
+#. type: Plain text
+#: en/merge-options.txt:123
+#, priority:240
msgid "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise)."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:116
+#: en/merge-options.txt:124
#, no-wrap, priority:240
msgid "-X <option>"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:120
+#: en/merge-options.txt:128
#, priority:240
msgid "Pass merge strategy specific option through to the merge strategy."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:121
+#: en/merge-options.txt:129
#, ignore-same, no-wrap, priority:240
msgid "--verify-signatures"
msgstr "--verify-signatures"
#. type: Labeled list
-#: en/merge-options.txt:122
+#: en/merge-options.txt:130
#, ignore-same, no-wrap, priority:240
msgid "--no-verify-signatures"
msgstr "--no-verify-signatures"
#. type: Plain text
-#: en/merge-options.txt:128
+#: en/merge-options.txt:136
#, priority:240
msgid "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:130
+#: en/merge-options.txt:138
#, ignore-same, no-wrap, priority:240
msgid "--no-summary"
msgstr "--no-summary"
#. type: Plain text
-#: en/merge-options.txt:133
+#: en/merge-options.txt:141
#, priority:240
msgid "Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:138
+#: en/merge-options.txt:146
#, priority:240
msgid "Operate quietly. Implies --no-progress."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:149
+#: en/merge-options.txt:157
#, priority:240
msgid "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:152
+#: en/merge-options.txt:160
#, ignore-same, no-wrap, priority:240
msgid "--allow-unrelated-histories"
msgstr "--allow-unrelated-histories"
#. type: Plain text
-#: en/merge-options.txt:158
+#: en/merge-options.txt:166
#, priority:240
msgid "By default, `git merge` command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added."
msgstr ""
@@ -57398,7 +57740,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:215
#, priority:260
-msgid "minutes ago`}; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -59776,263 +60118,281 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:762
#, priority:260
+msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:771
+#, ignore-ellipsis, priority:260
+msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:775
+#, priority:260
+msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:778
+#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:779
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:766
+#: en/rev-list-options.txt:782
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:773
+#: en/rev-list-options.txt:789
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:781
+#: en/rev-list-options.txt:797
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:800
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:791
+#: en/rev-list-options.txt:807
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:793
+#: en/rev-list-options.txt:809
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:801
+#: en/rev-list-options.txt:817
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:802
+#: en/rev-list-options.txt:818
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:804
+#: en/rev-list-options.txt:820
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:822
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:812
+#: en/rev-list-options.txt:828
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:832
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:818
+#: en/rev-list-options.txt:834
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:819
+#: en/rev-list-options.txt:835
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:826
+#: en/rev-list-options.txt:842
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:847
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:833
+#: en/rev-list-options.txt:849
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:852
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:838
+#: en/rev-list-options.txt:854
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:839
+#: en/rev-list-options.txt:855
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:840
+#: en/rev-list-options.txt:856
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:859
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:846
+#: en/rev-list-options.txt:862
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:864
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:873
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:864
+#: en/rev-list-options.txt:880
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:868
+#: en/rev-list-options.txt:884
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:875
+#: en/rev-list-options.txt:891
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:894
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:880
+#: en/rev-list-options.txt:896
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:882
+#: en/rev-list-options.txt:898
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:884
+#: en/rev-list-options.txt:900
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:887
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:892
+#: en/rev-list-options.txt:908
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:909
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:896
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:898
+#: en/rev-list-options.txt:914
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:902
+#: en/rev-list-options.txt:918
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:907
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:925
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:932
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -60043,19 +60403,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:919
+#: en/rev-list-options.txt:935
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:922
+#: en/rev-list-options.txt:938
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:929
+#: en/rev-list-options.txt:945
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -60067,85 +60427,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:931
+#: en/rev-list-options.txt:947
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:937
+#: en/rev-list-options.txt:953
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:939
+#: en/rev-list-options.txt:955
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:942
+#: en/rev-list-options.txt:958
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:943
+#: en/rev-list-options.txt:959
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:949
+#: en/rev-list-options.txt:965
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:959
+#: en/rev-list-options.txt:975
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:963
+#: en/rev-list-options.txt:979
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:984
#, priority:260
msgid "Listed below are options that control the formatting of diff output. Some of them are specific to linkgit:git-rev-list[1], however other diff options may be given. See linkgit:git-diff-files[1] for more options."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:991
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:981
+#: en/rev-list-options.txt:997
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:1012
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1015
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1018
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
@@ -60551,6 +60911,12 @@ msgstr ""
msgid "a URL like \"git://example.org/path/to/repo.git\" will be rewritten to \"ssh://example.org/path/to/repo.git\" for pushes, but pulls will still use the original URL."
msgstr ""
+#~ msgid "Number of parallel children to be used for fetching submodules. Each will fetch from different submodules, such that fetching many submodules will be faster. By default submodules will be fetched one at a time."
+#~ msgstr "N첬mero de filhos paralelos a serem usados para buscar subm처dulos. Cada um buscar찼 de diferentes subm처dulos, de modo que buscar muitos subm처dulos ser찼 mais r찼pido. Por padr찾o, os subm처dulos ser찾o buscados um de cada vez."
+
+#~ msgid "Remove untracked directories in addition to untracked files. If an untracked directory is managed by a different Git repository, it is not removed by default. Use -f option twice if you really want to remove such a directory."
+#~ msgstr "Remova os diret처rios n찾o acompanhados, al챕m dos arquivos n찾o acompanhados. Se um diret처rio n찾o rastreado for gerenciado por um reposit처rio Git diferente, ele n찾o ser찼 removido por padr찾o. Use a op챌찾o -f duas vezes se voc챗 realmente quiser remover esse diret처rio."
+
#~ msgid "single path, only for \"dst\""
#~ msgstr "path 첬nico, apenas para \"dst\""
diff --git a/po/documentation.pt_PT.po b/po/documentation.pt_PT.po
index 03eedd6046b5df337585aade7d56f20b85db6357..420e5f377643b27319bd01ec6b8e678e0dcfe2ae 100644
--- a/po/documentation.pt_PT.po
+++ b/po/documentation.pt_PT.po
@@ -6,9 +6,9 @@
msgid ""
msgstr ""
"Project-Id-Version: Git Documentation\n"
-"POT-Creation-Date: 2019-08-27 18:53+0200\n"
+"POT-Creation-Date: 2019-12-08 16:35+0100\n"
"PO-Revision-Date: 2019-09-06 13:56+0200\n"
-"Last-Translator: Matthias A횩hauer <mha1993@live.de>\n"
+"Last-Translator: Matthias Ahauer <mha1993@live.de>\n"
"Language-Team: pt_PT\n"
"Language: pt_PT\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:319 en/git-fsck.txt:38 en/git-rebase.txt:471
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:321 en/git-fsck.txt:38 en/git-rebase.txt:493
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -88,7 +88,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1000
+#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1016
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -124,7 +124,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:433 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -466,7 +466,7 @@ msgid "Get and set repository or global options."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1505
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1528
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-export[1]"
msgstr "linkgit:git-fast-export[1]"
@@ -478,7 +478,7 @@ msgid "Git data exporter."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:243
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-import[1]"
msgstr "linkgit:git-fast-import[1]"
@@ -2259,95 +2259,95 @@ msgstr ""
msgid "Example"
msgstr ""
-#. type: Plain text
-#: en/config.txt:185
+#. type: delimited block -
+#: en/config.txt:186
#, no-wrap, priority:100
msgid ""
-"\t# Core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"# Core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:190
+#. type: delimited block -
+#: en/config.txt:191
#, no-wrap, priority:100
msgid ""
-"\t# Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"# Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:194
+#. type: delimited block -
+#: en/config.txt:195
#, no-wrap, priority:100
msgid ""
-"\t[branch \"devel\"]\n"
-"\t\tremote = origin\n"
-"\t\tmerge = refs/heads/devel\n"
+"[branch \"devel\"]\n"
+"\tremote = origin\n"
+"\tmerge = refs/heads/devel\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:199
+#. type: delimited block -
+#: en/config.txt:200
#, no-wrap, priority:100
msgid ""
-"\t# Proxy settings\n"
-"\t[core]\n"
-"\t\tgitProxy=\"ssh\" for \"kernel.org\"\n"
-"\t\tgitProxy=default-proxy ; for the rest\n"
+"# Proxy settings\n"
+"[core]\n"
+"\tgitProxy=\"ssh\" for \"kernel.org\"\n"
+"\tgitProxy=default-proxy ; for the rest\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:204
+#. type: delimited block -
+#: en/config.txt:205
#, no-wrap, priority:100
msgid ""
-"\t[include]\n"
-"\t\tpath = /path/to/foo.inc ; include by absolute path\n"
-"\t\tpath = foo.inc ; find \"foo.inc\" relative to the current file\n"
-"\t\tpath = ~/foo.inc ; find \"foo.inc\" in your `$HOME` directory\n"
+"[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: Plain text
-#: en/config.txt:208
+#. type: delimited block -
+#: en/config.txt:209
#, no-wrap, priority:100
msgid ""
-"\t; include if $GIT_DIR is /path/to/foo/.git\n"
-"\t[includeIf \"gitdir:/path/to/foo/.git\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; 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: Plain text
-#: en/config.txt:212
+#. type: delimited block -
+#: en/config.txt:213
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside /path/to/group\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside /path/to/group\n"
+"[includeIf \"gitdir:/path/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:216
+#. type: delimited block -
+#: en/config.txt:217
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside $HOME/to/group\n"
-"\t[includeIf \"gitdir:~/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside $HOME/to/group\n"
+"[includeIf \"gitdir:~/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:222
+#. type: delimited block -
+#: en/config.txt:223
#, no-wrap, priority:100
msgid ""
-"\t; relative paths are always relative to the including\n"
-"\t; file (if the condition is true); their location is not\n"
-"\t; affected by the condition\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = foo.inc\n"
+"; 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:227
+#: en/config.txt:229
#, no-wrap, priority:100
msgid ""
"\t; include only if we are in a worktree where foo-branch is\n"
@@ -2357,43 +2357,43 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/config.txt:229
+#: en/config.txt:231
#, no-wrap, priority:100
msgid "Values"
msgstr ""
#. type: Plain text
-#: en/config.txt:234
+#: 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:235
+#: en/config.txt:237
#, no-wrap, priority:100
msgid "boolean"
msgstr ""
#. type: Plain text
-#: en/config.txt:240
+#: 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:241
+#: en/config.txt:243
#, no-wrap, priority:100
msgid "true"
msgstr ""
#. type: Plain text
-#: en/config.txt:242
+#: en/config.txt:244
#, priority:100
msgid "Boolean true literals are `yes`, `on`, `true`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:244
+#: en/config.txt:246
#, no-wrap, priority:100
msgid ""
"and `1`. Also, a variable defined without `= <value>`\n"
@@ -2401,109 +2401,109 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/config.txt:245
+#: en/config.txt:247
#, no-wrap, priority:100
msgid "false"
msgstr ""
#. type: Plain text
-#: en/config.txt:246
+#: en/config.txt:248
#, priority:100
msgid "Boolean false literals are `no`, `off`, `false`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:247
+#: en/config.txt:249
#, no-wrap, priority:100
msgid "`0` and the empty string.\n"
msgstr ""
#. type: Plain text
-#: en/config.txt:251
+#: 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:252
+#: en/config.txt:254
#, no-wrap, priority:100
msgid "integer"
msgstr ""
#. type: Plain text
-#: en/config.txt:256
+#: 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:257 en/diff-options.txt:356 en/git-for-each-ref.txt:177
+#: 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:261
+#: 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:265
+#: en/config.txt:267
#, 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."
msgstr ""
#. type: Plain text
-#: en/config.txt:270
+#: en/config.txt:272
#, 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:277
+#: en/config.txt:279
#, 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:280
+#: en/config.txt:282
#, 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:289
+#: en/config.txt:291
#, 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:290
+#: en/config.txt:292
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:296
+#: en/config.txt:298
#, 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:299 en/git-imap-send.txt:58
+#: en/config.txt:301 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:304
+#: en/config.txt:306
#, 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:309
+#: en/config.txt:311
#, 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 ""
@@ -3241,53 +3241,53 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
#, no-wrap, priority:260
-msgid "Generating patches with -p"
+msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:10
+#: en/diff-generate-patch.txt:14
#, priority:260
-msgid "When \"git-diff-index\", \"git-diff-tree\", or \"git-diff-files\" are run with a `-p` option, \"git diff\" without the `--raw` option, or \"git log\" with the \"-p\" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
+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:13
+#: 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:15
+#: 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:17
+#: 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:21
+#: 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:25
+#: 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:27
+#: 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:39
+#: en/diff-generate-patch.txt:43
#, no-wrap, priority:260
msgid ""
"old mode <mode>\n"
@@ -3304,43 +3304,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:42
+#: 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:44
+#: 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:51
+#: 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:55
+#: en/diff-generate-patch.txt:59
#, priority:260
-msgid "The index line includes the SHA-1 checksum 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."
+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:59
+#: 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:64
+#: 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:71
+#: en/diff-generate-patch.txt:75
#, no-wrap, priority:260
msgid ""
"diff --git a/a b/b\n"
@@ -3352,25 +3352,25 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/diff-generate-patch.txt:74
+#: en/diff-generate-patch.txt:78
#, no-wrap, priority:260
-msgid "combined diff format"
+msgid "Combined diff format"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:82
+#: 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:84
+#: en/diff-generate-patch.txt:88
#, priority:260
-msgid "A 'combined diff' format looks like this:"
+msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:93
+#: en/diff-generate-patch.txt:97
#, no-wrap, priority:260
msgid ""
"diff --combined describe.c\n"
@@ -3383,7 +3383,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:103
+#: en/diff-generate-patch.txt:107
#, no-wrap, priority:260
msgid ""
"- static void describe(char *arg)\n"
@@ -3398,7 +3398,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:113
+#: en/diff-generate-patch.txt:117
#, no-wrap, priority:260
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
@@ -3413,37 +3413,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:117
+#: en/diff-generate-patch.txt:121
#, priority:260
-msgid "It is preceded with a \"git diff\" header, that looks like this (when `-c` option is used):"
+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:119
+#: en/diff-generate-patch.txt:123
#, no-wrap, priority:260
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:121
+#: en/diff-generate-patch.txt:125
#, priority:260
-msgid "or like this (when `--cc` option is used):"
+msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:123
+#: en/diff-generate-patch.txt:127
#, no-wrap, priority:260
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:126
+#: 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:131
+#: en/diff-generate-patch.txt:135
#, no-wrap, priority:260
msgid ""
"index <hash>,<hash>..<hash>\n"
@@ -3453,91 +3453,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:137
+#: 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:139
+#: 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:141 en/diff-generate-patch.txt:152 en/diff-generate-patch.txt:153 en/diff-generate-patch.txt:154
+#: 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:142 en/diff-generate-patch.txt:155
+#: 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:146
+#: 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:150
+#: 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:159
+#: 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:165
+#: 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 for apply. The change is similar to the change in the extended 'index' header:"
+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:167
+#: 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:170
+#: 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:179
+#: 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:185
+#: 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:191
+#: 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:197
+#: 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:327 en/merge-options.txt:86
+#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3549,7 +3549,7 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:186 en/git-add.txt:111 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/diff-options.txt:23 en/fetch-options.txt:198 en/git-add.txt:111 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
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
@@ -3573,7 +3573,7 @@ msgid "\tThis is the default.\n"
msgstr ""
#. 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:117 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
+#: 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:118 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"
@@ -3992,7 +3992,7 @@ msgid "Synonym for --dirstat=files,param1,param2..."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:129
+#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--summary"
msgstr "--summary"
@@ -4016,7 +4016,7 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:122 en/git-update-index.txt:168
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:168
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4425,7 +4425,7 @@ msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:402 en/git-status.txt:139
+#: en/diff-options.txt:402 en/git-status.txt:143
#, ignore-same, no-wrap, priority:280
msgid "--no-renames"
msgstr "--no-renames"
@@ -4529,7 +4529,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:463
#, priority:280
-msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
+msgid "It affects the way a change that amounts to a total rewrite of a file does not appear as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
msgstr ""
#. type: Plain text
@@ -4545,7 +4545,7 @@ msgid "-M[<n>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:473 en/git-status.txt:143
+#: en/diff-options.txt:473 en/git-status.txt:147
#, no-wrap, priority:280
msgid "--find-renames[=<n>]"
msgstr ""
@@ -4968,7 +4968,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:203 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:52 en/git-clone.txt:120 en/git-commit.txt:314 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:301 en/git-gc.txt:68 en/git-grep.txt:296 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:315 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:255 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:136 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:215 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:316 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:302 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:256 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5022,7 +5022,7 @@ msgid "Allow (or disallow) external text conversion filters to be run when compa
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:85
+#: en/diff-options.txt:722 en/git-status.txt:87
#, no-wrap, priority:280
msgid "--ignore-submodules[=<when>]"
msgstr ""
@@ -5100,7 +5100,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:265 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:266 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5232,7 +5232,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:48 en/git-commit.txt:317 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:50 en/git-commit.txt:319 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5244,13 +5244,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:34 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:195 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:347 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:278 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:279 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:35 en/git-fast-import.txt:37 en/git-filter-branch.txt:196 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:279 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:280 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5282,7 +5282,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:112 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:113 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5360,7 +5360,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:47 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:97 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:326 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:301 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:85
+#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:98 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:302 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5426,187 +5426,211 @@ msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:167
+#: en/fetch-options.txt:164
+#, priority:220
+msgid "Number of parallel children to be used for all forms of fetching."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:169
+#, priority:220
+msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:172
#, priority:220
-msgid "Number of parallel children to be used for fetching submodules. Each will fetch from different submodules, such that fetching many submodules will be faster. By default submodules will be fetched one at a time."
+msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:168 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:173 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:171
+#: en/fetch-options.txt:176
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:172
+#: en/fetch-options.txt:177 en/git-branch.txt:225 en/git-push.txt:349
+#, ignore-same, no-wrap, priority:240
+msgid "--set-upstream"
+msgstr "--set-upstream"
+
+#. type: Plain text
+#: en/fetch-options.txt:183
+#, priority:220
+msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:184
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:188
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177
+#: en/fetch-options.txt:189
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:184
+#: en/fetch-options.txt:196
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:199
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:194
+#: en/fetch-options.txt:206
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:195 en/git-clone.txt:182
+#: en/fetch-options.txt:207 en/git-clone.txt:182
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:212
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:202 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:51 en/git-clone.txt:119 en/git-commit.txt:313 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:300 en/git-grep.txt:295 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:314 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:254 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:135
+#: en/fetch-options.txt:214 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:315 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:301 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:255 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:207
+#: en/fetch-options.txt:219
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:208 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:298 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:318 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:139
+#: en/fetch-options.txt:220 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:300 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:209 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:299 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:319 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:140
+#: en/fetch-options.txt:221 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:301 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:211 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:142
+#: en/fetch-options.txt:223 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:213 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:326 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:258 en/git-switch.txt:144 en/merge-options.txt:143
+#: en/fetch-options.txt:225 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:328 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:259 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:218 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:230 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:219 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:231 en/git-ls-remote.txt:73 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:220 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:232 en/git-clone.txt:135 en/git-ls-remote.txt:74
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-clone.txt:142
+#: en/fetch-options.txt:239 en/git-clone.txt:142
#, priority:300
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:240
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:233
+#: en/fetch-options.txt:245
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:234
+#: en/fetch-options.txt:246
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:240
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:241 en/git-push.txt:398
+#: en/fetch-options.txt:253 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:242 en/git-push.txt:399
+#: en/fetch-options.txt:254 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:244 en/git-push.txt:401
+#: en/fetch-options.txt:256 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:245 en/git-push.txt:402
+#: en/fetch-options.txt:257 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:246 en/git-push.txt:403
+#: en/fetch-options.txt:258 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:247 en/git-push.txt:405
+#: en/fetch-options.txt:259 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5646,7 +5670,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:20 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:67 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
+#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr ""
@@ -5688,13 +5712,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr ""
#. type: Title -
-#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:83 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:85 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:115 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:253 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:86 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:254 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:52 en/git-grep.txt:308 en/git-status.txt:148
+#: en/git-add.txt:52 en/git-grep.txt:325 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
@@ -5706,7 +5730,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:67 en/git-grep.txt:314
+#: en/git-add.txt:67 en/git-grep.txt:331
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -5724,13 +5748,13 @@ msgid "Allow adding otherwise ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:42 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:394 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:43 en/git-rebase.txt:395 en/git-rebase.txt:536 en/git-svn.txt:297
+#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5754,7 +5778,7 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:275 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
@@ -5844,7 +5868,7 @@ msgid "This option is primarily to help users who are used to older versions of
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:146 en/git-format-patch.txt:101 en/git-submodule.txt:340
+#: en/git-add.txt:146 en/git-format-patch.txt:102 en/git-submodule.txt:341
#, no-wrap, priority:300
msgid "-N"
msgstr ""
@@ -5934,7 +5958,7 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:343 en/git-grep.txt:304 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
+#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:345 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr ""
@@ -5946,7 +5970,7 @@ msgid "This option can be used to separate command-line options from the list of
msgstr ""
#. type: Title -
-#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:357 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:153 en/git-fetch.txt:242 en/git-filter-branch.txt:234 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:634 en/git-grep.txt:316 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:206 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:359 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:638 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr ""
@@ -5988,7 +6012,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:221 en/git-rebase.txt:591
+#: en/git-add.txt:221 en/git-rebase.txt:613
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr ""
@@ -6000,7 +6024,7 @@ msgid "When the command enters the interactive mode, it shows the output of the
msgstr ""
#. type: Plain text
-#: en/git-add.txt:230 en/git-clean.txt:83
+#: en/git-add.txt:230 en/git-clean.txt:85
#, priority:300
msgid "The command loop shows the list of subcommands available, and gives a prompt \"What now> \". In general, when the prompt ends with a single '>', you can pick only one of the choices given and type return, like this:"
msgstr ""
@@ -6300,7 +6324,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:135 en/git-commit-tree.txt:118 en/git-commit.txt:487 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:241 en/git-fast-import.txt:1503 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:679 en/git-gc.txt:154 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:112 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:247 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:519 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:292 en/git-status.txt:434 en/git-submodule.txt:436 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
+#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:489 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1526 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:683 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:437 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
@@ -6312,13 +6336,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:139 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:495 en/git-config.txt:492 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:245 en/git-fast-import.txt:1507 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:480 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:683 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:334 en/git-gui.txt:126 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:116 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:230 en/git-merge-file.txt:94 en/git-merge-index.txt:78 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1052 en/git-receive-pack.txt:251 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:123 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:523 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:300 en/git-status.txt:438 en/git-stripspace.txt:93 en/git-submodule.txt:440 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
+#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:497 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1530 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:693 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:687 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:441 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
#, no-wrap, priority:300
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:140 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:496 en/git-config.txt:493 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:246 en/git-fast-import.txt:1508 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:481 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:684 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:335 en/git-gui.txt:127 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:117 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:231 en/git-merge-file.txt:95 en/git-merge-index.txt:79 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1053 en/git-receive-pack.txt:252 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:124 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:524 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:301 en/git-status.txt:439 en/git-stripspace.txt:94 en/git-submodule.txt:441 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
+#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:498 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1531 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:694 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:688 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:442 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6368,7 +6392,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:118 en/git-rebase.txt:387 en/git-revert.txt:98 en/merge-options.txt:73
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:119 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6410,7 +6434,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:969
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:985
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6440,7 +6464,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:267 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:989
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1005
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6532,37 +6556,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:303 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:304 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:307 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:373 en/git-rebase.txt:524
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:374
+#: en/git-am.txt:109 en/git-rebase.txt:396
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:337
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6622,7 +6646,7 @@ msgid "Run interactively."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:380 en/git-rebase.txt:521
+#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6634,7 +6658,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:381 en/git-rebase.txt:522
+#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6646,7 +6670,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:256 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6658,31 +6682,31 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:333 en/git-rebase.txt:308 en/git-revert.txt:91 en/merge-options.txt:58
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:335 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:334 en/git-rebase.txt:309 en/git-revert.txt:92 en/merge-options.txt:59
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:336 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:338 en/git-rebase.txt:313 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:340 en/git-rebase.txt:331 en/git-revert.txt:96
#, priority:280
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:228 en/sequencer.txt:1
+#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:246 en/sequencer.txt:1
#, ignore-same, no-wrap, priority:240
msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:406 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:997
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1013
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6712,7 +6736,7 @@ msgid "When a patch failure occurs, <msg> will be printed to the screen before e
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:231 en/sequencer.txt:15
+#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:249 en/sequencer.txt:15
#, ignore-same, no-wrap, priority:240
msgid "--abort"
msgstr "--abort"
@@ -6724,7 +6748,7 @@ msgid "Restore the original branch and abort the patching operation."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:238 en/sequencer.txt:10
+#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:256 en/sequencer.txt:10
#, ignore-same, no-wrap, priority:240
msgid "--quit"
msgstr "--quit"
@@ -6736,7 +6760,7 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:262
+#: en/git-am.txt:179 en/git-rebase.txt:280
#, ignore-same, no-wrap, priority:100
msgid "--show-current-patch"
msgstr "--show-current-patch"
@@ -6748,7 +6772,7 @@ msgid "Show the patch being applied when \"git am\" is stopped because of confli
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:451 en/git-format-patch.txt:351 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:188 en/git-tag.txt:231
+#: en/git-am.txt:184 en/git-commit.txt:453 en/git-format-patch.txt:355 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
@@ -6832,7 +6856,7 @@ msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the curren
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:471 en/git-gc.txt:147
+#: en/git-am.txt:234 en/git-commit.txt:473 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
@@ -6930,7 +6954,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:322 en/merge-options.txt:84
+#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -6972,7 +6996,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:291
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:292
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7044,7 +7068,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:342
+#: en/git-apply.txt:134 en/git-rebase.txt:360
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7260,7 +7284,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:330 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:398 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:332 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -9182,7 +9206,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:525
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9218,13 +9242,13 @@ msgid "Sorting and filtering branches are case insensitive."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:153 en/git-status.txt:126 en/git-tag.txt:134
+#: en/git-branch.txt:153 en/git-status.txt:130 en/git-tag.txt:134
#, no-wrap, priority:280
msgid "--column[=<options>]"
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:154 en/git-status.txt:127 en/git-tag.txt:135
+#: en/git-branch.txt:154 en/git-status.txt:131 en/git-tag.txt:135
#, ignore-same, no-wrap, priority:280
msgid "--no-column"
msgstr "--no-column"
@@ -9349,12 +9373,6 @@ msgstr "--no-track"
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
-#. type: Labeled list
-#: en/git-branch.txt:225 en/git-push.txt:349
-#, ignore-same, no-wrap, priority:240
-msgid "--set-upstream"
-msgstr "--set-upstream"
-
#. type: Plain text
#: en/git-branch.txt:228
#, priority:240
@@ -9624,7 +9642,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-filter-branch.txt:449 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10244,7 +10262,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:152 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10893,7 +10911,7 @@ msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will al
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:226
+#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
@@ -11090,7 +11108,7 @@ msgid "Only meaningful with `--stdin`; paths are separated with NUL character in
msgstr ""
#. type: Plain text
-#: en/git-checkout-index.txt:73 en/git-commit.txt:345 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
+#: en/git-checkout-index.txt:73 en/git-commit.txt:347 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
#, priority:280
msgid "Do not interpret any more arguments as options."
msgstr ""
@@ -11411,7 +11429,7 @@ msgid "Quiet, suppress feedback messages."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:144
+#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:152
#, ignore-same, no-wrap, priority:240
msgid "--no-progress"
msgstr "--no-progress"
@@ -11597,7 +11615,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:241 en/git-rebase.txt:268 en/git-rebase.txt:529 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:354 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
+#: en/git-checkout.txt:241 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:355 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11717,7 +11735,7 @@ msgid "In the default overlay mode, `git checkout` never removes files from the
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:312 en/git-rebase.txt:225 en/git-switch.txt:36
+#: en/git-checkout.txt:312 en/git-rebase.txt:243 en/git-switch.txt:36
#, no-wrap, priority:240
msgid "<branch>"
msgstr ""
@@ -12423,7 +12441,7 @@ msgid "This option determines how the commit message will be cleaned up before b
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:65 en/git-clean.txt:61
+#: en/git-cherry-pick.txt:65 en/git-clean.txt:63
#, ignore-same, no-wrap, priority:100
msgid "-x"
msgstr "-x"
@@ -12507,7 +12525,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:249 en/git-rebase.txt:532
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:267 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12531,7 +12549,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:282 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:109
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12549,7 +12567,7 @@ msgid "-X<option>"
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:125
#, no-wrap, priority:240
msgid "--strategy-option=<option>"
msgstr ""
@@ -12745,7 +12763,7 @@ msgid "Show the commit subjects next to the SHA1s."
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:32 en/git-rebase.txt:220
+#: en/git-cherry.txt:32 en/git-rebase.txt:238
#, no-wrap, priority:100
msgid "<upstream>"
msgstr ""
@@ -12763,7 +12781,7 @@ msgid "<head>"
msgstr ""
#. type: Plain text
-#: en/git-cherry.txt:38 en/git-rebase.txt:227
+#: en/git-cherry.txt:38 en/git-rebase.txt:245
#, priority:100
msgid "Working branch; defaults to HEAD."
msgstr ""
@@ -12976,85 +12994,85 @@ msgid "If any optional `<path>...` arguments are given, only those paths are aff
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:33
+#: en/git-clean.txt:35
#, priority:100
-msgid "Remove untracked directories in addition to untracked files. If an untracked directory is managed by a different Git repository, it is not removed by default. Use -f option twice if you really want to remove such a directory."
+msgid "Normally, when no <path> is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. If any paths are specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under `--force`) will be removed."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:41
+#: en/git-clean.txt:43
#, priority:100
-msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f, -n or -i. Git will refuse to delete directories with .git sub directory or file unless a second -f is given."
+msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f or -i. Git will refuse to modify untracked nested git repositories (directories with a .git subdirectory) unless a second -f is given."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:46
+#: en/git-clean.txt:48
#, priority:100
msgid "Show what would be done and clean files interactively. See ``Interactive mode'' for details."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:50
+#: en/git-clean.txt:52
#, priority:100
msgid "Don't actually remove anything, just show what would be done."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:55
+#: en/git-clean.txt:57
#, priority:100
msgid "Be quiet, only report errors, but not the files that are successfully removed."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:56
+#: en/git-clean.txt:58
#, no-wrap, priority:100
msgid "-e <pattern>"
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:57 en/git-ls-files.txt:85 en/git-name-rev.txt:33
+#: en/git-clean.txt:59 en/git-ls-files.txt:85 en/git-name-rev.txt:33
#, no-wrap, priority:100
msgid "--exclude=<pattern>"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:60
+#: en/git-clean.txt:62
#, priority:100
msgid "Use the given exclude pattern in addition to the standard ignore rules (see linkgit:gitignore[5])."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:68
+#: en/git-clean.txt:70
#, priority:100
msgid "Don't use the standard ignore rules (see linkgit:gitignore[5]), but still use the ignore rules given with `-e` options from the command line. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git restore' or 'git reset') to create a pristine working directory to test a clean build."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:69
+#: en/git-clean.txt:71
#, no-wrap, priority:100
msgid "-X"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:72
+#: en/git-clean.txt:74
#, priority:100
msgid "Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files."
msgstr ""
#. type: Title -
-#: en/git-clean.txt:74
+#: en/git-clean.txt:76
#, no-wrap, priority:100
msgid "Interactive mode"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:78
+#: en/git-clean.txt:80
#, priority:100
msgid "When the command enters the interactive mode, it shows the files and directories to be cleaned, and goes into its interactive command loop."
msgstr ""
#. type: delimited block -
-#: en/git-clean.txt:89
+#: en/git-clean.txt:91
#, no-wrap, priority:100
msgid ""
" *** Commands ***\n"
@@ -13064,91 +13082,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:92
+#: en/git-clean.txt:94
#, priority:100
msgid "You also could say `c` or `clean` above as long as the choice is unique."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:94
+#: en/git-clean.txt:96
#, priority:100
msgid "The main command loop has 6 subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:95
+#: en/git-clean.txt:97
#, no-wrap, priority:100
msgid "clean"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:98
+#: en/git-clean.txt:100
#, priority:100
msgid "Start cleaning files and directories, and then quit."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:99
+#: en/git-clean.txt:101
#, no-wrap, priority:100
msgid "filter by pattern"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:107
+#: en/git-clean.txt:109
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Input ignore patterns>>\" prompt. You can input space-separated patterns to exclude files and directories from deletion. E.g. \"*.c *.h\" will excludes files end with \".c\" and \".h\" from deletion. When you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:108
+#: en/git-clean.txt:110
#, no-wrap, priority:100
msgid "select by numbers"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:119
+#: en/git-clean.txt:121
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Select items to delete>>\" prompt. When the prompt ends with double '>>' like this, you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything. Also when you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:120
+#: en/git-clean.txt:122
#, no-wrap, priority:100
msgid "ask each"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:125
+#: en/git-clean.txt:127
#, priority:100
msgid "This will start to clean, and you must confirm one by one in order to delete items. Please note that this action is not as efficient as the above two actions."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:126
+#: en/git-clean.txt:128
#, no-wrap, priority:100
msgid "quit"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:129
+#: en/git-clean.txt:131
#, priority:100
msgid "This lets you quit without do cleaning."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:130
+#: en/git-clean.txt:132
#, no-wrap, priority:100
msgid "help"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:133
+#: en/git-clean.txt:135
#, priority:100
msgid "Show brief usage of interactive git-clean."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:137 en/git-status.txt:436
+#: en/git-clean.txt:139 en/git-status.txt:440
#, ignore-same, priority:280
msgid "linkgit:gitignore[5]"
msgstr "linkgit:gitignore[5]"
@@ -13287,7 +13305,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:108 en/git-submodule.txt:392
+#: en/git-clone.txt:108 en/git-submodule.txt:393
#, ignore-same, no-wrap, priority:300
msgid "--dissociate"
msgstr "--dissociate"
@@ -13517,7 +13535,7 @@ msgstr "--[no-]remote-submodules"
#. type: Plain text
#: en/git-clone.txt:269
#, priority:300
-msgid "All submodules which are cloned will use the status of the submodule�셲 remote-tracking branch to update the submodule, rather than the superproject�셲 recorded SHA-1. Equivalent to passing `--remote` to `git submodule update`."
+msgid "All submodules which are cloned will use the status of the submodules remote-tracking branch to update the submodule, rather than the superprojects recorded SHA-1. Equivalent to passing `--remote` to `git submodule update`."
msgstr ""
#. type: Labeled list
@@ -13533,13 +13551,13 @@ msgid "Instead of placing the cloned repository where it is supposed to be, plac
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:277 en/git-submodule.txt:416
+#: en/git-clone.txt:277 en/git-submodule.txt:417
#, no-wrap, priority:300
msgid "-j <n>"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:278 en/git-submodule.txt:417
+#: en/git-clone.txt:278 en/git-submodule.txt:418
#, no-wrap, priority:300
msgid "--jobs <n>"
msgstr ""
@@ -13897,7 +13915,7 @@ msgid "Read the commit log message from the given file. Use `-` to read from the
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:68 en/git-commit.txt:339
+#: en/git-commit-tree.txt:68 en/git-commit.txt:341
#, ignore-same, no-wrap, priority:280
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
@@ -13981,7 +13999,7 @@ msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:477 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:428 en/git-svn.txt:1156
+#: en/git-commit-tree.txt:114 en/git-commit.txt:479 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:429 en/git-svn.txt:1156
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
@@ -14287,13 +14305,13 @@ msgid "When editing the commit message, start the editor with the contents in th
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:173 en/merge-options.txt:81
+#: en/git-commit.txt:173 en/merge-options.txt:85
#, priority:280
msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:175 en/git-rebase.txt:330
+#: en/git-commit.txt:175 en/git-rebase.txt:348 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14500,115 +14518,115 @@ msgid "Show untracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:288
+#: en/git-commit.txt:289
#, priority:280
msgid "The mode parameter is optional (defaults to 'all'), and is used to specify the handling of untracked files; when -u is not used, the default is 'normal', i.e. show untracked files and directories."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:290 en/git-status.txt:67 en/git-status.txt:107
+#: en/git-commit.txt:291 en/git-status.txt:68 en/git-status.txt:110
#, priority:280
msgid "The possible options are:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:292
+#: en/git-commit.txt:293
#, no-wrap, priority:280
msgid "'no' - Show no untracked files\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:293
+#: en/git-commit.txt:294
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:294 en/git-status.txt:71
+#: en/git-commit.txt:295 en/git-status.txt:72
#, no-wrap, priority:280
msgid "'all' - Also shows individual files in untracked directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:297 en/git-status.txt:84
+#: en/git-commit.txt:298 en/git-status.txt:85
#, priority:280
msgid "The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:308
+#: en/git-commit.txt:310
#, priority:280
msgid "Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template to help the user describe the commit by reminding what changes the commit has. Note that this diff output doesn't have its lines prefixed with '#'. This diff will not be a part of the commit message. See the `commit.verbose` configuration variable in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:312
+#: en/git-commit.txt:314
#, priority:280
msgid "If specified twice, show in addition the unified diff between what would be committed and the worktree files, i.e. the unstaged changes to tracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:316
+#: en/git-commit.txt:318
#, priority:280
msgid "Suppress commit summary message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:321
+#: en/git-commit.txt:323
#, priority:280
msgid "Do not create a commit, but show a list of paths that are to be committed, paths with local changes that will be left uncommitted and paths that are untracked."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:322
+#: en/git-commit.txt:324
#, ignore-same, no-wrap, priority:280
msgid "--status"
msgstr "--status"
#. type: Plain text
-#: en/git-commit.txt:327
+#: en/git-commit.txt:329
#, priority:280
msgid "Include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the commit message. Defaults to on, but can be used to override configuration variable commit.status."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:328
+#: en/git-commit.txt:330
#, ignore-same, no-wrap, priority:280
msgid "--no-status"
msgstr "--no-status"
#. type: Plain text
-#: en/git-commit.txt:332
+#: en/git-commit.txt:334
#, priority:280
msgid "Do not include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the default commit message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:342
+#: en/git-commit.txt:344
#, priority:280
msgid "Countermand `commit.gpgSign` configuration variable that is set to force each and every commit to be signed."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:346 en/git-rm.txt:29
+#: en/git-commit.txt:348 en/git-rm.txt:29
#, ignore-ellipsis, no-wrap, priority:280
msgid "<file>..."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:352
+#: en/git-commit.txt:354
#, priority:280
msgid "When files are given on the command line, the command commits the contents of the named files, without recording the changes already staged. The contents of these files are also staged for the next commit on top of what have been staged before."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:369
+#: en/git-commit.txt:371
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:375
+#: en/git-commit.txt:377
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14618,13 +14636,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:383
+#: en/git-commit.txt:385
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:388
+#: en/git-commit.txt:390
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14633,19 +14651,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:393
+#: en/git-commit.txt:395
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:398
+#: en/git-commit.txt:400
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:404
+#: en/git-commit.txt:406
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14655,31 +14673,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:411
+#: en/git-commit.txt:413
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:414 en/git-commit.txt:440
+#: en/git-commit.txt:416 en/git-commit.txt:442
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:418
+#: en/git-commit.txt:420
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:426
+#: en/git-commit.txt:428
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:432
+#: en/git-commit.txt:434
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14689,55 +14707,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:437
+#: en/git-commit.txt:439
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:448
+#: en/git-commit.txt:450
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:460
+#: en/git-commit.txt:462
#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:464
+#: en/git-commit.txt:466
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:469
+#: en/git-commit.txt:471
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:475
+#: en/git-commit.txt:477
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:479
+#: en/git-commit.txt:481
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:485
+#: en/git-commit.txt:487
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:493
+#: en/git-commit.txt:495
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -15405,211 +15423,211 @@ msgstr ""
msgid "Given a .git/config like this:"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:347
+#. type: delimited block -
+#: en/git-config.txt:348
#, no-wrap, priority:100
msgid ""
-"\t#\n"
-"\t# This is the config file, and\n"
-"\t# a '#' or ';' character indicates\n"
-"\t# a comment\n"
-"\t#\n"
+"#\n"
+"# This is the config file, and\n"
+"# a '#' or ';' character indicates\n"
+"# a comment\n"
+"#\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:352
+#. type: delimited block -
+#: en/git-config.txt:353 en/git.txt:310
#, no-wrap, priority:100
msgid ""
-"\t; core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"; core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:357
+#. type: delimited block -
+#: en/git-config.txt:358
#, no-wrap, priority:100
msgid ""
-"\t; Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"; Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:362
+#. type: delimited block -
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
-"\t; Proxy settings\n"
-"\t[core]\n"
-"\t\tgitproxy=proxy-command for kernel.org\n"
-"\t\tgitproxy=default-proxy ; for all the rest\n"
+"; Proxy settings\n"
+"[core]\n"
+"\tgitproxy=proxy-command for kernel.org\n"
+"\tgitproxy=default-proxy ; for all the rest\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:369
+#. type: delimited block -
+#: en/git-config.txt:370
#, no-wrap, priority:100
msgid ""
-"\t; HTTP\n"
-"\t[http]\n"
-"\t\tsslVerify\n"
-"\t[http \"https://weak.example.com\"]\n"
-"\t\tsslVerify = false\n"
-"\t\tcookieFile = /tmp/cookie.txt\n"
+"; HTTP\n"
+"[http]\n"
+"\tsslVerify\n"
+"[http \"https://weak.example.com\"]\n"
+"\tsslVerify = false\n"
+"\tcookieFile = /tmp/cookie.txt\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:371
+#: en/git-config.txt:373
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:374
+#: en/git-config.txt:376
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:379
+#: en/git-config.txt:381
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:382
+#: en/git-config.txt:384
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:385
+#: en/git-config.txt:387
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:389
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:390
+#: en/git-config.txt:392
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:394
+#: en/git-config.txt:396
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:398
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:399
+#: en/git-config.txt:401
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:402 en/git-gui.txt:120 en/git-merge-index.txt:64
+#: en/git-config.txt:404 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:407
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:410
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:413
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:414
+#: en/git-config.txt:416
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:417
+#: en/git-config.txt:419
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:421
+#: en/git-config.txt:423
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:424
+#: en/git-config.txt:426
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:428
+#: en/git-config.txt:430
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:431
+#: en/git-config.txt:433
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:434
+#: en/git-config.txt:436
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:437
+#: en/git-config.txt:439
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:440
+#: en/git-config.txt:442
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:443
+#: en/git-config.txt:445
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:447
+#: en/git-config.txt:449
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:453
+#: en/git-config.txt:455
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15619,13 +15637,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:457
+#: en/git-config.txt:459
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:466
+#: en/git-config.txt:468
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15638,19 +15656,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:471 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1029 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
+#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:476
+#: en/git-config.txt:478
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:482
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15658,13 +15676,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:483
+#: en/git-config.txt:485
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:488
+#: en/git-config.txt:490
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -17027,7 +17045,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
msgstr ""
#. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:234
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
#, no-wrap, priority:100
msgid "LIMITATIONS"
msgstr ""
@@ -18532,7 +18550,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:976
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:992
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19084,7 +19102,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:422
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:423
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -19180,13 +19198,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:982
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:998
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:988
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1004
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -19541,9 +19559,9 @@ msgid "This program dumps the given revisions in a form suitable to be piped int
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:22
+#: en/git-fast-export.txt:23
#, priority:100
-msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a kind of an interactive 'git filter-branch'."
+msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
@@ -19630,146 +19648,158 @@ msgstr ""
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
+#. type: Labeled list
+#: en/git-fast-export.txt:79
+#, ignore-same, no-wrap, priority:100
+msgid "--mark-tags"
+msgstr "--mark-tags"
+
+#. type: Plain text
+#: en/git-fast-export.txt:87
+#, priority:100
+msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
+msgstr ""
+
#. type: Plain text
-#: en/git-fast-export.txt:83
+#: en/git-fast-export.txt:92
#, priority:100
-msgid "Any commits that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
+msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:84
+#: en/git-fast-export.txt:93
#, ignore-same, no-wrap, priority:100
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
-#: en/git-fast-export.txt:89
+#: en/git-fast-export.txt:98
#, priority:100
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:90
+#: en/git-fast-export.txt:99
#, ignore-same, no-wrap, priority:100
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
-#: en/git-fast-export.txt:93
+#: en/git-fast-export.txt:102
#, priority:100
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:94
+#: en/git-fast-export.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
-#: en/git-fast-export.txt:101
+#: en/git-fast-export.txt:110
#, priority:100
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
+#: en/git-fast-export.txt:111 en/git-ls-tree.txt:72
#, ignore-same, no-wrap, priority:100
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
-#: en/git-fast-export.txt:107
+#: en/git-fast-export.txt:116
#, priority:100
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:108
+#: en/git-fast-export.txt:117
#, ignore-same, no-wrap, priority:100
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
-#: en/git-fast-export.txt:112
+#: en/git-fast-export.txt:121
#, priority:100
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:113
+#: en/git-fast-export.txt:122
#, ignore-same, no-wrap, priority:100
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
-#: en/git-fast-export.txt:124
+#: en/git-fast-export.txt:133
#, priority:100
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:125
+#: en/git-fast-export.txt:134
#, ignore-same, no-wrap, priority:100
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
-#: en/git-fast-export.txt:131
+#: en/git-fast-export.txt:140
#, priority:100
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:132
+#: en/git-fast-export.txt:141
#, no-wrap, priority:100
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:138
+#: en/git-fast-export.txt:147
#, priority:100
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be reencoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:139
+#: en/git-fast-export.txt:148
#, ignore-same, no-wrap, priority:100
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
-#: en/git-fast-export.txt:142
+#: en/git-fast-export.txt:151
#, priority:100
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:143
+#: en/git-fast-export.txt:152
#, ignore-ellipsis, no-wrap, priority:100
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:160
#, priority:100
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:157
+#: en/git-fast-export.txt:166
#, no-wrap, priority:100
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:162
+#: en/git-fast-export.txt:171
#, priority:100
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:167
+#: en/git-fast-export.txt:176
#, no-wrap, priority:100
msgid ""
"$ git fast-export master~5..master |\n"
@@ -19778,55 +19808,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:180
#, priority:100
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:175
+#: en/git-fast-export.txt:184
#, priority:100
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
-#: en/git-fast-export.txt:178
+#: en/git-fast-export.txt:187
#, no-wrap, priority:100
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:186
+#: en/git-fast-export.txt:195
#, priority:100
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:198
+#: en/git-fast-export.txt:207
#, priority:100
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:201
+#: en/git-fast-export.txt:210
#, priority:100
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:204
+#: en/git-fast-export.txt:213
#, no-wrap, priority:100
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:209
+#: en/git-fast-export.txt:218
#, priority:100
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:215
+#: en/git-fast-export.txt:224
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git init anon-repo\n"
@@ -19836,25 +19866,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:222
+#: en/git-fast-export.txt:231
#, priority:100
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:225
+#: en/git-fast-export.txt:234
#, no-wrap, priority:100
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:240
#, priority:100
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:239
+#: en/git-fast-export.txt:248
#, priority:100
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
@@ -20088,7 +20118,7 @@ msgid "See linkgit:git-config[1]"
msgstr "linkgit:git-config[1]"
#. type: Title -
-#: en/git-fast-import.txt:144 en/git-p4.txt:507
+#: en/git-fast-import.txt:144 en/git-filter-branch.txt:463 en/git-p4.txt:507
#, no-wrap, priority:100
msgid "PERFORMANCE"
msgstr ""
@@ -20322,7 +20352,7 @@ msgid "fast-import accepts several commands to update the current repository and
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:319 en/git-fast-import.txt:381
+#: en/git-fast-import.txt:319 en/git-fast-import.txt:388
#, ignore-same, no-wrap, priority:100
msgid "`commit`"
msgstr "`commit`"
@@ -20334,7 +20364,7 @@ msgid "Creates a new branch or updates an existing branch by creating a new comm
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:324 en/git-fast-import.txt:771
+#: en/git-fast-import.txt:324 en/git-fast-import.txt:778
#, ignore-same, no-wrap, priority:100
msgid "`tag`"
msgstr "`tag`"
@@ -20346,7 +20376,7 @@ msgid "Creates an annotated tag object from an existing commit or branch. Light
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:330 en/git-fast-import.txt:815
+#: en/git-fast-import.txt:330 en/git-fast-import.txt:823
#, ignore-same, no-wrap, priority:100
msgid "`reset`"
msgstr "`reset`"
@@ -20358,7 +20388,7 @@ msgid "Reset an existing branch (or a new branch) to a specific revision. This
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:335 en/git-fast-import.txt:844
+#: en/git-fast-import.txt:335 en/git-fast-import.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`blob`"
msgstr "`blob`"
@@ -20370,109 +20400,121 @@ msgid "Convert raw file data into a blob, for future use in a `commit` command.
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:340 en/git-fast-import.txt:917
+#: en/git-fast-import.txt:340 en/git-fast-import.txt:925
+#, ignore-same, no-wrap, priority:100
+msgid "`alias`"
+msgstr "`alias`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:346
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
+msgstr ""
+
+#. type: Title ~
+#: en/git-fast-import.txt:347 en/git-fast-import.txt:940
#, ignore-same, no-wrap, priority:100
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
-#: en/git-fast-import.txt:345
+#: en/git-fast-import.txt:352
#, priority:100
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:346 en/git-fast-import.txt:945
+#: en/git-fast-import.txt:353 en/git-fast-import.txt:968
#, ignore-same, no-wrap, priority:100
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
-#: en/git-fast-import.txt:350
+#: en/git-fast-import.txt:357
#, priority:100
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:351 en/git-fast-import.txt:1152
+#: en/git-fast-import.txt:358 en/git-fast-import.txt:1175
#, ignore-same, no-wrap, priority:100
msgid "`done`"
msgstr "`done`"
#. type: Plain text
-#: en/git-fast-import.txt:355
+#: en/git-fast-import.txt:362
#, priority:100
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:356 en/git-fast-import.txt:970
+#: en/git-fast-import.txt:363 en/git-fast-import.txt:993
#, ignore-same, no-wrap, priority:100
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
-#: en/git-fast-import.txt:360
+#: en/git-fast-import.txt:367
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:361 en/git-fast-import.txt:985
+#: en/git-fast-import.txt:368 en/git-fast-import.txt:1008
#, ignore-same, no-wrap, priority:100
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
-#: en/git-fast-import.txt:365
+#: en/git-fast-import.txt:372
#, priority:100
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:366 en/git-fast-import.txt:1016
+#: en/git-fast-import.txt:373 en/git-fast-import.txt:1039
#, ignore-same, no-wrap, priority:100
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
-#: en/git-fast-import.txt:370
+#: en/git-fast-import.txt:377
#, priority:100
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:371 en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:378 en/git-fast-import.txt:1092
#, ignore-same, no-wrap, priority:100
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
#, priority:100
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:1124
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:1147
#, ignore-same, no-wrap, priority:100
msgid "`option`"
msgstr "`option`"
#. type: Plain text
-#: en/git-fast-import.txt:379
+#: en/git-fast-import.txt:386
#, priority:100
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:384
+#: en/git-fast-import.txt:391
#, priority:100
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
#, no-wrap, priority:100
msgid ""
"\t'commit' SP <ref> LF\n"
@@ -20483,247 +20525,247 @@ msgid ""
"\t('encoding' SP <encoding>)?\n"
"\tdata\n"
"\t('from' SP <commit-ish> LF)?\n"
-"\t('merge' SP <commit-ish> LF)?\n"
+"\t('merge' SP <commit-ish> LF)*\n"
"\t(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*\n"
"\tLF?\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:405
+#: en/git-fast-import.txt:412
#, priority:100
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:411
+#: en/git-fast-import.txt:418
#, priority:100
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:417
+#: en/git-fast-import.txt:424
#, priority:100
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:425
+#: en/git-fast-import.txt:432
#, priority:100
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:432
+#: en/git-fast-import.txt:439
#, priority:100
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:434
+#: en/git-fast-import.txt:441
#, ignore-same, no-wrap, priority:100
msgid "`author`"
msgstr "`author`"
#. type: Plain text
-#: en/git-fast-import.txt:440
+#: en/git-fast-import.txt:447
#, priority:100
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:442
+#: en/git-fast-import.txt:449
#, ignore-same, no-wrap, priority:100
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
-#: en/git-fast-import.txt:445
+#: en/git-fast-import.txt:452
#, priority:100
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
#, priority:100
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:458
+#: en/git-fast-import.txt:465
#, priority:100
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:460
+#: en/git-fast-import.txt:467
#, ignore-same, no-wrap, priority:100
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
-#: en/git-fast-import.txt:464
+#: en/git-fast-import.txt:471
#, priority:100
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:466
+#: en/git-fast-import.txt:473
#, ignore-same, no-wrap, priority:100
msgid "`from`"
msgstr "`from`"
#. type: Plain text
-#: en/git-fast-import.txt:472
+#: en/git-fast-import.txt:479
#, priority:100
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
#, priority:100
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:485
+#: en/git-fast-import.txt:492
#, priority:100
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
#, priority:100
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:491
+#: en/git-fast-import.txt:498
#, priority:100
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:493
+#: en/git-fast-import.txt:500
#, priority:100
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:499
+#: en/git-fast-import.txt:506
#, priority:100
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:501
+#: en/git-fast-import.txt:508
#, priority:100
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:503
+#: en/git-fast-import.txt:510
#, priority:100
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
#, priority:100
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:509
+#: en/git-fast-import.txt:516
#, priority:100
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:512
+#: en/git-fast-import.txt:519
#, priority:100
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
#, no-wrap, priority:100
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:521
+#: en/git-fast-import.txt:528
#, priority:100
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:523
+#: en/git-fast-import.txt:530
#, ignore-same, no-wrap, priority:100
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
-#: en/git-fast-import.txt:531
+#: en/git-fast-import.txt:538
#, priority:100
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:534
+#: en/git-fast-import.txt:541
#, priority:100
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:536
+#: en/git-fast-import.txt:543
#, ignore-same, no-wrap, priority:100
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:540
+#: en/git-fast-import.txt:547
#, priority:100
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:541 en/git-fast-import.txt:708
+#: en/git-fast-import.txt:548 en/git-fast-import.txt:715
#, no-wrap, priority:100
msgid "External data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:544
+#: en/git-fast-import.txt:551
#, priority:100
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:547
+#: en/git-fast-import.txt:554
#, no-wrap, priority:100
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
#, priority:100
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:555 en/git-fast-import.txt:721
+#: en/git-fast-import.txt:562 en/git-fast-import.txt:728
#, no-wrap, priority:100
msgid "Inline data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:559
+#: en/git-fast-import.txt:566
#, priority:100
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
#, no-wrap, priority:100
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -20731,259 +20773,259 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:566 en/git-fast-import.txt:732
+#: en/git-fast-import.txt:573 en/git-fast-import.txt:739
#, priority:100
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:569
+#: en/git-fast-import.txt:576
#, priority:100
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
#, priority:100
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:574
+#: en/git-fast-import.txt:581
#, priority:100
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:575
+#: en/git-fast-import.txt:582
#, priority:100
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
#, priority:100
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:580
+#: en/git-fast-import.txt:587
#, priority:100
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:583
+#: en/git-fast-import.txt:590
#, priority:100
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:587
+#: en/git-fast-import.txt:594
#, priority:100
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:594
+#: en/git-fast-import.txt:601
#, priority:100
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
#, priority:100
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:598
+#: en/git-fast-import.txt:605
#, priority:100
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:599
+#: en/git-fast-import.txt:606
#, priority:100
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:600
+#: en/git-fast-import.txt:607
#, priority:100
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:602
+#: en/git-fast-import.txt:609
#, priority:100
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:604
+#: en/git-fast-import.txt:611
#, priority:100
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:606
+#: en/git-fast-import.txt:613
#, priority:100
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:608
+#: en/git-fast-import.txt:615
#, ignore-same, no-wrap, priority:100
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
-#: en/git-fast-import.txt:614
+#: en/git-fast-import.txt:621
#, priority:100
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
#, no-wrap, priority:100
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
#, priority:100
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:624
+#: en/git-fast-import.txt:631
#, ignore-same, no-wrap, priority:100
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
#, priority:100
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:632
+#: en/git-fast-import.txt:639
#, no-wrap, priority:100
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:638 en/git-fast-import.txt:658
+#: en/git-fast-import.txt:645 en/git-fast-import.txt:665
#, priority:100
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:643
+#: en/git-fast-import.txt:650
#, priority:100
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:645
+#: en/git-fast-import.txt:652
#, ignore-same, no-wrap, priority:100
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
-#: en/git-fast-import.txt:649
+#: en/git-fast-import.txt:656
#, priority:100
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:652
+#: en/git-fast-import.txt:659
#, no-wrap, priority:100
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:663
+#: en/git-fast-import.txt:670
#, priority:100
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:672
+#: en/git-fast-import.txt:679
#, priority:100
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
-#: en/git-fast-import.txt:679
+#: en/git-fast-import.txt:686
#, priority:100
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:682
+#: en/git-fast-import.txt:689
#, no-wrap, priority:100
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:688
+#: en/git-fast-import.txt:695
#, priority:100
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:696
+#: en/git-fast-import.txt:703
#, priority:100
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:698
+#: en/git-fast-import.txt:705
#, ignore-same, no-wrap, priority:100
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:707
+#: en/git-fast-import.txt:714
#, priority:100
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:712
+#: en/git-fast-import.txt:719
#, priority:100
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:715
+#: en/git-fast-import.txt:722
#, no-wrap, priority:100
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:720
+#: en/git-fast-import.txt:727
#, priority:100
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:725
+#: en/git-fast-import.txt:732
#, priority:100
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:729
+#: en/git-fast-import.txt:736
#, no-wrap, priority:100
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -20991,76 +21033,77 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:735
+#: en/git-fast-import.txt:742
#, priority:100
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:737
+#: en/git-fast-import.txt:744
#, ignore-same, no-wrap, priority:100
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
-#: en/git-fast-import.txt:743
+#: en/git-fast-import.txt:750
#, priority:100
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:746
+#: en/git-fast-import.txt:753
#, no-wrap, priority:100
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:752
+#: en/git-fast-import.txt:759
#, priority:100
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:756
+#: en/git-fast-import.txt:763
#, priority:100
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:758
+#: en/git-fast-import.txt:765
#, ignore-same, no-wrap, priority:100
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
-#: en/git-fast-import.txt:763
+#: en/git-fast-import.txt:770
#, priority:100
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:766
+#: en/git-fast-import.txt:773
#, no-wrap, priority:100
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:769
+#: en/git-fast-import.txt:776
#, priority:100
msgid "where `<object-identifer>` is any string not containing LF."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:774
+#: en/git-fast-import.txt:781
#, priority:100
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:781
+#: en/git-fast-import.txt:789
#, no-wrap, priority:100
msgid ""
"\t'tag' SP <name> LF\n"
+"\tmark?\n"
"\t'from' SP <commit-ish> LF\n"
"\toriginal-oid?\n"
"\t'tagger' (SP <name>)? SP LT <email> GT SP <when> LF\n"
@@ -21068,55 +21111,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:784
+#: en/git-fast-import.txt:792
#, priority:100
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:789
+#: en/git-fast-import.txt:797
#, priority:100
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:793
+#: en/git-fast-import.txt:801
#, priority:100
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:796
+#: en/git-fast-import.txt:804
#, priority:100
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:799
+#: en/git-fast-import.txt:807
#, priority:100
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:813
#, priority:100
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:813
+#: en/git-fast-import.txt:821
#, priority:100
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:820
+#: en/git-fast-import.txt:828
#, priority:100
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:825
+#: en/git-fast-import.txt:833
#, no-wrap, priority:100
msgid ""
"\t'reset' SP <ref> LF\n"
@@ -21125,25 +21168,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:829
+#: en/git-fast-import.txt:837
#, priority:100
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:831 en/git-fast-import.txt:943
+#: en/git-fast-import.txt:839 en/git-fast-import.txt:966
#, priority:100
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:834
+#: en/git-fast-import.txt:842
#, priority:100
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:838
+#: en/git-fast-import.txt:846
#, no-wrap, priority:100
msgid ""
"\treset refs/tags/938\n"
@@ -21151,19 +21194,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:850
#, priority:100
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:849
+#: en/git-fast-import.txt:857
#, priority:100
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:855
+#: en/git-fast-import.txt:863
#, no-wrap, priority:100
msgid ""
"\t'blob' LF\n"
@@ -21173,43 +21216,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:861
+#: en/git-fast-import.txt:869
#, priority:100
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:871
#, ignore-same, no-wrap, priority:100
msgid "`data`"
msgstr "`data`"
#. type: Plain text
-#: en/git-fast-import.txt:870
+#: en/git-fast-import.txt:878
#, priority:100
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:875
+#: en/git-fast-import.txt:883
#, priority:100
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:876
+#: en/git-fast-import.txt:884
#, no-wrap, priority:100
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:878
+#: en/git-fast-import.txt:886
#, priority:100
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:882
+#: en/git-fast-import.txt:890
#, no-wrap, priority:100
msgid ""
"\t'data' SP <count> LF\n"
@@ -21217,31 +21260,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:888
+#: en/git-fast-import.txt:896
#, priority:100
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:893
+#: en/git-fast-import.txt:901
#, priority:100
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:894
+#: en/git-fast-import.txt:902
#, no-wrap, priority:100
msgid "Delimited format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:899
+#: en/git-fast-import.txt:907
#, priority:100
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:905
+#: en/git-fast-import.txt:913
#, no-wrap, priority:100
msgid ""
"\t'data' SP '<<' <delim> LF\n"
@@ -21251,25 +21294,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:921
#, priority:100
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:915
+#: en/git-fast-import.txt:923
#, priority:100
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:920
+#: en/git-fast-import.txt:928
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object."
+msgstr ""
+
+#. type: delimited block .
+#: en/git-fast-import.txt:934
+#, no-wrap, priority:100
+msgid ""
+"\t'alias' LF\n"
+"\tmark\n"
+"\t'to' SP <commit-ish> LF\n"
+"\tLF?\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:937
+#, priority:100
+msgid "For a detailed description of `<commit-ish>` see above under `from`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:943
#, priority:100
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:924
+#: en/git-fast-import.txt:947
#, no-wrap, priority:100
msgid ""
"\t'checkpoint' LF\n"
@@ -21277,31 +21342,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:930
+#: en/git-fast-import.txt:953
#, priority:100
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:935
+#: en/git-fast-import.txt:958
#, priority:100
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:941
+#: en/git-fast-import.txt:964
#, priority:100
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:950
+#: en/git-fast-import.txt:973
#, priority:100
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:954
+#: en/git-fast-import.txt:977
#, no-wrap, priority:100
msgid ""
"\t'progress' SP <any> LF\n"
@@ -21309,67 +21374,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:960
+#: en/git-fast-import.txt:983
#, priority:100
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:986
#, no-wrap, priority:100
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:968
+#: en/git-fast-import.txt:991
#, priority:100
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:976
+#: en/git-fast-import.txt:999
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:979
+#: en/git-fast-import.txt:1002
#, no-wrap, priority:100
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:983 en/git-fast-import.txt:1014 en/git-fast-import.txt:1067
+#: en/git-fast-import.txt:1006 en/git-fast-import.txt:1037 en/git-fast-import.txt:1090
#, priority:100
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:991
+#: en/git-fast-import.txt:1014
#, priority:100
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:994
+#: en/git-fast-import.txt:1017
#, no-wrap, priority:100
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1022
#, priority:100
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:1024
#, priority:100
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1005
+#: en/git-fast-import.txt:1028
#, no-wrap, priority:100
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21377,283 +21442,283 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1011
+#: en/git-fast-import.txt:1034
#, priority:100
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1022
+#: en/git-fast-import.txt:1045
#, priority:100
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1025
+#: en/git-fast-import.txt:1048
#, priority:100
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1049
#, no-wrap, priority:100
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1030
+#: en/git-fast-import.txt:1053
#, priority:100
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1033
+#: en/git-fast-import.txt:1056
#, no-wrap, priority:100
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1035
+#: en/git-fast-import.txt:1058
#, no-wrap, priority:100
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1041
+#: en/git-fast-import.txt:1064
#, priority:100
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1044
+#: en/git-fast-import.txt:1067
#, no-wrap, priority:100
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1047
+#: en/git-fast-import.txt:1070
#, priority:100
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1072
#, priority:100
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1075
#, no-wrap, priority:100
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1080
#, priority:100
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1060
+#: en/git-fast-import.txt:1083
#, priority:100
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1086
#, no-wrap, priority:100
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1072
+#: en/git-fast-import.txt:1095
#, priority:100
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1075
+#: en/git-fast-import.txt:1098
#, no-wrap, priority:100
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1078
+#: en/git-fast-import.txt:1101
#, priority:100
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1079 en/git-fast-import.txt:1146
+#: en/git-fast-import.txt:1102 en/git-fast-import.txt:1169
#, no-wrap, priority:100
msgid "date-format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1080 en/git-fast-import.txt:1148
+#: en/git-fast-import.txt:1103 en/git-fast-import.txt:1171
#, no-wrap, priority:100
msgid "export-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1081
+#: en/git-fast-import.txt:1104
#, no-wrap, priority:100
msgid "relative-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1082
+#: en/git-fast-import.txt:1105
#, fuzzy, no-wrap, priority:100
msgid "no-relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
-#: en/git-fast-import.txt:1083 en/git-fast-import.txt:1150
+#: en/git-fast-import.txt:1106 en/git-fast-import.txt:1173
#, no-wrap, priority:100
msgid "force"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1087
+#: en/git-fast-import.txt:1110
#, priority:100
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1088 en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1111 en/git-fast-import.txt:1170
#, no-wrap, priority:100
msgid "import-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1089
+#: en/git-fast-import.txt:1112
#, no-wrap, priority:100
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1097
+#: en/git-fast-import.txt:1120
#, priority:100
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1098
+#: en/git-fast-import.txt:1121
#, fuzzy, no-wrap, priority:100
msgid "get-mark"
msgstr "`get-mark`"
#. type: Labeled list
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1122
#, fuzzy, no-wrap, priority:100
msgid "cat-blob"
msgstr "`cat-blob`"
#. type: Labeled list
-#: en/git-fast-import.txt:1100
+#: en/git-fast-import.txt:1123
#, no-wrap, priority:100
msgid "ls"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1108
+#: en/git-fast-import.txt:1131
#, priority:100
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1109
+#: en/git-fast-import.txt:1132
#, no-wrap, priority:100
msgid "notes"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1114
+#: en/git-fast-import.txt:1137
#, priority:100
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1138
#, no-wrap, priority:100
msgid "done"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1122
+#: en/git-fast-import.txt:1145
#, priority:100
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1129
+#: en/git-fast-import.txt:1152
#, priority:100
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1132
+#: en/git-fast-import.txt:1155
#, no-wrap, priority:100
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1137
+#: en/git-fast-import.txt:1160
#, priority:100
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1141
+#: en/git-fast-import.txt:1164
#, priority:100
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1144
+#: en/git-fast-import.txt:1167
#, priority:100
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1149
+#: en/git-fast-import.txt:1172
#, priority:100
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1178
#, priority:100
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1159
+#: en/git-fast-import.txt:1182
#, priority:100
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1161
+#: en/git-fast-import.txt:1184
#, no-wrap, priority:100
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1168
+#: en/git-fast-import.txt:1191
#, priority:100
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1175
+#: en/git-fast-import.txt:1198
#, priority:100
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1203
#, no-wrap, priority:100
msgid ""
"\tmkfifo fast-import-output\n"
@@ -21662,49 +21727,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1184
+#: en/git-fast-import.txt:1207
#, priority:100
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1188
+#: en/git-fast-import.txt:1211
#, priority:100
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1213
#, no-wrap, priority:100
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1196
+#: en/git-fast-import.txt:1219
#, priority:100
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1203
+#: en/git-fast-import.txt:1226
#, priority:100
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1211
+#: en/git-fast-import.txt:1234
#, priority:100
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1236
#, priority:100
msgid "An example crash:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1229
+#: en/git-fast-import.txt:1252
#, no-wrap, priority:100
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
@@ -21724,7 +21789,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1256
#, no-wrap, priority:100
msgid ""
"\t$ git fast-import <in\n"
@@ -21733,7 +21798,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1239
+#: en/git-fast-import.txt:1262
#, no-wrap, priority:100
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
@@ -21744,13 +21809,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1241
+#: en/git-fast-import.txt:1264
#, no-wrap, priority:100
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1251
+#: en/git-fast-import.txt:1274
#, no-wrap, priority:100
msgid ""
"\tMost Recent Commands Before Crash\n"
@@ -21765,13 +21830,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1252
+#: en/git-fast-import.txt:1275
#, no-wrap, priority:100
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1255
+#: en/git-fast-import.txt:1278
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
@@ -21779,25 +21844,25 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1256
+#: en/git-fast-import.txt:1279
#, no-wrap, priority:100
msgid "active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1259
+#: en/git-fast-import.txt:1282
#, priority:100
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1260
+#: en/git-fast-import.txt:1283
#, priority:100
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1264
+#: en/git-fast-import.txt:1287
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
@@ -21806,7 +21871,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1270
+#: en/git-fast-import.txt:1293
#, no-wrap, priority:100
msgid ""
"status : active loaded dirty\n"
@@ -21818,307 +21883,307 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1274
+#: en/git-fast-import.txt:1297
#, priority:100
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1277
+#: en/git-fast-import.txt:1300
#, no-wrap, priority:100
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1280
+#: en/git-fast-import.txt:1303
#, priority:100
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1282
+#: en/git-fast-import.txt:1305
#, no-wrap, priority:100
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1290
+#: en/git-fast-import.txt:1313
#, priority:100
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1294
+#: en/git-fast-import.txt:1317
#, priority:100
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1296
+#: en/git-fast-import.txt:1319
#, no-wrap, priority:100
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1301
+#: en/git-fast-import.txt:1324
#, priority:100
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1305
+#: en/git-fast-import.txt:1328
#, priority:100
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1307
+#: en/git-fast-import.txt:1330
#, no-wrap, priority:100
msgid "Handling Renames"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1312
+#: en/git-fast-import.txt:1335
#, priority:100
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1337
#, no-wrap, priority:100
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1341
#, priority:100
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1325
+#: en/git-fast-import.txt:1348
#, priority:100
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1331
+#: en/git-fast-import.txt:1354
#, priority:100
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1337
+#: en/git-fast-import.txt:1360
#, priority:100
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1363
#, priority:100
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1342
+#: en/git-fast-import.txt:1365
#, no-wrap, priority:100
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1346
+#: en/git-fast-import.txt:1369
#, priority:100
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1353
+#: en/git-fast-import.txt:1376
#, priority:100
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1358
+#: en/git-fast-import.txt:1381
#, priority:100
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1360
+#: en/git-fast-import.txt:1383
#, no-wrap, priority:100
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1367
+#: en/git-fast-import.txt:1390
#, priority:100
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1369
+#: en/git-fast-import.txt:1392
#, no-wrap, priority:100
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1399
#, priority:100
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1379
+#: en/git-fast-import.txt:1402
#, no-wrap, priority:100
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1385
+#: en/git-fast-import.txt:1408
#, priority:100
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1393
+#: en/git-fast-import.txt:1416
#, priority:100
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1423
#, priority:100
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1407
+#: en/git-fast-import.txt:1430
#, priority:100
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1415
+#: en/git-fast-import.txt:1438
#, priority:100
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1417
+#: en/git-fast-import.txt:1440
#, no-wrap, priority:100
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1423
+#: en/git-fast-import.txt:1446
#, priority:100
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1448
#, no-wrap, priority:100
msgid "per object"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1432
+#: en/git-fast-import.txt:1455
#, priority:100
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1438
+#: en/git-fast-import.txt:1461
#, priority:100
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1440
+#: en/git-fast-import.txt:1463
#, no-wrap, priority:100
msgid "per mark"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1446
+#: en/git-fast-import.txt:1469
#, priority:100
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1448
+#: en/git-fast-import.txt:1471
#, no-wrap, priority:100
msgid "per branch"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1474
#, priority:100
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1457
+#: en/git-fast-import.txt:1480
#, priority:100
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1464
+#: en/git-fast-import.txt:1487
#, priority:100
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1468
+#: en/git-fast-import.txt:1491
#, priority:100
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1496
#, priority:100
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1498
#, no-wrap, priority:100
msgid "per active tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1480
+#: en/git-fast-import.txt:1503
#, priority:100
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1482
+#: en/git-fast-import.txt:1505
#, no-wrap, priority:100
msgid "per active file entry"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1488
+#: en/git-fast-import.txt:1511
#, priority:100
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1493
+#: en/git-fast-import.txt:1516
#, priority:100
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1495
+#: en/git-fast-import.txt:1518
#, no-wrap, priority:100
msgid "SIGNALS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1501
+#: en/git-fast-import.txt:1524
#, priority:100
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -22679,7 +22744,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1041
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -22795,20 +22860,32 @@ msgid ""
"\t[--state-branch <branch>] [--] [<rev-list options>...]\n"
msgstr ""
+#. type: Title -
+#: en/git-filter-branch.txt:20
+#, no-wrap, priority:100
+msgid "WARNING"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:31
+#, priority:100
+msgid "'git filter-branch' has a plethora of pitfalls that can produce non-obvious manglings of the intended history rewrite (and can leave you with little time to investigate such problems since it has such abysmal performance). These safety and performance issues cannot be backward compatibly fixed and as such, its use is not recommended. Please use an alternative history filtering tool such as https://github.com/newren/git-filter-repo/[git filter-repo]. If you still need to use 'git filter-branch', please carefully read <<SAFETY>> (and <<PERFORMANCE>>) to learn about the land mines of filter-branch, and then vigilantly avoid as many of the hazards listed there as reasonably possible."
+msgstr ""
+
#. type: Plain text
-#: en/git-filter-branch.txt:27
+#: en/git-filter-branch.txt:40
#, priority:100
msgid "Lets you rewrite Git revision history by rewriting the branches mentioned in the <rev-list options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge information) will be preserved."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:34
+#: en/git-filter-branch.txt:47
#, priority:100
msgid "The command will only rewrite the _positive_ refs mentioned in the command line (e.g. if you pass 'a..b', only 'b' will be rewritten). If you specify no filters, the commits will be recommitted without any changes, which would normally have no effect. Nevertheless, this may be useful in the future for compensating for some Git bugs or such, therefore such a usage is permitted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:39
+#: en/git-filter-branch.txt:52
#, no-wrap, priority:100
msgid ""
"*NOTE*: This command honors `.git/info/grafts` file and refs in\n"
@@ -22818,7 +22895,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:48
+#: en/git-filter-branch.txt:61
#, no-wrap, priority:100
msgid ""
"*WARNING*! The rewritten history will have different object names for all\n"
@@ -22832,337 +22909,337 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:52
+#: en/git-filter-branch.txt:65
#, priority:100
msgid "Always verify that the rewritten version is correct: The original refs, if different from the rewritten ones, will be stored in the namespace 'refs/original/'."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:56
+#: en/git-filter-branch.txt:69
#, priority:100
msgid "Note that since this operation is very I/O expensive, it might be a good idea to redirect the temporary directory off-disk with the `-d` option, e.g. on tmpfs. Reportedly the speedup is very noticeable."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:59
+#: en/git-filter-branch.txt:72
#, no-wrap, priority:100
msgid "Filters"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:71
+#: en/git-filter-branch.txt:84
#, priority:100
msgid "The filters are applied in the order as listed below. The <command> argument is always evaluated in the shell context using the 'eval' command (with the notable exception of the commit filter, for technical reasons). Prior to that, the `$GIT_COMMIT` environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, and GIT_COMMITTER_DATE are taken from the current commit and exported to the environment, in order to affect the author and committer identities of the replacement commit created by linkgit:git-commit-tree[1] after the filters have run."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:74
+#: en/git-filter-branch.txt:87
#, priority:100
msgid "If any evaluation of <command> returns a non-zero exit status, the whole operation will be aborted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:80
+#: en/git-filter-branch.txt:93
#, priority:100
msgid "A 'map' function is available that takes an \"original sha1 id\" argument and outputs a \"rewritten sha1 id\" if the commit has been already rewritten, and \"original sha1 id\" otherwise; the 'map' function can return several ids on separate lines if your commit filter emitted multiple commits."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:85
+#: en/git-filter-branch.txt:98
#, no-wrap, priority:100
msgid "--setup <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:91
+#: en/git-filter-branch.txt:104
#, priority:100
msgid "This is not a real filter executed for each commit but a one time setup just before the loop. Therefore no commit-specific variables are defined yet. Functions or variables defined here can be used or modified in the following filter steps except the commit filter, for technical reasons."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:92
+#: en/git-filter-branch.txt:105
#, no-wrap, priority:100
msgid "--subdirectory-filter <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:96
+#: en/git-filter-branch.txt:109
#, priority:100
msgid "Only look at the history which touches the given subdirectory. The result will contain that directory (and only that) as its project root. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:97
+#: en/git-filter-branch.txt:110
#, no-wrap, priority:100
msgid "--env-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:102
+#: en/git-filter-branch.txt:115
#, priority:100
msgid "This filter may be used if you only need to modify the environment in which the commit will be performed. Specifically, you might want to rewrite the author/committer name/email/time environment variables (see linkgit:git-commit-tree[1] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:103
+#: en/git-filter-branch.txt:116
#, no-wrap, priority:100
msgid "--tree-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:110
+#: en/git-filter-branch.txt:123
#, priority:100
msgid "This is the filter for rewriting the tree and its contents. The argument is evaluated in shell with the working directory set to the root of the checked out tree. The new tree is then used as-is (new files are auto-added, disappeared files are auto-removed - neither .gitignore files nor any other ignore rules *HAVE ANY EFFECT*!)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:111
+#: en/git-filter-branch.txt:124
#, no-wrap, priority:100
msgid "--index-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:117
+#: en/git-filter-branch.txt:130
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the index. It is similar to the tree filter but does not check out the tree, which makes it much faster. Frequently used with `git rm --cached --ignore-unmatch ...`, see EXAMPLES below. For hairy cases, see linkgit:git-update-index[1]."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:118
+#: en/git-filter-branch.txt:131
#, no-wrap, priority:100
msgid "--parent-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:125
+#: en/git-filter-branch.txt:138
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the commit's parent list. It will receive the parent string on stdin and shall output the new parent string on stdout. The parent string is in the format described in linkgit:git-commit-tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and \"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:126
+#: en/git-filter-branch.txt:139
#, no-wrap, priority:100
msgid "--msg-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:131
+#: en/git-filter-branch.txt:144
#, priority:100
msgid "This is the filter for rewriting the commit messages. The argument is evaluated in the shell with the original commit message on standard input; its standard output is used as the new commit message."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:132
+#: en/git-filter-branch.txt:145
#, no-wrap, priority:100
msgid "--commit-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:138
+#: en/git-filter-branch.txt:151
#, ignore-ellipsis, priority:100
msgid "This is the filter for performing the commit. If this filter is specified, it will be called instead of the 'git commit-tree' command, with arguments of the form \"<TREE_ID> [(-p <PARENT_COMMIT_ID>)...]\" and the log message on stdin. The commit id is expected on stdout."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:142
+#: en/git-filter-branch.txt:155
#, priority:100
msgid "As a special extension, the commit filter may emit multiple commit ids; in that case, the rewritten children of the original commit will have all of them as parents."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:147
+#: en/git-filter-branch.txt:160
#, priority:100
msgid "You can use the 'map' convenience function in this filter, and other convenience functions, too. For example, calling 'skip_commit \"$@\"' will leave out the current commit (but not its changes! If you want that, use 'git rebase' instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:151
+#: en/git-filter-branch.txt:164
#, priority:100
msgid "You can also use the `git_commit_non_empty_tree \"$@\"` instead of `git commit-tree \"$@\"` if you don't wish to keep commits with a single parent and that makes no change to the tree."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:152
+#: en/git-filter-branch.txt:165
#, no-wrap, priority:100
msgid "--tag-name-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:158
+#: en/git-filter-branch.txt:171
#, priority:100
msgid "This is the filter for rewriting tag names. When passed, it will be called for every tag ref that points to a rewritten object (or to a tag object which points to a rewritten object). The original tag name is passed via standard input, and the new tag name is expected on standard output."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:163
+#: en/git-filter-branch.txt:176
#, priority:100
msgid "The original tags are not deleted, but can be overwritten; use \"--tag-name-filter cat\" to simply update the tags. In this case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:174
+#: en/git-filter-branch.txt:187
#, priority:100
msgid "Nearly proper rewriting of tag objects is supported. If the tag has a message attached, a new tag object will be created with the same message, author, and timestamp. If the tag has a signature attached, the signature will be stripped. It is by definition impossible to preserve signatures. The reason this is \"nearly\" proper, is because ideally if the tag did not change (points to the same object, has the same name, etc.) it should retain any signature. That is not the case, signatures will always be removed, buyer beware. There is also no support for changing the author or timestamp (or the tag message for that matter). Tags which point to other tags will be rewritten to point to the underlying commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:175
+#: en/git-filter-branch.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--prune-empty"
msgstr "--prune-empty"
#. type: Plain text
-#: en/git-filter-branch.txt:182
+#: en/git-filter-branch.txt:195
#, priority:100
msgid "Some filters will generate empty commits that leave the tree untouched. This option instructs git-filter-branch to remove such commits if they have exactly one or zero non-pruned parents; merge commits will therefore remain intact. This option cannot be used together with `--commit-filter`, though the same effect can be achieved by using the provided `git_commit_non_empty_tree` function in a commit filter."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:183
+#: en/git-filter-branch.txt:196
#, no-wrap, priority:100
msgid "--original <namespace>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:186
+#: en/git-filter-branch.txt:199
#, priority:100
msgid "Use this option to set the namespace where the original commits will be stored. The default value is 'refs/original'."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:187
+#: en/git-filter-branch.txt:200
#, no-wrap, priority:100
msgid "-d <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:194
+#: en/git-filter-branch.txt:207
#, priority:100
msgid "Use this option to set the path to the temporary directory used for rewriting. When applying a tree filter, the command needs to temporarily check out the tree to some directory, which may consume considerable space in case of large projects. By default it does this in the `.git-rewrite/` directory but you can override that choice by this parameter."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:200
+#: en/git-filter-branch.txt:213
#, priority:100
msgid "'git filter-branch' refuses to start with an existing temporary directory or when there are already refs starting with 'refs/original/', unless forced."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:201
+#: en/git-filter-branch.txt:214
#, no-wrap, priority:100
msgid "--state-branch <branch>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:206
+#: en/git-filter-branch.txt:219
#, priority:100
msgid "This option will cause the mapping from old to new objects to be loaded from named branch upon startup and saved as a new commit to that branch upon exit, enabling incremental of large trees. If '<branch>' does not exist it will be created."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:207
+#: en/git-filter-branch.txt:220
#, ignore-ellipsis, no-wrap, priority:100
msgid "<rev-list options>..."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:212
+#: en/git-filter-branch.txt:225
#, priority:100
msgid "Arguments for 'git rev-list'. All positive refs included by these options are rewritten. You may also specify options such as `--all`, but you must use `--` to separate them from the 'git filter-branch' options. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:216
+#: en/git-filter-branch.txt:229
#, no-wrap, priority:100
msgid "Remap to ancestor"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:223
+#: en/git-filter-branch.txt:236
#, priority:100
msgid "By using linkgit:git-rev-list[1] arguments, e.g., path limiters, you can limit the set of revisions which get rewritten. However, positive refs on the command line are distinguished: we don't let them be excluded by such limiters. For this purpose, they are instead rewritten to point at the nearest ancestor that was not excluded."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:231
+#: en/git-filter-branch.txt:244
#, priority:100
msgid "On success, the exit status is `0`. If the filter can't find any commits to rewrite, the exit status is `2`. On any other error, the exit status may be any other non-zero value."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:238
+#: en/git-filter-branch.txt:251
#, priority:100
msgid "Suppose you want to remove a file (containing confidential information or copyright violation) from all commits:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:241
+#: en/git-filter-branch.txt:254
#, no-wrap, priority:100
msgid "git filter-branch --tree-filter 'rm filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:246
+#: en/git-filter-branch.txt:259
#, priority:100
msgid "However, if the file is absent from the tree of some commit, a simple `rm filename` will fail for that tree and commit. Thus you may instead want to use `rm -f filename` as the script."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:252
+#: en/git-filter-branch.txt:265
#, priority:100
msgid "Using `--index-filter` with 'git rm' yields a significantly faster version. Like with using `rm filename`, `git rm --cached filename` will fail if the file is absent from the tree of a commit. If you want to \"completely forget\" a file, it does not matter when it entered history, so we also add `--ignore-unmatch`:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:255
+#: en/git-filter-branch.txt:268
#, no-wrap, priority:100
msgid "git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:258
+#: en/git-filter-branch.txt:271
#, priority:100
msgid "Now, you will get the rewritten history saved in HEAD."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:261
+#: en/git-filter-branch.txt:274
#, priority:100
msgid "To rewrite the repository to look as if `foodir/` had been its project root, and discard all other history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:264
+#: en/git-filter-branch.txt:277
#, no-wrap, priority:100
msgid "git filter-branch --subdirectory-filter foodir -- --all\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:269
+#: en/git-filter-branch.txt:282
#, priority:100
msgid "Thus you can, e.g., turn a library subdirectory into a repository of its own. Note the `--` that separates 'filter-branch' options from revision options, and the `--all` to rewrite all branches and tags."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:273
+#: en/git-filter-branch.txt:286
#, priority:100
msgid "To set a commit (which typically is at the tip of another history) to be the parent of the current initial commit, in order to paste the other history behind the current history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:276
+#: en/git-filter-branch.txt:289
#, no-wrap, priority:100
msgid "git filter-branch --parent-filter 'sed \"s/^\\$/-p <graft-id>/\"' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:282
+#: en/git-filter-branch.txt:295
#, priority:100
msgid "(if the parent string is empty - which happens when we are dealing with the initial commit - add graftcommit as a parent). Note that this assumes history with a single root (that is, no merge without common ancestors happened). If this is not the case, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:286
+#: en/git-filter-branch.txt:299
#, no-wrap, priority:100
msgid ""
"git filter-branch --parent-filter \\\n"
@@ -23170,13 +23247,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:289
+#: en/git-filter-branch.txt:302
#, priority:100
msgid "or even simpler:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:293
+#: en/git-filter-branch.txt:306
#, no-wrap, priority:100
msgid ""
"git replace --graft $commit-id $graft-id\n"
@@ -23184,13 +23261,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:296
+#: en/git-filter-branch.txt:309
#, priority:100
msgid "To remove commits authored by \"Darl McBribe\" from the history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:305
+#: en/git-filter-branch.txt:318
#, no-wrap, priority:100
msgid ""
"git filter-branch --commit-filter '\n"
@@ -23203,13 +23280,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:308
+#: en/git-filter-branch.txt:321
#, priority:100
msgid "The function 'skip_commit' is defined as follows:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:320
+#: en/git-filter-branch.txt:333
#, no-wrap, priority:100
msgid ""
"skip_commit()\n"
@@ -23225,13 +23302,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:327
+#: en/git-filter-branch.txt:340
#, priority:100
msgid "The shift magic first throws away the tree id and then the -p parameters. Note that this handles merges properly! In case Darl committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 as their parents instead of the merge commit."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:332
+#: en/git-filter-branch.txt:345
#, no-wrap, priority:100
msgid ""
"*NOTE* the changes introduced by the commits, and which are not reverted\n"
@@ -23241,13 +23318,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:336
+#: en/git-filter-branch.txt:349
#, priority:100
msgid "You can rewrite the commit log messages using `--msg-filter`. For example, 'git svn-id' strings in a repository created by 'git svn' can be removed this way:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:341
+#: en/git-filter-branch.txt:354
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23256,13 +23333,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:345
+#: en/git-filter-branch.txt:358
#, priority:100
msgid "If you need to add 'Acked-by' lines to, say, the last 10 commits (none of which is a merge), use this command:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:351
+#: en/git-filter-branch.txt:364
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23272,13 +23349,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:357
+#: en/git-filter-branch.txt:370
#, priority:100
msgid "The `--env-filter` option can be used to modify committer and/or author identity. For example, if you found out that your commits have the wrong identity due to a misconfigured user.email, you can make a correction, before publishing the project, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:369
+#: en/git-filter-branch.txt:382
#, no-wrap, priority:100
msgid ""
"git filter-branch --env-filter '\n"
@@ -23294,19 +23371,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:375
+#: en/git-filter-branch.txt:388
#, priority:100
msgid "To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will point to the top-most revision that a 'git rev-list' of this range will print."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:377
+#: en/git-filter-branch.txt:390
#, priority:100
msgid "Consider this history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:382
+#: en/git-filter-branch.txt:395
#, no-wrap, priority:100
msgid ""
" D--E--F--G--H\n"
@@ -23315,25 +23392,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:385
+#: en/git-filter-branch.txt:398
#, priority:100
msgid "To rewrite only commits D,E,F,G,H, but leave A, B and C alone, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:388
+#: en/git-filter-branch.txt:401
#, ignore-ellipsis, no-wrap, priority:100
msgid "git filter-branch ... C..H\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:391
+#: en/git-filter-branch.txt:404
#, priority:100
msgid "To rewrite commits E,F,G,H, use one of these:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:395
+#: en/git-filter-branch.txt:408
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"git filter-branch ... C..H --not D\n"
@@ -23341,13 +23418,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:398
+#: en/git-filter-branch.txt:411
#, priority:100
msgid "To move the whole tree into a subdirectory, or remove it from there:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:405
+#: en/git-filter-branch.txt:418
#, no-wrap, priority:100
msgid ""
"git filter-branch --index-filter \\\n"
@@ -23358,87 +23435,279 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-filter-branch.txt:410
+#: en/git-filter-branch.txt:423
#, no-wrap, priority:100
msgid "CHECKLIST FOR SHRINKING A REPOSITORY"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:418
+#: en/git-filter-branch.txt:431
#, priority:100
msgid "git-filter-branch can be used to get rid of a subset of files, usually with some combination of `--index-filter` and `--subdirectory-filter`. People expect the resulting repository to be smaller than the original, but you need a few more steps to actually make it smaller, because Git tries hard not to lose your objects until you tell it to. First make sure that:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:422
+#: en/git-filter-branch.txt:435
#, priority:100
msgid "You really removed all variants of a filename, if a blob was moved over its lifetime. `git log --name-only --follow --all -- filename` can help you find renames."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:425
+#: en/git-filter-branch.txt:438
#, priority:100
msgid "You really filtered all refs: use `--tag-name-filter cat -- --all` when calling git-filter-branch."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:428
+#: en/git-filter-branch.txt:441
#, priority:100
msgid "Then there are two ways to get a smaller repository. A safer way is to clone, that keeps your original intact."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:432
+#: en/git-filter-branch.txt:445
#, priority:100
msgid "Clone it with `git clone file:///path/to/repo`. The clone will not have the removed objects. See linkgit:git-clone[1]. (Note that cloning with a plain path just hardlinks everything!)"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:437
+#: en/git-filter-branch.txt:450
#, priority:100
msgid "If you really don't want to clone it, for whatever reasons, check the following points instead (in this order). This is a very destructive approach, so *make a backup* or go back to cloning it. You have been warned."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:441
+#: en/git-filter-branch.txt:454
#, priority:100
msgid "Remove the original refs backed up by git-filter-branch: say `git for-each-ref --format=\"%(refname)\" refs/original/ | xargs -n 1 git update-ref -d`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:443
+#: en/git-filter-branch.txt:456
#, priority:100
msgid "Expire all reflogs with `git reflog expire --expire=now --all`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:447
+#: en/git-filter-branch.txt:460
#, priority:100
msgid "Garbage collect all unreferenced objects with `git gc --prune=now` (or if your git-gc is not new enough to support arguments to `--prune`, use `git repack -ad; git prune` instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:459
+#: en/git-filter-branch.txt:467
#, priority:100
-msgid "git-filter-branch allows you to make complex shell-scripted rewrites of your Git history, but you probably don't need this flexibility if you're simply _removing unwanted data_ like large files or passwords. For those operations you may want to consider http://rtyley.github.io/bfg-repo-cleaner/[The BFG Repo-Cleaner], a JVM-based alternative to git-filter-branch, typically at least 10-50x faster for those use-cases, and with quite different characteristics:"
+msgid "The performance of git-filter-branch is glacially slow; its design makes it impossible for a backward-compatible implementation to ever be fast:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:467
+#: en/git-filter-branch.txt:473
#, priority:100
-msgid "Any particular version of a file is cleaned exactly _once_. The BFG, unlike git-filter-branch, does not give you the opportunity to handle a file differently based on where or when it was committed within your history. This constraint gives the core performance benefit of The BFG, and is well-suited to the task of cleansing bad data - you don't care _where_ the bad data is, you just want it _gone_."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:473
+#: en/git-filter-branch.txt:476
+#, priority:100
+msgid "If you try and cheat and try to make git-filter-branch only work on files modified in a commit, then two things happen"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:482
+#, priority:100
+msgid "you run into problems with deletions whenever the user is simply trying to rename files (because attempting to delete files that don't exist looks like a no-op; it takes some chicanery to remap deletes across file renames when the renames happen via arbitrary user-provided shell)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:488
+#, priority:100
+msgid "even if you succeed at the map-deletes-for-renames chicanery, you still technically violate backward compatibility because users are allowed to filter files in ways that depend upon topology of commits instead of filtering solely based on file contents or names (though this has not been observed in the wild)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:494
+#, priority:100
+msgid "Even if you don't need to edit files but only want to e.g. rename or remove some and thus can avoid checking out each file (i.e. you can use --index-filter), you still are passing shell snippets for your filters. This means that for every commit, you have to have a prepared git repo where those filters can be run. That's a significant setup."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:505
+#, priority:100
+msgid "Further, several additional files are created or updated per commit by git-filter-branch. Some of these are for supporting the convenience functions provided by git-filter-branch (such as map()), while others are for keeping track of internal state (but could have also been accessed by user filters; one of git-filter-branch's regression tests does so). This essentially amounts to using the filesystem as an IPC mechanism between git-filter-branch and the user-provided filters. Disks tend to be a slow IPC mechanism, and writing these files also effectively represents a forced synchronization point between separate processes that we hit with every commit."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:511
+#, priority:100
+msgid "The user-provided shell commands will likely involve a pipeline of commands, resulting in the creation of many processes per commit. Creating and running another process takes a widely varying amount of time between operating systems, but on any platform it is very slow relative to invoking a function."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:517
#, priority:100
-msgid "By default The BFG takes full advantage of multi-core machines, cleansing commit file-trees in parallel. git-filter-branch cleans commits sequentially (i.e. in a single-threaded manner), though it _is_ possible to write filters that include their own parallelism, in the scripts executed against each commit."
+msgid "git-filter-branch itself is written in shell, which is kind of slow. This is the one performance issue that could be backward-compatibly fixed, but compared to the above problems that are intrinsic to the design of git-filter-branch, the language of the tool itself is a relatively minor issue."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:478
+#: en/git-filter-branch.txt:528
#, priority:100
-msgid "The http://rtyley.github.io/bfg-repo-cleaner/#examples[command options] are much more restrictive than git-filter branch, and dedicated just to the tasks of removing unwanted data- e.g: `--strip-blobs-bigger-than 1M`."
+msgid "Side note: Unfortunately, people tend to fixate on the written-in-shell aspect and periodically ask if git-filter-branch could be rewritten in another language to fix the performance issues. Not only does that ignore the bigger intrinsic problems with the design, it'd help less than you'd expect: if git-filter-branch itself were not shell, then the convenience functions (map(), skip_commit(), etc) and the `--setup` argument could no longer be executed once at the beginning of the program but would instead need to be prepended to every user filter (and thus re-executed with every commit)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:539
+#, priority:100
+msgid "The https://github.com/newren/git-filter-repo/[git filter-repo] tool is an alternative to git-filter-branch which does not suffer from these performance problems or the safety problems (mentioned below). For those with existing tooling which relies upon git-filter-branch, 'git repo-filter' also provides https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], a drop-in git-filter-branch replacement (with a few caveats). While filter-lamely suffers from all the same safety issues as git-filter-branch, it at least ameloriates the performance issues a little."
+msgstr ""
+
+#. type: Title -
+#: en/git-filter-branch.txt:542
+#, no-wrap, priority:100
+msgid "SAFETY"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:547
+#, priority:100
+msgid "git-filter-branch is riddled with gotchas resulting in various ways to easily corrupt repos or end up with a mess worse than what you started with:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:560
+#, priority:100
+msgid "Someone can have a set of \"working and tested filters\" which they document or provide to a coworker, who then runs them on a different OS where the same commands are not working/tested (some examples in the git-filter-branch manpage are also affected by this). BSD vs. GNU userland differences can really bite. If lucky, error messages are spewed. But just as likely, the commands either don't do the filtering requested, or silently corrupt by making some unwanted change. The unwanted change may only affect a few commits, so it's not necessarily obvious either. (The fact that problems won't necessarily be obvious means they are likely to go unnoticed until the rewritten history is in use for quite a while, at which point it's really hard to justify another flag-day for another rewrite.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:570
+#, priority:100
+msgid "Filenames with spaces are often mishandled by shell snippets since they cause problems for shell pipelines. Not everyone is familiar with find -print0, xargs -0, git-ls-files -z, etc. Even people who are familiar with these may assume such flags are not relevant because someone else renamed any such files in their repo back before the person doing the filtering joined the project. And often, even those familiar with handling arguments with spaces may not do so just because they aren't in the mindset of thinking about everything that could possibly go wrong."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:580
+#, priority:100
+msgid "Non-ascii filenames can be silently removed despite being in a desired directory. Keeping only wanted paths is often done using pipelines like `git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`. ls-files will only quote filenames if needed, so folks may not notice that one of the files didn't match the regex (at least not until it's much too late). Yes, someone who knows about core.quotePath can avoid this (unless they have other special characters like \\t, \\n, or \"), and people who use ls-files -z with something other than grep can avoid this, but that doesn't mean they will."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:586
+#, priority:100
+msgid "Similarly, when moving files around, one can find that filenames with non-ascii or special characters end up in a different directory, one that includes a double quote character. (This is technically the same issue as above with quoting, but perhaps an interesting different way that it can and has manifested as a problem.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:594
+#, priority:100
+msgid "It's far too easy to accidentally mix up old and new history. It's still possible with any tool, but git-filter-branch almost invites it. If lucky, the only downside is users getting frustrated that they don't know how to shrink their repo and remove the old stuff. If unlucky, they merge old and new history and end up with multiple \"copies\" of each commit, some of which have unwanted or sensitive files and others which don't. This comes about in multiple different ways:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:597
+#, priority:100
+msgid "the default to only doing a partial history rewrite ('--all' is not the default and few examples show it)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:599
+#, priority:100
+msgid "the fact that there's no automatic post-run cleanup"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:602
+#, priority:100
+msgid "the fact that --tag-name-filter (when used to rename tags) doesn't remove the old tags but just adds new ones with the new name"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:611
+#, priority:100
+msgid "the fact that little educational information is provided to inform users of the ramifications of a rewrite and how to avoid mixing old and new history. For example, this man page discusses how users need to understand that they need to rebase their changes for all their branches on top of new history (or delete and reclone), but that's only one of multiple concerns to consider. See the \"DISCUSSION\" section of the git filter-repo manual page for more details."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:614
+#, priority:100
+msgid "Annotated tags can be accidentally converted to lightweight tags, due to either of two issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:619
+#, priority:100
+msgid "Someone can do a history rewrite, realize they messed up, restore from the backups in refs/original/, and then redo their git-filter-branch command. (The backup in refs/original/ is not a real backup; it dereferences tags first.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:624
+#, priority:100
+msgid "Running git-filter-branch with either --tags or --all in your <rev-list options>. In order to retain annotated tags as annotated, you must use --tag-name-filter (and must not have restored from refs/original/ in a previously botched rewrite)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:629
+#, priority:100
+msgid "Any commit messages that specify an encoding will become corrupted by the rewrite; git-filter-branch ignores the encoding, takes the original bytes, and feeds it to commit-tree without telling it the proper encoding. (This happens whether or not --msg-filter is used.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:633
+#, priority:100
+msgid "Commit messages (even if they are all UTF-8) by default become corrupted due to not being updated -- any references to other commit hashes in commit messages will now refer to no-longer-extant commits."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:644
+#, priority:100
+msgid "There are no facilities for helping users find what unwanted crud they should delete, which means they are much more likely to have incomplete or partial cleanups that sometimes result in confusion and people wasting time trying to understand. (For example, folks tend to just look for big files to delete instead of big directories or extensions, and once they do so, then sometime later folks using the new repository who are going through history will notice a build artifact directory that has some files but not others, or a cache of dependencies (node_modules or similar) which couldn't have ever been functional since it's missing some files.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:647
+#, priority:100
+msgid "If --prune-empty isn't specified, then the filtering process can create hoards of confusing empty commits"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:651
+#, priority:100
+msgid "If --prune-empty is specified, then intentionally placed empty commits from before the filtering operation are also pruned instead of just pruning commits that became empty due to filtering rules."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:654
+#, ignore-ellipsis, priority:100
+msgid "If --prune empty is specified, sometimes empty commits are missed and left around anyway (a somewhat rare bug, but it happens...)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:658
+#, priority:100
+msgid "A minor issue, but users who have a goal to update all names and emails in a repository may be led to --env-filter which will only update authors and committers, missing taggers."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:664
+#, priority:100
+msgid "If the user provides a --tag-name-filter that maps multiple tags to the same name, no warning or error is provided; git-filter-branch simply overwrites each tag in some undocumented pre-defined order resulting in only one tag at the end. (A git-filter-branch regression test requires this surprising behavior.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:667
+#, priority:100
+msgid "Also, the poor performance of git-filter-branch often leads to safety issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:683
+#, priority:100
+msgid "Coming up with the correct shell snippet to do the filtering you want is sometimes difficult unless you're just doing a trivial modification such as deleting a couple files. Unfortunately, people often learn if the snippet is right or wrong by trying it out, but the rightness or wrongness can vary depending on special circumstances (spaces in filenames, non-ascii filenames, funny author names or emails, invalid timezones, presence of grafts or replace objects, etc.), meaning they may have to wait a long time, hit an error, then restart. The performance of git-filter-branch is so bad that this cycle is painful, reducing the time available to carefully re-check (to say nothing about what it does to the patience of the person doing the rewrite even if they do technically have more time available). This problem is extra compounded because errors from broken filters may not be shown for a long time and/or get lost in a sea of output. Even worse, broken filters often just result in silent incorrect rewrites."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:691
+#, priority:100
+msgid "To top it all off, even when users finally find working commands, they naturally want to share them. But they may be unaware that their repo didn't have some special cases that someone else's does. So, when someone else with a different repository runs the same commands, they get hit by the problems above. Or, the user just runs commands that really were vetted for special cases, but they run it on a different OS where it doesn't work, as noted above."
msgstr ""
#. type: Title =
@@ -23474,7 +23743,7 @@ msgid "This command is intended mostly for internal use by scripts automatically
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:64
+#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:68
#, no-wrap, priority:240
msgid "--log[=<n>]"
msgstr ""
@@ -23486,7 +23755,7 @@ msgid "In addition to branch names, populate the log message with one-line descr
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:65
+#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:69
#, ignore-same, no-wrap, priority:240
msgid "--no-log"
msgstr "--no-log"
@@ -24156,9 +24425,9 @@ msgid ""
"\t\t [--signature-file=<file>]\n"
"\t\t [-n | --numbered | -N | --no-numbered]\n"
"\t\t [--start-number <n>] [--numbered-files]\n"
-"\t\t [--in-reply-to=Message-Id] [--suffix=.<sfx>]\n"
+"\t\t [--in-reply-to=<message id>] [--suffix=.<sfx>]\n"
"\t\t [--ignore-if-in-upstream]\n"
-"\t\t [--rfc] [--subject-prefix=Subject-Prefix]\n"
+"\t\t [--rfc] [--subject-prefix=<subject prefix>]\n"
"\t\t [(--reroll-count|-v) <n>]\n"
"\t\t [--to=<email>] [--cc=<email>]\n"
"\t\t [--[no-]cover-letter] [--quiet]\n"
@@ -24207,523 +24476,524 @@ msgid "By default, each output file is numbered sequentially from 1, and uses th
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:70
+#: en/git-format-patch.txt:71
#, priority:100
-msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`."
+msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`. All directory components will be created."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:74
+#: en/git-format-patch.txt:75
#, priority:100
msgid "By default, the subject of a single patch is \"[PATCH] \" followed by the concatenation of lines from the commit message up to the first blank line (see the DISCUSSION section of linkgit:git-commit[1])."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:78
+#: en/git-format-patch.txt:79
#, priority:100
msgid "When multiple patches are output, the subject prefix will instead be \"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. To omit patch numbers from the subject, use `-N`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:83
+#: en/git-format-patch.txt:84
#, priority:100
msgid "If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a `Message-Id` header to reference."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:89
+#: en/git-format-patch.txt:90
#, no-wrap, priority:100
msgid "-<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:91
+#: en/git-format-patch.txt:92
#, priority:100
msgid "Prepare patches from the topmost <n> commits."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:92
+#: en/git-format-patch.txt:93
#, no-wrap, priority:100
msgid "-o <dir>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:93
+#: en/git-format-patch.txt:94
#, no-wrap, priority:100
msgid "--output-directory <dir>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:96
+#: en/git-format-patch.txt:97
#, priority:100
msgid "Use <dir> to store the resulting files, instead of the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:98 en/git-shortlog.txt:30
+#: en/git-format-patch.txt:99 en/git-shortlog.txt:30
#, ignore-same, no-wrap, priority:260
msgid "--numbered"
msgstr "--numbered"
#. type: Plain text
-#: en/git-format-patch.txt:100
+#: en/git-format-patch.txt:101
#, priority:100
msgid "Name output in '[PATCH n/m]' format, even with a single patch."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:102
+#: en/git-format-patch.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-numbered"
msgstr "--no-numbered"
#. type: Plain text
-#: en/git-format-patch.txt:104
+#: en/git-format-patch.txt:105
#, priority:100
msgid "Name output in '[PATCH]' format."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:105
+#: en/git-format-patch.txt:106
#, no-wrap, priority:100
msgid "--start-number <n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:107
+#: en/git-format-patch.txt:108
#, priority:100
msgid "Start numbering the patches at <n> instead of 1."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:108
+#: en/git-format-patch.txt:109
#, ignore-same, no-wrap, priority:100
msgid "--numbered-files"
msgstr "--numbered-files"
#. type: Plain text
-#: en/git-format-patch.txt:111
+#: en/git-format-patch.txt:112
#, priority:100
msgid "Output file names will be a simple number sequence without the default first line of the commit appended."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:113
+#: en/git-format-patch.txt:114
#, ignore-same, no-wrap, priority:100
msgid "--keep-subject"
msgstr "--keep-subject"
#. type: Plain text
-#: en/git-format-patch.txt:116
+#: en/git-format-patch.txt:117
#, priority:100
msgid "Do not strip/add '[PATCH]' from the first line of the commit log message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:122
+#: en/git-format-patch.txt:123
#, priority:100
msgid "Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:123 en/git-pack-objects.txt:59
+#: en/git-format-patch.txt:124 en/git-pack-objects.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--stdout"
msgstr "--stdout"
#. type: Plain text
-#: en/git-format-patch.txt:126
+#: en/git-format-patch.txt:127
#, priority:100
msgid "Print all commits to the standard output in mbox format, instead of creating a file for each one."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:127
+#: en/git-format-patch.txt:128
#, no-wrap, priority:100
msgid "--attach[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:131
+#: en/git-format-patch.txt:132
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: attachment`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:132
+#: en/git-format-patch.txt:133
#, ignore-same, no-wrap, priority:100
msgid "--no-attach"
msgstr "--no-attach"
#. type: Plain text
-#: en/git-format-patch.txt:135
+#: en/git-format-patch.txt:136
#, priority:100
msgid "Disable the creation of an attachment, overriding the configuration setting."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:136
+#: en/git-format-patch.txt:137
#, no-wrap, priority:100
msgid "--inline[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:140
+#: en/git-format-patch.txt:141
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: inline`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:141
+#: en/git-format-patch.txt:142
#, no-wrap, priority:100
msgid "--thread[=<style>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:142
+#: en/git-format-patch.txt:143
#, ignore-same, no-wrap, priority:100
msgid "--no-thread"
msgstr "--no-thread"
#. type: Plain text
-#: en/git-format-patch.txt:147
+#: en/git-format-patch.txt:148
#, priority:100
msgid "Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the first. Also controls generation of the `Message-Id` header to reference."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:153
+#: en/git-format-patch.txt:154
#, priority:100
msgid "The optional <style> argument can be either `shallow` or `deep`. 'shallow' threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order. 'deep' threading makes every mail a reply to the previous one."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:157
+#: en/git-format-patch.txt:158
#, priority:100
msgid "The default is `--no-thread`, unless the `format.thread` configuration is set. If `--thread` is specified without a style, it defaults to the style specified by `format.thread` if any, or else `shallow`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:161
+#: en/git-format-patch.txt:162
#, priority:100
msgid "Beware that the default for 'git send-email' is to thread emails itself. If you want `git format-patch` to take care of threading, you will want to ensure that threading is disabled for `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:162
-#, no-wrap, priority:100
-msgid "--in-reply-to=Message-Id"
-msgstr ""
+#: en/git-format-patch.txt:163
+#, fuzzy, no-wrap, priority:100
+#| msgid "--no-message-id"
+msgid "--in-reply-to=<message id>"
+msgstr "--no-message-id"
#. type: Plain text
-#: en/git-format-patch.txt:166
+#: en/git-format-patch.txt:167
#, priority:100
-msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given Message-Id, which avoids breaking threads to provide a new patch series."
+msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given <message id>, which avoids breaking threads to provide a new patch series."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:167
+#: en/git-format-patch.txt:168
#, ignore-same, no-wrap, priority:100
msgid "--ignore-if-in-upstream"
msgstr "--ignore-if-in-upstream"
#. type: Plain text
-#: en/git-format-patch.txt:173
+#: en/git-format-patch.txt:174
#, priority:100
msgid "Do not include a patch that matches a commit in <until>..<since>. This will examine all patches reachable from <since> but not from <until> and compare them with the patches being generated, and any patch that matches is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:174
+#: en/git-format-patch.txt:175
#, no-wrap, priority:100
-msgid "--subject-prefix=<Subject-Prefix>"
+msgid "--subject-prefix=<subject prefix>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:179
+#: en/git-format-patch.txt:180
#, priority:100
-msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<Subject-Prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
+msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<subject prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:180
+#: en/git-format-patch.txt:181
#, ignore-same, no-wrap, priority:100
msgid "--rfc"
msgstr "--rfc"
#. type: Plain text
-#: en/git-format-patch.txt:184
+#: en/git-format-patch.txt:185
#, priority:100
msgid "Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For Comments\"; use this when sending an experimental patch for discussion rather than application."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:185
+#: en/git-format-patch.txt:186
#, no-wrap, priority:100
msgid "-v <n>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:186
+#: en/git-format-patch.txt:187
#, no-wrap, priority:100
msgid "--reroll-count=<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:193
+#: en/git-format-patch.txt:194
#, priority:100
msgid "Mark the series as the <n>-th iteration of the topic. The output filenames have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default, but configurable via the `--subject-prefix` option) has ` v<n>` appended to it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:194
+#: en/git-format-patch.txt:195
#, no-wrap, priority:100
msgid "--to=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:199
+#: en/git-format-patch.txt:200
#, priority:100
msgid "Add a `To:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-to` discards all `To:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:200
+#: en/git-format-patch.txt:201
#, no-wrap, priority:100
msgid "--cc=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:205
+#: en/git-format-patch.txt:206
#, priority:100
msgid "Add a `Cc:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-cc` discards all `Cc:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:206
+#: en/git-format-patch.txt:207
#, ignore-same, no-wrap, priority:100
msgid "--from"
msgstr "--from"
#. type: Labeled list
-#: en/git-format-patch.txt:207
+#: en/git-format-patch.txt:208
#, no-wrap, priority:100
msgid "--from=<ident>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:213
+#: en/git-format-patch.txt:214
#, priority:100
msgid "Use `ident` in the `From:` header of each commit email. If the author ident of the commit is not textually identical to the provided `ident`, place a `From:` header in the body of the message with the original author. If no `ident` is given, use the committer ident."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:220
+#: en/git-format-patch.txt:221
#, priority:100
msgid "Note that this option is only useful if you are actually sending the emails and want to identify yourself as the sender, but retain the original author (and `git am` will correctly pick up the in-body header). Note also that `git send-email` already handles this transformation for you, and this option should not be used if you are feeding the result to `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:221
+#: en/git-format-patch.txt:222
#, no-wrap, priority:100
msgid "--add-header=<header>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:228
+#: en/git-format-patch.txt:229
#, priority:100
msgid "Add an arbitrary header to the email headers. This is in addition to any configured headers, and may be used multiple times. For example, `--add-header=\"Organization: git-foo\"`. The negated form `--no-add-header` discards *all* (`To:`, `Cc:`, and custom) headers added so far from config or command line."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:229
+#: en/git-format-patch.txt:230
#, ignore-same, no-wrap, priority:100
msgid "--[no-]cover-letter"
msgstr "--[no-]cover-letter"
#. type: Plain text
-#: en/git-format-patch.txt:233
+#: en/git-format-patch.txt:234
#, priority:100
msgid "In addition to the patches, generate a cover letter file containing the branch description, shortlog and the overall diffstat. You can fill in a description in the file before sending it out."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:234
+#: en/git-format-patch.txt:235
#, no-wrap, priority:100
msgid "--interdiff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:242
+#: en/git-format-patch.txt:243
#, priority:100
msgid "As a reviewer aid, insert an interdiff into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` is a single revision naming the tip of the previous series which shares a common base with the series being formatted (for example `git format-patch --cover-letter --interdiff=feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:243
+#: en/git-format-patch.txt:244
#, no-wrap, priority:100
msgid "--range-diff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:254
+#: en/git-format-patch.txt:255
#, priority:100
msgid "As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1]) into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` can be a single revision naming the tip of the previous series if it shares a common base with the series being formatted (for example `git format-patch --cover-letter --range-diff=feature/v1 -3 feature/v2`), or a revision range if the two versions of the series are disjoint (for example `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:259
+#: en/git-format-patch.txt:260
#, priority:100
msgid "Note that diff options passed to the command affect how the primary product of `format-patch` is generated, and they are not passed to the underlying `range-diff` machinery used to generate the cover-letter material (this may change in the future)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:260
+#: en/git-format-patch.txt:261
#, no-wrap, priority:100
msgid "--creation-factor=<percent>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:265
+#: en/git-format-patch.txt:266
#, priority:100
msgid "Used with `--range-diff`, tweak the heuristic which matches up commits between the previous and current series of patches by adjusting the creation/deletion cost fudge factor. See linkgit:git-range-diff[1]) for details."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:266
+#: en/git-format-patch.txt:267
#, no-wrap, priority:100
msgid "--notes[=<ref>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:267 en/pretty-options.txt:81
+#: en/git-format-patch.txt:268 en/pretty-options.txt:81
#, ignore-same, no-wrap, priority:260
msgid "--no-notes"
msgstr "--no-notes"
#. type: Plain text
-#: en/git-format-patch.txt:270
+#: en/git-format-patch.txt:271
#, priority:100
msgid "Append the notes (see linkgit:git-notes[1]) for the commit after the three-dash line."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:278
+#: en/git-format-patch.txt:279
#, priority:100
msgid "The expected use case of this is to write supporting explanation for the commit that does not belong to the commit log message proper, and include it with the patch submission. While one can simply write these explanations after `format-patch` has run but before sending, keeping them as Git notes allows them to be maintained between versions of the patch series (but see the discussion of the `notes.rewrite` configuration options in linkgit:git-notes[1] to use this workflow)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:281
+#: en/git-format-patch.txt:282
#, priority:100
msgid "The default is `--no-notes`, unless the `format.notes` configuration is set."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:282
+#: en/git-format-patch.txt:283
#, no-wrap, priority:100
msgid "--[no-]signature=<signature>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:287
+#: en/git-format-patch.txt:288
#, priority:100
msgid "Add a signature to each message produced. Per RFC 3676 the signature is separated from the body by a line with '-- ' on it. If the signature option is omitted the signature defaults to the Git version number."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:288
+#: en/git-format-patch.txt:289
#, no-wrap, priority:100
msgid "--signature-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:290
+#: en/git-format-patch.txt:291
#, priority:100
msgid "Works just like --signature except the signature is read from a file."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:291
+#: en/git-format-patch.txt:292
#, no-wrap, priority:100
msgid "--suffix=.<sfx>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:296
+#: en/git-format-patch.txt:297
#, priority:100
msgid "Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is `--suffix=.txt`. Leaving this empty will remove the `.patch` suffix."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:299
+#: en/git-format-patch.txt:300
#, priority:100
msgid "Note that the leading character does not have to be a dot; for example, you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:303
+#: en/git-format-patch.txt:304
#, priority:100
msgid "Do not print the names of the generated files to standard output."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:304
+#: en/git-format-patch.txt:305
#, ignore-same, no-wrap, priority:100
msgid "--no-binary"
msgstr "--no-binary"
#. type: Plain text
-#: en/git-format-patch.txt:309
+#: en/git-format-patch.txt:310
#, priority:100
msgid "Do not output contents of changes in binary files, instead display a notice that those files changed. Patches generated using this option cannot be applied properly, but they are still useful for code review."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:310
+#: en/git-format-patch.txt:311
#, ignore-same, no-wrap, priority:100
msgid "--zero-commit"
msgstr "--zero-commit"
#. type: Plain text
-#: en/git-format-patch.txt:313
+#: en/git-format-patch.txt:314
#, priority:100
msgid "Output an all-zero hash in each patch's From header instead of the hash of the commit."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:314
+#: en/git-format-patch.txt:315
#, no-wrap, priority:100
msgid "--base=<commit>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:318
+#: en/git-format-patch.txt:320
#, priority:100
-msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details."
+msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details. If <commit> is \"auto\", a base commit is automatically chosen."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:325
+#: en/git-format-patch.txt:327
#, priority:100
msgid "Treat the revision argument as a <revision range>, even if it is just a single commit (that would normally be treated as a <since>). Note that root commits included in the specified range are always formatted as creation patches, independently of this flag."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:328
+#: en/git-format-patch.txt:330
#, priority:100
msgid "Show progress reports on stderr as patches are generated."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:335
+#: en/git-format-patch.txt:338
#, priority:100
-msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To\" or \"Cc:\" headers, configure attachments, and sign off patches with configuration variables."
+msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To:\" or \"Cc:\" headers, configure attachments, change the patch output directory, and sign off patches with configuration variables."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:347
+#: en/git-format-patch.txt:351
#, no-wrap, priority:100
msgid ""
"[format]\n"
@@ -24735,17 +25005,18 @@ msgid ""
"\tcc = <email>\n"
"\tattach [ = mime-boundary-string ]\n"
"\tsignOff = true\n"
-"\tcoverletter = auto\n"
+"\toutputDirectory = <directory>\n"
+"\tcoverLetter = auto\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:356
+#: en/git-format-patch.txt:360
#, priority:100
msgid "The patch produced by 'git format-patch' is in UNIX mailbox format, with a fixed \"magic\" time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:366
+#: en/git-format-patch.txt:370
#, no-wrap, priority:100
msgid ""
"From 8f72bad1baf19a53459661343e21d6491c3908d3 Mon Sep 17 00:00:00 2001\n"
@@ -24759,7 +25030,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:369
+#: en/git-format-patch.txt:373
#, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -24767,7 +25038,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:372
+#: en/git-format-patch.txt:376
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"Do the same for ia64 so we can have sleek & trim looking\n"
@@ -24775,19 +25046,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:380
+#: en/git-format-patch.txt:384
#, ignore-ellipsis, priority:100
msgid "Typically it will be placed in a MUA's drafts folder, edited to add timely commentary that should not go in the changelog after the three dashes, and then sent as a message whose body, in our example, starts with \"arch/arm config files were...\". On the receiving end, readers can save interesting patches in a UNIX mailbox and apply them with linkgit:git-am[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:386
+#: en/git-format-patch.txt:390
#, priority:100
msgid "When a patch is part of an ongoing discussion, the patch generated by 'git format-patch' can be tweaked to take advantage of the 'git am --scissors' feature. After your response to the discussion comes a line that consists solely of \"`-- >8 --`\" (scissors and perforation), followed by the patch with unnecessary header fields removed:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:390
+#: en/git-format-patch.txt:394
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"...\n"
@@ -24795,21 +25066,21 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:392
+#: en/git-format-patch.txt:396
#, no-wrap, priority:100
msgid "Makes sense to me. How about this patch?\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:395
+#: en/git-format-patch.txt:399
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-Knig diet\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:398
+#: en/git-format-patch.txt:402
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -24817,61 +25088,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:406
+#: en/git-format-patch.txt:410
#, priority:100
msgid "When sending a patch this way, most often you are sending your own patch, so in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit `From:` and `Date:` lines from the patch file. The patch title is likely to be different from the subject of the discussion the patch is in response to, so it is likely that you would want to keep the Subject: line, like the example above."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:408
+#: en/git-format-patch.txt:412
#, no-wrap, priority:100
msgid "Checking for patch corruption"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:411
+#: en/git-format-patch.txt:415
#, priority:100
msgid "Many mailers if not set up properly will corrupt whitespace. Here are two common types of corruption:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:413
+#: en/git-format-patch.txt:417
#, priority:100
msgid "Empty context lines that do not have _any_ whitespace."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:416
+#: en/git-format-patch.txt:420
#, priority:100
msgid "Non-empty context lines that have one extra whitespace at the beginning."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:418
+#: en/git-format-patch.txt:422
#, priority:100
msgid "One way to test if your MUA is set up correctly is:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:422
+#: en/git-format-patch.txt:426
#, priority:100
msgid "Send the patch to yourself, exactly the way you would, except with To: and Cc: lines that do not contain the list and maintainer address."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:425
+#: en/git-format-patch.txt:429
#, priority:100
msgid "Save that patch to a file in UNIX mailbox format. Call it a.patch, say."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:427
+#: en/git-format-patch.txt:431
#, priority:100
msgid "Apply it:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:432
+#: en/git-format-patch.txt:436
#, no-wrap, priority:100
msgid ""
"$ git fetch <project> master:test-apply\n"
@@ -24881,175 +25152,175 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:434
+#: en/git-format-patch.txt:438
#, priority:100
msgid "If it does not apply correctly, there can be various reasons."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:439
+#: en/git-format-patch.txt:443
#, priority:100
msgid "The patch itself does not apply cleanly. That is _bad_ but does not have much to do with your MUA. You might want to rebase the patch with linkgit:git-rebase[1] before regenerating it in this case."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:444
+#: en/git-format-patch.txt:448
#, priority:100
msgid "The MUA corrupted your patch; \"am\" would complain that the patch does not apply. Look in the .git/rebase-apply/ subdirectory and see what 'patch' file contains and check for the common corruption patterns mentioned above."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:452
+#: en/git-format-patch.txt:456
#, priority:100
msgid "While at it, check the 'info' and 'final-commit' files as well. If what is in 'final-commit' is not exactly what you would want to see in the commit log message, it is very likely that the receiver would end up hand editing the log message when applying your patch. Things like \"Hi, this is my first patch.\\n\" in the patch e-mail should come after the three-dash line that signals the end of the commit message."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:454
+#: en/git-format-patch.txt:458
#, no-wrap, priority:100
msgid "MUA-SPECIFIC HINTS"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:457
+#: en/git-format-patch.txt:461
#, priority:100
msgid "Here are some hints on how to successfully submit patches inline using various mailers."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:459
+#: en/git-format-patch.txt:463
#, no-wrap, priority:100
msgid "GMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:465
+#: en/git-format-patch.txt:469
#, priority:100
msgid "GMail does not have any way to turn off line wrapping in the web interface, so it will mangle any emails that you send. You can however use \"git send-email\" and send your patches through the GMail SMTP server, or use any IMAP email client to connect to the google IMAP server and forward the emails through that."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:468
+#: en/git-format-patch.txt:472
#, priority:100
msgid "For hints on using 'git send-email' to send your patches through the GMail SMTP server, see the EXAMPLE section of linkgit:git-send-email[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:471
+#: en/git-format-patch.txt:475
#, priority:100
msgid "For hints on submission using the IMAP interface, see the EXAMPLE section of linkgit:git-imap-send[1]."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:473
+#: en/git-format-patch.txt:477
#, no-wrap, priority:100
msgid "Thunderbird"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:477
+#: en/git-format-patch.txt:481
#, priority:100
msgid "By default, Thunderbird will both wrap emails as well as flag them as being 'format=flowed', both of which will make the resulting email unusable by Git."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:481
+#: en/git-format-patch.txt:485
#, priority:100
msgid "There are three different approaches: use an add-on to turn off line wraps, configure Thunderbird to not mangle patches, or use an external editor to keep Thunderbird from mangling the patches."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:483
+#: en/git-format-patch.txt:487
#, no-wrap, priority:100
msgid "Approach #1 (add-on)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:491
+#: en/git-format-patch.txt:495
#, priority:100
msgid "Install the Toggle Word Wrap add-on that is available from https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you can tick off. Now you can compose the message as you otherwise do (cut + paste, 'git format-patch' | 'git imap-send', etc), but you have to insert line breaks manually in any text that you type."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:493
+#: en/git-format-patch.txt:497
#, no-wrap, priority:100
msgid "Approach #2 (configuration)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:495
+#: en/git-format-patch.txt:499
#, priority:100
msgid "Three steps:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:499
+#: en/git-format-patch.txt:503
#, ignore-ellipsis, priority:100
msgid "Configure your mail server composition as plain text: Edit...Account Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:501
+#: en/git-format-patch.txt:505
#, priority:100
msgid "Configure your general composition window to not wrap."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:504
+#: en/git-format-patch.txt:508
#, priority:100
msgid "In Thunderbird 2: Edit..Preferences..Composition, wrap plain text messages at 0"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:510
+#: en/git-format-patch.txt:514
#, priority:100
msgid "In Thunderbird 3: Edit..Preferences..Advanced..Config Editor. Search for \"mail.wrap_long_lines\". Toggle it to make sure it is set to `false`. Also, search for \"mailnews.wraplength\" and set the value to 0."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:515
+#: en/git-format-patch.txt:519
#, priority:100
msgid "Disable the use of format=flowed: Edit..Preferences..Advanced..Config Editor. Search for \"mailnews.send_plaintext_flowed\". Toggle it to make sure it is set to `false`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:519
+#: en/git-format-patch.txt:523
#, priority:100
msgid "After that is done, you should be able to compose email as you otherwise would (cut + paste, 'git format-patch' | 'git imap-send', etc), and the patches will not be mangled."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:521
+#: en/git-format-patch.txt:525
#, no-wrap, priority:100
msgid "Approach #3 (external editor)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:526
+#: en/git-format-patch.txt:530
#, priority:100
msgid "The following Thunderbird extensions are needed: AboutConfig from http://aboutconfig.mozdev.org/ and External Editor from http://globs.org/articles.php?lng=en&pg=8"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:528
+#: en/git-format-patch.txt:532
#, priority:100
msgid "Prepare the patch as a text file using your method of choice."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:533
+#: en/git-format-patch.txt:537
#, priority:100
msgid "Before opening a compose window, use Edit->Account Settings to uncheck the \"Compose messages in HTML format\" setting in the \"Composition & Addressing\" panel of the account to be used to send the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:537
+#: en/git-format-patch.txt:541
#, priority:100
msgid "In the main Thunderbird window, 'before' you open the compose window for the patch, use Tools->about:config to set the following to the indicated values:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:541
+#: en/git-format-patch.txt:545
#, no-wrap, priority:100
msgid ""
"\tmailnews.send_plaintext_flowed => false\n"
@@ -25057,25 +25328,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:544
+#: en/git-format-patch.txt:548
#, priority:100
msgid "Open a compose window and click the external editor icon."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:547
+#: en/git-format-patch.txt:551
#, priority:100
msgid "In the external editor window, read in the patch file and exit the editor normally."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:550
+#: en/git-format-patch.txt:554
#, priority:100
msgid "Side note: it may be possible to do step 2 with about:config and the following settings but no one's tried yet."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:555
+#: en/git-format-patch.txt:559
#, no-wrap, priority:100
msgid ""
"\tmail.html_compose => false\n"
@@ -25084,91 +25355,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:560
+#: en/git-format-patch.txt:564
#, priority:100
msgid "There is a script in contrib/thunderbird-patch-inline which can help you include patches with Thunderbird in an easy way. To use it, do the steps above and then use the script as the external editor."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:562
+#: en/git-format-patch.txt:566
#, no-wrap, priority:100
msgid "KMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:564
+#: en/git-format-patch.txt:568
#, priority:100
msgid "This should help you to submit patches inline using KMail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:566
+#: en/git-format-patch.txt:570
#, priority:100
msgid "Prepare the patch as a text file."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:568
+#: en/git-format-patch.txt:572
#, priority:100
msgid "Click on New Mail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:571
+#: en/git-format-patch.txt:575
#, priority:100
msgid "Go under \"Options\" in the Composer window and be sure that \"Word wrap\" is not set."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:573
+#: en/git-format-patch.txt:577
#, ignore-ellipsis, priority:100
msgid "Use Message -> Insert file... and insert the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:576
+#: en/git-format-patch.txt:580
#, priority:100
msgid "Back in the compose window: add whatever other text you wish to the message, complete the addressing and subject fields, and press send."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:578
+#: en/git-format-patch.txt:582
#, no-wrap, priority:100
msgid "BASE TREE INFORMATION"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:587
+#: en/git-format-patch.txt:591
#, priority:100
msgid "The base tree information block is used for maintainers or third party testers to know the exact state the patch series applies to. It consists of the 'base commit', which is a well-known commit that is part of the stable part of the project history everybody else works off of, and zero or more 'prerequisite patches', which are well-known patches in flight that is not yet part of the 'base commit' that need to be applied on top of 'base commit' in topological order before the patches can be applied."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:593
+#: en/git-format-patch.txt:597
#, priority:100
msgid "The 'base commit' is shown as \"base-commit: \" followed by the 40-hex of the commit object name. A 'prerequisite patch' is shown as \"prerequisite-patch-id: \" followed by the 40-hex 'patch id', which can be obtained by passing the patch through the `git patch-id --stable` command."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:597
+#: en/git-format-patch.txt:601
#, priority:100
msgid "Imagine that on top of the public commit P, you applied well-known patches X, Y and Z from somebody else, and then built your three-patch series A, B, C, the history would be like:"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:600
+#: en/git-format-patch.txt:604
#, no-wrap, priority:100
msgid "---P---X---Y---Z---A---B---C\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:607
+#: en/git-format-patch.txt:611
#, priority:100
msgid "With `git format-patch --base=P -3 C` (or variants thereof, e.g. with `--cover-letter` or using `Z..C` instead of `-3 C` to specify the range), the base tree information block is shown at the end of the first message the command outputs (either the first patch, or the cover letter), like this:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:613
+#: en/git-format-patch.txt:617
#, no-wrap, priority:100
msgid ""
"base-commit: P\n"
@@ -25178,13 +25449,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:616
+#: en/git-format-patch.txt:620
#, priority:100
msgid "For non-linear topology, such as"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:621
+#: en/git-format-patch.txt:625
#, no-wrap, priority:100
msgid ""
"---P---X---A---M---C\n"
@@ -25193,91 +25464,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:626
+#: en/git-format-patch.txt:630
#, priority:100
msgid "You can also use `git format-patch --base=P -3 C` to generate patches for A, B and C, and the identifiers for P, X, Y, Z are appended at the end of the first message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:632
+#: en/git-format-patch.txt:636
#, priority:100
msgid "If set `--base=auto` in cmdline, it will track base commit automatically, the base commit will be the merge base of tip commit of the remote-tracking branch and revision-range specified in cmdline. For a local branch, you need to track a remote branch by `git branch --set-upstream-to` before using this option."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:638
+#: en/git-format-patch.txt:642
#, priority:100
msgid "Extract commits between revisions R1 and R2, and apply them on top of the current branch using 'git am' to cherry-pick them:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:641
+#: en/git-format-patch.txt:645
#, no-wrap, priority:100
msgid "$ git format-patch -k --stdout R1..R2 | git am -3 -k\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:645
+#: en/git-format-patch.txt:649
#, priority:100
msgid "Extract all commits which are in the current branch but not in the origin branch:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:648
+#: en/git-format-patch.txt:652
#, no-wrap, priority:100
msgid "$ git format-patch origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:651
+#: en/git-format-patch.txt:655
#, priority:100
msgid "For each commit a separate file is created in the current directory."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:654
+#: en/git-format-patch.txt:658
#, priority:100
msgid "Extract all commits that lead to 'origin' since the inception of the project:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:657
+#: en/git-format-patch.txt:661
#, no-wrap, priority:100
msgid "$ git format-patch --root origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:660
+#: en/git-format-patch.txt:664
#, priority:100
msgid "The same as the previous one:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:663
+#: en/git-format-patch.txt:667
#, no-wrap, priority:100
msgid "$ git format-patch -M -B origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:670
+#: en/git-format-patch.txt:674
#, priority:100
msgid "Additionally, it detects and handles renames and complete rewrites intelligently to produce a renaming patch. A renaming patch reduces the amount of text output, and generally makes it easier to review. Note that non-Git \"patch\" programs won't understand renaming patches, so use it only when you know the recipient uses Git to apply your patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:673
+#: en/git-format-patch.txt:677
#, priority:100
msgid "Extract three topmost commits from the current branch and format them as e-mailable patches:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:676
+#: en/git-format-patch.txt:680
#, no-wrap, priority:100
msgid "$ git format-patch -3\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:681
+#: en/git-format-patch.txt:685
#, ignore-same, priority:100
msgid "linkgit:git-am[1], linkgit:git-send-email[1]"
msgstr "linkgit:git-am[1], linkgit:git-send-email[1]"
@@ -25773,43 +26044,43 @@ msgid "The below documentation is the same as what's found in linkgit:git-config
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:127
+#: en/git-gc.txt:126
#, priority:100
-msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, refs saved by 'git filter-branch' in refs/original/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
+msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, notes saved by 'git notes' under refs/notes/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:134
+#: en/git-gc.txt:133
#, priority:100
msgid "On the other hand, when 'git gc' runs concurrently with another process, there is a risk of it deleting an object that the other process is using but hasn't created a reference to. This may just cause the other process to fail or may corrupt the repository if the other process later adds a reference to the deleted object. Git has two features that significantly mitigate this problem:"
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:137
+#: en/git-gc.txt:136
#, priority:100
msgid "Any object with modification time newer than the `--prune` date is kept, along with everything reachable from it."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:141
+#: en/git-gc.txt:140
#, priority:100
msgid "Most operations that add an object to the database update the modification time of the object if it is already present so that #1 applies."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:145
+#: en/git-gc.txt:144
#, priority:100
msgid "However, these features fall short of a complete solution, so users who run commands concurrently have to live with some risk of corruption (which seems to be low in practice)."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:151
+#: en/git-gc.txt:150
#, priority:100
msgid "The 'git gc --auto' command will run the 'pre-auto-gc' hook. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:159
+#: en/git-gc.txt:158
#, ignore-same, priority:100
msgid "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
msgstr "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
@@ -26075,7 +26346,7 @@ msgid "For each <pathspec> given on command line, descend at most <depth> levels
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:399
+#: en/git-grep.txt:128 en/git-submodule.txt:400
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
@@ -26291,7 +26562,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:951
+#: en/git-grep.txt:217 en/rev-list-options.txt:967
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -26441,127 +26712,151 @@ msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:280
+#: en/git-grep.txt:277
+#, priority:100
+msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:282
+#, priority:100
+msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:287
+#, priority:100
+msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:291
+#, priority:100
+msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:297
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:281
+#: en/git-grep.txt:298
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:282
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:283 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:284
+#: en/git-grep.txt:301
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:289
+#: en/git-grep.txt:306
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:290 en/rev-list-options.txt:65
+#: en/git-grep.txt:307 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:294
+#: en/git-grep.txt:311
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:299
+#: en/git-grep.txt:316
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:300
+#: en/git-grep.txt:317
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:303
+#: en/git-grep.txt:320
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:307
+#: en/git-grep.txt:324
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:328
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:318
+#: en/git-grep.txt:335
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:321
+#: en/git-grep.txt:338
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:322
+#: en/git-grep.txt:339
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:325
+#: en/git-grep.txt:342
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:326
+#: en/git-grep.txt:343
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:329
+#: en/git-grep.txt:346
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:330
+#: en/git-grep.txt:347
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:332
+#: en/git-grep.txt:349
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
@@ -26779,25 +27074,13 @@ msgstr ""
#. type: Plain text
#: en/git-gui.txt:116
#, priority:100
-msgid "A 'git gui' development repository can be obtained from:"
+msgid "The official repository of the 'git gui' project can be found at:"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:118
#, no-wrap, priority:100
-msgid " git clone git://repo.or.cz/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:122
-#, no-wrap, priority:100
-msgid " git clone http://repo.or.cz/r/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:124
-#, priority:100
-msgid "or browsed online at http://repo.or.cz/w/git-gui.git/[]."
+msgid " https://github.com/prati0100/git-gui.git/\n"
msgstr ""
#. type: Title =
@@ -30409,29 +30692,29 @@ msgstr ""
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
-#. type: Plain text
-#: en/git-ls-remote.txt:110
+#. type: delimited block -
+#: en/git-ls-remote.txt:111
#, no-wrap, priority:100
msgid ""
-"\t$ git ls-remote --tags ./.\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"\t$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
-"\t5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"\tc781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
-"\t$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
-"\t$ git ls-remote --tags korg v\\*\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"$ git ls-remote --tags ./.\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
+"$ git ls-remote --tags korg v\\*\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:114
+#: en/git-ls-remote.txt:116
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -30939,7 +31222,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:358
+#: en/git-merge-base.txt:60 en/git-rebase.txt:376
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -30968,235 +31251,235 @@ msgstr ""
msgid "For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:86
+#. type: delimited block .
+#: en/git-merge-base.txt:87
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---B\n"
-"\t /\n"
-"\t---o---1---o---o---o---A\n"
+"\t o---o---o---B\n"
+"\t/\n"
+"---o---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:88
+#: en/git-merge-base.txt:90
#, priority:100
msgid "the merge base between 'A' and 'B' is '1'."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:92
+#: en/git-merge-base.txt:94
#, priority:100
msgid "Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the merge base between 'A' and a hypothetical commit 'M', which is a merge between 'B' and 'C'. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:98
+#. type: delimited block .
+#: en/git-merge-base.txt:101
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---C\n"
-"\t /\n"
-"\t / o---o---o---B\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---C\n"
+" /\n"
+" / o---o---o---B\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:101
+#: en/git-merge-base.txt:105
#, priority:100
msgid "the result of `git merge-base A B C` is '1'. This is because the equivalent topology with a merge commit 'M' between 'B' and 'C' is:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:108
+#. type: delimited block .
+#: en/git-merge-base.txt:113
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---o\n"
-"\t / \\\n"
-"\t / o---o---o---o---M\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---o\n"
+" / \\\n"
+" / o---o---o---o---M\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:112
+#: en/git-merge-base.txt:118
#, priority:100
msgid "and the result of `git merge-base A M` is '1'. Commit '2' is also a common ancestor between 'A' and 'M', but '1' is a better common ancestor, because '2' is an ancestor of '1'. Hence, '2' is not a merge base."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:115
+#: en/git-merge-base.txt:121
#, priority:100
msgid "The result of `git merge-base --octopus A B C` is '2', because '2' is the best common ancestor of all commits."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:118
+#: en/git-merge-base.txt:124
#, priority:100
msgid "When the history involves criss-cross merges, there can be more than one 'best' common ancestor for two commits. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:124
+#. type: delimited block .
+#: en/git-merge-base.txt:131
#, no-wrap, priority:100
msgid ""
-"\t---1---o---A\n"
-"\t \\ /\n"
-"\t X\n"
-"\t / \\\n"
-"\t---2---o---o---B\n"
+"---1---o---A\n"
+" \\ /\n"
+" X\n"
+" / \\\n"
+"---2---o---o---B\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:128
+#: en/git-merge-base.txt:136
#, priority:100
msgid "both '1' and '2' are merge-bases of A and B. Neither one is better than the other (both are 'best' merge bases). When the `--all` option is not given, it is unspecified which best one is output."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:133
+#: en/git-merge-base.txt:141
#, priority:100
msgid "A common idiom to check \"fast-forward-ness\" between two commits A and B is (or at least used to be) to compute the merge base between A and B, and check if it is the same as A, in which case, A is an ancestor of B. You will see this idiom used often in older scripts."
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:139
+#. type: delimited block .
+#: en/git-merge-base.txt:148
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tA=$(git rev-parse --verify A)\n"
-"\tif test \"$A\" = \"$(git merge-base A B)\"\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"A=$(git rev-parse --verify A)\n"
+"if test \"$A\" = \"$(git merge-base A B)\"\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:141
+#: en/git-merge-base.txt:151
#, priority:100
msgid "In modern git, you can say this in a more direct way:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:146
+#. type: delimited block .
+#: en/git-merge-base.txt:157
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tif git merge-base --is-ancestor A B\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"if git merge-base --is-ancestor A B\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:148
+#: en/git-merge-base.txt:160
#, priority:100
msgid "instead."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:150
+#: en/git-merge-base.txt:162
#, no-wrap, priority:100
msgid "Discussion on fork-point mode"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:156
+#: en/git-merge-base.txt:168
#, priority:100
msgid "After working on the `topic` branch created with `git switch -c topic origin/master`, the history of remote-tracking branch `origin/master` may have been rewound and rebuilt, leading to a history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:164
+#. type: delimited block .
+#: en/git-merge-base.txt:177
#, no-wrap, priority:100
msgid ""
-"\t o---B2\n"
-"\t /\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t \\\n"
-"\t B0\n"
-"\t \\\n"
-"\t D0---D1---D (topic)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\\n"
+"\t B0\n"
+"\t \\\n"
+"\t D0---D1---D (topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:170
+#: en/git-merge-base.txt:184
#, priority:100
msgid "where `origin/master` used to point at commits B0, B1, B2 and now it points at B, and your `topic` branch was started on top of it back when `origin/master` was at B0, and you built three commits, D0, D1, and D, on top of it. Imagine that you now want to rebase the work you did on the topic on top of the updated origin/master."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:176
+#: en/git-merge-base.txt:190
#, priority:100
msgid "In such a case, `git merge-base origin/master topic` would return the parent of B0 in the above picture, but B0^..D is *not* the range of commits you would want to replay on top of B (it includes B0, which is not what you wrote; it is a commit the other side discarded when it moved its tip from B0 to B1)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:184
+#: en/git-merge-base.txt:198
#, priority:100
msgid "`git merge-base --fork-point origin/master topic` is designed to help in such a case. It takes not only B but also B0, B1, and B2 (i.e. old tips of the remote-tracking branches your repository's reflog knows about) into account to see on which commit your topic branch was built and finds B0, allowing you to replay only the commits on your topic, excluding the commits the other side later discarded."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:186
+#: en/git-merge-base.txt:200
#, priority:100
msgid "Hence"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:188
+#: en/git-merge-base.txt:202
#, no-wrap, priority:100
msgid " $ fork_point=$(git merge-base --fork-point origin/master topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:190
+#: en/git-merge-base.txt:204
#, priority:100
msgid "will find B0, and"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:192
+#: en/git-merge-base.txt:206
#, no-wrap, priority:100
msgid " $ git rebase --onto origin/master $fork_point topic\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:195
+#: en/git-merge-base.txt:209
#, priority:100
msgid "will replay D0, D1 and D on top of B to create a new history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:203
+#. type: delimited block .
+#: en/git-merge-base.txt:218
#, no-wrap, priority:100
msgid ""
-"\t\t\t o---B2\n"
-"\t\t\t/\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t\t\\ \\\n"
-"\t\t B0 D0'--D1'--D' (topic - updated)\n"
-"\t\t \\\n"
-"\t\t D0---D1---D (topic - old)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\ \\\n"
+"\t B0 D0'--D1'--D' (topic - updated)\n"
+"\t \\\n"
+"\t D0---D1---D (topic - old)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:210
+#: en/git-merge-base.txt:226
#, priority:100
msgid "A caveat is that older reflog entries in your repository may be expired by `git gc`. If B0 no longer appears in the reflog of the remote-tracking branch `origin/master`, the `--fork-point` mode obviously cannot find it and fails, avoiding to give a random and useless result (such as the parent of B0, like the same command without the `--fork-point` option gives)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:221
+#: en/git-merge-base.txt:237
#, priority:100
msgid "Also, the remote-tracking branch you use the `--fork-point` mode with must be the one your topic forked from its tip. If you forked from an older commit than the tip, this mode would not find the fork point (imagine in the above sample history B0 did not exist, origin/master started at B1, moved to B2 and then B, and you forked your topic at origin/master^ when origin/master was B1; the shape of the history would be the same as above, without B0, and the parent of B1 is what `git merge-base origin/master topic` correctly finds, but the `--fork-point` mode will not, because it is not one of the commits that used to be at the tip of origin/master)."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:224
+#: en/git-merge-base.txt:240
#, no-wrap, priority:100
msgid "See also"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:228
+#: en/git-merge-base.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
msgstr "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
@@ -31407,31 +31690,31 @@ msgstr ""
msgid "Examples:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:62
+#. type: delimited block -
+#: en/git-merge-index.txt:63
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
-" This is MM from the original tree.\t\t\t# original\n"
-" This is modified MM in the branch A.\t\t\t# merge1\n"
-" This is modified MM in the branch B.\t\t\t# merge2\n"
-" This is modified MM in the branch B.\t\t\t# current contents\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
+"This is MM from the original tree.\t\t# original\n"
+"This is modified MM in the branch A.\t\t# merge1\n"
+"This is modified MM in the branch B.\t\t# merge2\n"
+"This is modified MM in the branch B.\t\t# current contents\n"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:71
+#. type: delimited block -
+#: en/git-merge-index.txt:74
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
-" cat: : No such file or directory\n"
-" This is added AA in the branch A.\n"
-" This is added AA in the branch B.\n"
-" This is added AA in the branch B.\n"
-" fatal: merge program failed\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
+"cat: : No such file or directory\n"
+"This is added AA in the branch A.\n"
+"This is added AA in the branch B.\n"
+"This is added AA in the branch B.\n"
+"fatal: merge program failed\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-index.txt:76
+#: en/git-merge-index.txt:80
#, priority:100
msgid "where the latter example shows how 'git merge-index' will stop trying to merge once anything has returned an error (i.e., `cat` returned an error for the AA file, because it didn't exist in the original, and thus 'git merge-index' didn't even try to merge the MM thing)."
msgstr ""
@@ -31729,7 +32012,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n"
-"\t[-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
+"\t[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
"\t[--[no-]allow-unrelated-histories]\n"
"\t[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]\n"
"'git merge' (--continue | --abort | --quit)\n"
@@ -32810,7 +33093,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:281 en/merge-options.txt:108
+#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -33790,7 +34073,7 @@ msgid "Conflicts can occur when applying a commit to p4. When this happens, the
msgstr ""
#. type: Labeled list
-#: en/git-p4.txt:359 en/git-submodule.txt:270
+#: en/git-p4.txt:359 en/git-submodule.txt:271
#, no-wrap, priority:220
msgid "--branch <branch>"
msgstr ""
@@ -34926,7 +35209,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:263 en/rev-list-options.txt:760
+#: en/git-pack-objects.txt:263 en/rev-list-options.txt:776
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -34938,13 +35221,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:266 en/rev-list-options.txt:767
+#: en/git-pack-objects.txt:266 en/rev-list-options.txt:783
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:269 en/rev-list-options.txt:770
+#: en/git-pack-objects.txt:269 en/rev-list-options.txt:786
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -34956,7 +35239,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:276 en/rev-list-options.txt:777
+#: en/git-pack-objects.txt:276 en/rev-list-options.txt:793
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -34968,7 +35251,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:281 en/rev-list-options.txt:785
+#: en/git-pack-objects.txt:281 en/rev-list-options.txt:801
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -35727,13 +36010,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:502
+#: en/git-pull.txt:136 en/git-rebase.txt:524
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:503
+#: en/git-pull.txt:137 en/git-rebase.txt:525
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -37526,8 +37809,8 @@ msgstr ""
#: en/git-rebase.txt:16
#, no-wrap, priority:100
msgid ""
-"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
-"\t[<upstream> [<branch>]]\n"
+"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>]\n"
+"\t[--onto <newbase> | --keep-base] [<upstream> [<branch>]]\n"
"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
"\t--root [<branch>]\n"
"'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch)\n"
@@ -37846,512 +38129,542 @@ msgstr ""
msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:220
+#, ignore-same, no-wrap, priority:100
+msgid "--keep-base"
+msgstr "--keep-base"
+
#. type: Plain text
-#: en/git-rebase.txt:224
+#: en/git-rebase.txt:225
+#, ignore-ellipsis, priority:100
+msgid "Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running 'git rebase --keep-base <upstream> <branch>' is equivalent to running 'git rebase --onto <upstream>... <upstream>'."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:230
+#, priority:100
+msgid "This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:235
+#, priority:100
+msgid "Although both this option and --fork-point find the merge base between <upstream> and <branch>, this option uses the merge base as the _starting point_ on which new commits will be created, whereas --fork-point uses the merge base to determine the _set of commits_ which will be rebased."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#, priority:100
+msgid "See also INCOMPATIBLE OPTIONS below."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:242
#, priority:100
msgid "Upstream branch to compare against. May be any valid commit, not just an existing branch name. Defaults to the configured upstream for the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:230
+#: en/git-rebase.txt:248
#, priority:100
msgid "Restart the rebasing process after having resolved a merge conflict."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237
+#: en/git-rebase.txt:255
#, priority:100
msgid "Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:242
+#: en/git-rebase.txt:260
#, priority:100
msgid "Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:243 en/git-rebase.txt:538
+#: en/git-rebase.txt:261 en/git-rebase.txt:560
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:246
+#: en/git-rebase.txt:264
#, priority:100
msgid "Keep the commits that do not change anything from its parents in the result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:248 en/git-rebase.txt:255 en/git-rebase.txt:280 en/git-rebase.txt:293 en/git-rebase.txt:302 en/git-rebase.txt:344 en/git-rebase.txt:379 en/git-rebase.txt:386 en/git-rebase.txt:393 en/git-rebase.txt:405 en/git-rebase.txt:445 en/git-rebase.txt:470 en/git-rebase.txt:482 en/git-rebase.txt:501
-#, priority:100
-msgid "See also INCOMPATIBLE OPTIONS below."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rebase.txt:253
+#: en/git-rebase.txt:271
#, priority:100
msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:258
+#: en/git-rebase.txt:276
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:259 en/git-rebase.txt:539
+#: en/git-rebase.txt:277 en/git-rebase.txt:561
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:261
+#: en/git-rebase.txt:279
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:266
+#: en/git-rebase.txt:284
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:272
+#: en/git-rebase.txt:290
#, priority:100
msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:278
+#: en/git-rebase.txt:296
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:286
+#: en/git-rebase.txt:304
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:291
+#: en/git-rebase.txt:309
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:294
+#: en/git-rebase.txt:312
#, fuzzy, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr "--strategy-option"
#. type: Labeled list
-#: en/git-rebase.txt:295
+#: en/git-rebase.txt:313
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:300
+#: en/git-rebase.txt:318
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:317
+#: en/git-rebase.txt:335
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:321
+#: en/git-rebase.txt:339
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:325
+#: en/git-rebase.txt:343
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:329
+#: en/git-rebase.txt:347
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:332
+#: en/git-rebase.txt:350
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:333 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:336
+#: en/git-rebase.txt:354
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:345 en/merge-options.txt:47
+#: en/git-rebase.txt:363 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:346
+#: en/git-rebase.txt:364
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:351
+#: en/git-rebase.txt:369
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:357
+#: en/git-rebase.txt:375
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:359
+#: en/git-rebase.txt:377
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:363
+#: en/git-rebase.txt:381
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:387
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:372
+#: en/git-rebase.txt:390
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:394
+#, priority:100
+msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:399
#, priority:100
msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:384
+#: en/git-rebase.txt:406
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:391
+#: en/git-rebase.txt:413
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:421
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:403
+#: en/git-rebase.txt:425
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:407
+#: en/git-rebase.txt:429
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:415
+#: en/git-rebase.txt:437
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:422
+#: en/git-rebase.txt:444
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:426
+#: en/git-rebase.txt:448
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges`, but in contrast to that option works well in interactive rebases: commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:430
+#: en/git-rebase.txt:452
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:432
+#: en/git-rebase.txt:454
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:434 en/git-rebase.txt:535 en/git-svn.txt:680
+#: en/git-rebase.txt:456 en/git-rebase.txt:557 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:439
+#: en/git-rebase.txt:461
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:443
+#: en/git-rebase.txt:465
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:446
+#: en/git-rebase.txt:468
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:447
+#: en/git-rebase.txt:469
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:474
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:455
+#: en/git-rebase.txt:477
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:457
+#: en/git-rebase.txt:479
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:459
+#: en/git-rebase.txt:481
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:483
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:487
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:490
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:480
+#: en/git-rebase.txt:502
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:505
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:484
+#: en/git-rebase.txt:506
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:495
+#: en/git-rebase.txt:517
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:499
+#: en/git-rebase.txt:521
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:509
+#: en/git-rebase.txt:531
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:510
+#: en/git-rebase.txt:532
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:511
+#: en/git-rebase.txt:533
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:514
+#: en/git-rebase.txt:536
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:516
+#: en/git-rebase.txt:538
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:519
+#: en/git-rebase.txt:541
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:523
+#: en/git-rebase.txt:545
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:527
+#: en/git-rebase.txt:549
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:530
+#: en/git-rebase.txt:552
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:553
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:555
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Plain text
-#: en/git-rebase.txt:534
+#: en/git-rebase.txt:556
#, ignore-same, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:537
+#: en/git-rebase.txt:559
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:540
+#: en/git-rebase.txt:562
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:542
+#: en/git-rebase.txt:564
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:544
+#: en/git-rebase.txt:566
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:567
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:546
+#: en/git-rebase.txt:568
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:547
+#: en/git-rebase.txt:569
#, priority:100
-msgid "--rebase-merges and --strategy"
+msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:548
+#: en/git-rebase.txt:570
#, priority:100
-msgid "--rebase-merges and --strategy-option"
+msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:550
+#: en/git-rebase.txt:572
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:575
#, no-wrap, priority:100
msgid "There are some subtle differences how the backends behave.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:556
+#: en/git-rebase.txt:578
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38359,7 +38672,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:561
+#: en/git-rebase.txt:583
#, no-wrap, priority:100
msgid ""
"The am backend drops any \"empty\" commits, regardless of whether the\n"
@@ -38369,7 +38682,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:588
#, no-wrap, priority:100
msgid ""
"The interactive backend drops commits by default that\n"
@@ -38379,7 +38692,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:591
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38387,7 +38700,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:573
+#: en/git-rebase.txt:595
#, no-wrap, priority:100
msgid ""
"Directory rename heuristics are enabled in the merge and interactive\n"
@@ -38396,145 +38709,145 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:597
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:577
+#: en/git-rebase.txt:599
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:582
+#: en/git-rebase.txt:604
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:587
+#: en/git-rebase.txt:609
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:589
+#: en/git-rebase.txt:611
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:596
+#: en/git-rebase.txt:618
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:598
+#: en/git-rebase.txt:620
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:600
+#: en/git-rebase.txt:622
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:601
+#: en/git-rebase.txt:623
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:602
+#: en/git-rebase.txt:624
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:603
+#: en/git-rebase.txt:625
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:605
+#: en/git-rebase.txt:627
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:607
+#: en/git-rebase.txt:629
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:631
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:610
+#: en/git-rebase.txt:632
#, fuzzy, priority:100
msgid "commit"
msgstr "`commit`"
#. type: Plain text
-#: en/git-rebase.txt:612
+#: en/git-rebase.txt:634
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:614
+#: en/git-rebase.txt:636
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:615
+#: en/git-rebase.txt:637
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:616
+#: en/git-rebase.txt:638
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:644
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:646
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:626
+#: en/git-rebase.txt:648
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:653
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:658
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -38543,73 +38856,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:641
+#: en/git-rebase.txt:663
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:668
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:649
+#: en/git-rebase.txt:671
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:652
+#: en/git-rebase.txt:674
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:655
+#: en/git-rebase.txt:677
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:685
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:667
+#: en/git-rebase.txt:689
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:693
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:696
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:699
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:680
+#: en/git-rebase.txt:702
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:687
+#: en/git-rebase.txt:709
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -38620,25 +38933,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:691
+#: en/git-rebase.txt:713
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:694
+#: en/git-rebase.txt:716
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:701
+#: en/git-rebase.txt:723
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:710
+#: en/git-rebase.txt:732
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -38651,31 +38964,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:715
+#: en/git-rebase.txt:737
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:720
+#: en/git-rebase.txt:742
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:745
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:727
+#: en/git-rebase.txt:749
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:759
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -38689,85 +39002,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:740
+#: en/git-rebase.txt:762
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:746
+#: en/git-rebase.txt:768
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:750
+#: en/git-rebase.txt:772
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:752
+#: en/git-rebase.txt:774
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:756
+#: en/git-rebase.txt:778
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:760
+#: en/git-rebase.txt:782
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:763
+#: en/git-rebase.txt:785
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:765
+#: en/git-rebase.txt:787
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:767
+#: en/git-rebase.txt:789
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:794
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:775
+#: en/git-rebase.txt:797
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:804
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:809
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:816
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38778,13 +39091,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:819
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:826
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38795,13 +39108,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:808
+#: en/git-rebase.txt:830
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:815
+#: en/git-rebase.txt:837
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38812,73 +39125,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:822
+#: en/git-rebase.txt:844
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:824
+#: en/git-rebase.txt:846
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:825
+#: en/git-rebase.txt:847
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:829
+#: en/git-rebase.txt:851
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:836
+#: en/git-rebase.txt:859
#, priority:100
-msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or `filter-branch`."
+msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:839
+#: en/git-rebase.txt:862
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:867
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:848
+#: en/git-rebase.txt:871
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:850
+#: en/git-rebase.txt:873
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:875
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:858
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38889,19 +39202,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:885
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:866
+#: en/git-rebase.txt:889
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:894
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -38911,67 +39224,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:876
+#: en/git-rebase.txt:899
#, priority:100
-msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge-base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
+msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:880
+#: en/git-rebase.txt:903
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:883
+#: en/git-rebase.txt:906
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:886
+#: en/git-rebase.txt:909
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:888
+#: en/git-rebase.txt:911
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:893
+#: en/git-rebase.txt:916
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:895
+#: en/git-rebase.txt:918
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:926
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:907
+#: en/git-rebase.txt:930
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:912
+#: en/git-rebase.txt:935
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:922
+#: en/git-rebase.txt:945
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -38985,25 +39298,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:929
+#: en/git-rebase.txt:952
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:932
+#: en/git-rebase.txt:955
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:935 en/git-rebase.txt:1012
+#: en/git-rebase.txt:958 en/git-rebase.txt:1035
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:941
+#: en/git-rebase.txt:964
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39014,7 +39327,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:946
+#: en/git-rebase.txt:969
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39024,7 +39337,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:950
+#: en/git-rebase.txt:973
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39033,55 +39346,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:954
+#: en/git-rebase.txt:977
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:962
+#: en/git-rebase.txt:985
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:992
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:975
+#: en/git-rebase.txt:998
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:978
+#: en/git-rebase.txt:1001
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1008
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:989
+#: en/git-rebase.txt:1012
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:996
+#: en/git-rebase.txt:1019
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1003
+#: en/git-rebase.txt:1026
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39092,13 +39405,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1009
+#: en/git-rebase.txt:1032
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1015
+#: en/git-rebase.txt:1038
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39106,7 +39419,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1022
+#: en/git-rebase.txt:1045
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39118,7 +39431,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1049
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39127,37 +39440,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1035
+#: en/git-rebase.txt:1058
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1037
+#: en/git-rebase.txt:1060
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1039
+#: en/git-rebase.txt:1062
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1043
+#: en/git-rebase.txt:1066
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1068
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1072
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -39465,117 +39778,117 @@ msgstr ""
msgid "Using this hook, it is easy to generate mails describing the updates to the repository. This example script sends one mail message per ref listing the commits pushed to the repository, and logs the push certificates of signed pushes with good signatures to a logger service:"
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:191
+#. type: delimited block -
+#: en/git-receive-pack.txt:192
#, no-wrap, priority:100
msgid ""
-"\t#!/bin/sh\n"
-"\t# mail out commit update information.\n"
-"\twhile read oval nval ref\n"
-"\tdo\n"
-"\t\tif expr \"$oval\" : '0*$' >/dev/null\n"
-"\t\tthen\n"
-"\t\t\techo \"Created a new ref, with the following commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\"\n"
-"\t\telse\n"
-"\t\t\techo \"New commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
-"\t\tfi |\n"
-"\t\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
-"\tdone\n"
-"\t# log signed push certificate, if any\n"
-"\tif test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"#!/bin/sh\n"
+"# mail out commit update information.\n"
+"while read oval nval ref\n"
+"do\n"
+"\tif expr \"$oval\" : '0*$' >/dev/null\n"
"\tthen\n"
-"\t\t(\n"
-"\t\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
-"\t\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
-"\t\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
-"\tfi\n"
-"\texit 0\n"
+"\t\techo \"Created a new ref, with the following commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\"\n"
+"\telse\n"
+"\t\techo \"New commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
+"\tfi |\n"
+"\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
+"done\n"
+"# log signed push certificate, if any\n"
+"if test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"then\n"
+"\t(\n"
+"\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
+"\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
+"\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
+"fi\n"
+"exit 0\n"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:194
+#: en/git-receive-pack.txt:196
#, priority:100
msgid "The exit code from this hook invocation is ignored, however a non-zero exit code will generate an error message."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:200
+#: en/git-receive-pack.txt:202
#, priority:100
msgid "Note that it is possible for refname to not have sha1-new when this hook runs. This can easily occur if another user modifies the ref after it was updated by 'git-receive-pack', but before the hook was able to evaluate it. It is recommended that hooks rely on sha1-new rather than the current value of refname."
msgstr ""
#. type: Title -
-#: en/git-receive-pack.txt:202
+#: en/git-receive-pack.txt:204
#, no-wrap, priority:100
msgid "POST-UPDATE HOOK"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:207
+#: en/git-receive-pack.txt:209
#, priority:100
msgid "After all other processing, if at least one ref was updated, and if $GIT_DIR/hooks/post-update file exists and is executable, then post-update will be called with the list of refs that have been updated. This can be used to implement any repository wide cleanup tasks."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:211
+#: en/git-receive-pack.txt:213
#, priority:100
msgid "The exit code from this hook invocation is ignored; the only thing left for 'git-receive-pack' to do at that point is to exit itself anyway."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:214
+#: en/git-receive-pack.txt:216
#, priority:100
msgid "This hook can be used, for example, to run `git update-server-info` if the repository is packed and is served via a dumb transport."
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:217
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/git-receive-pack.txt:220
+#, fuzzy, no-wrap, priority:100
msgid ""
-"\t#!/bin/sh\n"
-"\texec git update-server-info\n"
-msgstr ""
+"#!/bin/sh\n"
+"exec git update-server-info\n"
+msgstr "git-update-server-info(1)"
#. type: Title -
-#: en/git-receive-pack.txt:220
+#: en/git-receive-pack.txt:224
#, no-wrap, priority:100
msgid "QUARANTINE ENVIRONMENT"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:227
+#: en/git-receive-pack.txt:231
#, priority:100
msgid "When `receive-pack` takes in objects, they are placed into a temporary \"quarantine\" directory within the `$GIT_DIR/objects` directory and migrated into the main object store only after the `pre-receive` hook has completed. If the push fails before then, the temporary directory is removed entirely."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:229
+#: en/git-receive-pack.txt:233
#, priority:100
msgid "This has a few user-visible effects and caveats:"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:235
+#: en/git-receive-pack.txt:239
#, priority:100
msgid "Pushes which fail due to problems with the incoming pack, missing objects, or due to the `pre-receive` hook will not leave any on-disk data. This is usually helpful to prevent repeated failed pushes from filling up your disk, but can make debugging more challenging."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:238
+#: en/git-receive-pack.txt:242
#, priority:100
msgid "Any objects created by the `pre-receive` hook will be created in the quarantine directory (and migrated only if it succeeds)."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:244
+#: en/git-receive-pack.txt:248
#, priority:100
msgid "The `pre-receive` hook MUST NOT update any refs to point to quarantined objects. Other programs accessing the repository will not be able to see the objects (and if the pre-receive hook fails, those refs would become corrupted). For safety, any ref updates from within `pre-receive` are automatically rejected."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:249
+#: en/git-receive-pack.txt:253
#, ignore-same, priority:100
msgid "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
msgstr "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
@@ -40903,7 +41216,7 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:131
#, priority:100
-msgid "linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and linkgit:git-rebase[1], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
+msgid "linkgit:git-hash-object[1], linkgit:git-rebase[1], and https://github.com/newren/git-filter-repo[git-filter-repo], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
msgstr ""
#. type: Plain text
@@ -40926,9 +41239,10 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:158
-#, priority:100
-msgid "linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1]"
-msgstr ""
+#, fuzzy, priority:100
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] https://github.com/newren/git-filter-repo[git-filter-repo]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title =
#: en/git-request-pull.txt:2
@@ -41720,7 +42034,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:228 en/git-stash.txt:229
+#: en/git-reset.txt:228 en/git-stash.txt:230
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -42447,102 +42761,49 @@ msgid "git-rev-list - Lists commit objects in reverse chronological order"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:65
+#: en/git-rev-list.txt:13
#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"'git rev-list' [ --max-count=<number> ]\n"
-"\t [ --skip=<number> ]\n"
-"\t [ --max-age=<timestamp> ]\n"
-"\t [ --min-age=<timestamp> ]\n"
-"\t [ --sparse ]\n"
-"\t [ --merges ]\n"
-"\t [ --no-merges ]\n"
-"\t [ --min-parents=<number> ]\n"
-"\t [ --no-min-parents ]\n"
-"\t [ --max-parents=<number> ]\n"
-"\t [ --no-max-parents ]\n"
-"\t [ --first-parent ]\n"
-"\t [ --remove-empty ]\n"
-"\t [ --full-history ]\n"
-"\t [ --not ]\n"
-"\t [ --all ]\n"
-"\t [ --branches[=<pattern>] ]\n"
-"\t [ --tags[=<pattern>] ]\n"
-"\t [ --remotes[=<pattern>] ]\n"
-"\t [ --glob=<glob-pattern> ]\n"
-"\t [ --ignore-missing ]\n"
-"\t [ --stdin ]\n"
-"\t [ --quiet ]\n"
-"\t [ --topo-order ]\n"
-"\t [ --parents ]\n"
-"\t [ --timestamp ]\n"
-"\t [ --left-right ]\n"
-"\t [ --left-only ]\n"
-"\t [ --right-only ]\n"
-"\t [ --cherry-mark ]\n"
-"\t [ --cherry-pick ]\n"
-"\t [ --encoding=<encoding> ]\n"
-"\t [ --(author|committer|grep)=<pattern> ]\n"
-"\t [ --regexp-ignore-case | -i ]\n"
-"\t [ --extended-regexp | -E ]\n"
-"\t [ --fixed-strings | -F ]\n"
-"\t [ --date=<format>]\n"
-"\t [ [ --objects | --objects-edge | --objects-edge-aggressive ]\n"
-"\t [ --unpacked ]\n"
-"\t [ --object-names | --no-object-names ]\n"
-"\t [ --filter=<filter-spec> [ --filter-print-omitted ] ] ]\n"
-"\t [ --missing=<missing-action> ]\n"
-"\t [ --pretty | --header ]\n"
-"\t [ --bisect ]\n"
-"\t [ --bisect-vars ]\n"
-"\t [ --bisect-all ]\n"
-"\t [ --merge ]\n"
-"\t [ --reverse ]\n"
-"\t [ --walk-reflogs ]\n"
-"\t [ --no-walk ] [ --do-walk ]\n"
-"\t [ --count ]\n"
-"\t [ --use-bitmap-index ]\n"
-"\t <commit>... [ \\-- <paths>... ]\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:73
+msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rev-list.txt:21
#, priority:100
msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:80
+#: en/git-rev-list.txt:28
#, priority:100
msgid "You can think of this as a set operation. Commits given on the command line form a set of commits that are reachable from any of them, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:82
+#: en/git-rev-list.txt:30
#, priority:100
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:85
+#: en/git-rev-list.txt:33
#, no-wrap, priority:100
msgid "\t$ git rev-list foo bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:89
+#: en/git-rev-list.txt:37
#, priority:100
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:93
+#: en/git-rev-list.txt:41
#, priority:100
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:97
+#: en/git-rev-list.txt:45
#, no-wrap, priority:100
msgid ""
"\t$ git rev-list origin..HEAD\n"
@@ -42550,13 +42811,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:102
+#: en/git-rev-list.txt:50
#, ignore-ellipsis, priority:100
msgid "Another special notation is \"'<commit1>'...'<commit2>'\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:106
+#: en/git-rev-list.txt:54
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git rev-list A B --not $(git merge-base --all A B)\n"
@@ -42564,7 +42825,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:113
+#: en/git-rev-list.txt:61
#, priority:100
msgid "'rev-list' is a very essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For this reason, it has a lot of different options that enables it to be used by commands as different as 'git bisect' and 'git repack'."
msgstr ""
@@ -44686,31 +44947,31 @@ msgstr ""
msgid "To use 'git send-email' to send your patches through the GMail SMTP server, edit ~/.gitconfig to specify your account settings:"
msgstr ""
-#. type: Plain text
-#: en/git-send-email.txt:494
+#. type: delimited block -
+#: en/git-send-email.txt:495
#, no-wrap, priority:100
msgid ""
-"\t[sendemail]\n"
-"\t\tsmtpEncryption = tls\n"
-"\t\tsmtpServer = smtp.gmail.com\n"
-"\t\tsmtpUser = yourname@gmail.com\n"
-"\t\tsmtpServerPort = 587\n"
+"[sendemail]\n"
+"\tsmtpEncryption = tls\n"
+"\tsmtpServer = smtp.gmail.com\n"
+"\tsmtpUser = yourname@gmail.com\n"
+"\tsmtpServerPort = 587\n"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:498
+#: en/git-send-email.txt:500
#, priority:100
msgid "If you have multifactor authentication setup on your gmail account, you will need to generate an app-specific password for use with 'git send-email'. Visit https://security.google.com/settings/security/apppasswords to create it."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:501
+#: en/git-send-email.txt:503
#, priority:100
msgid "Once your commits are ready to be sent to the mailing list, run the following commands:"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:505
+#: en/git-send-email.txt:507
#, no-wrap, priority:100
msgid ""
"\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -44719,19 +44980,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:510
+#: en/git-send-email.txt:512
#, priority:100
msgid "The first time you run it, you will be prompted for your credentials. Enter the app-specific or your regular password as appropriate. If you have credential helper configured (see linkgit:git-credential[1]), the password will be saved in the credential store so you won't have to type it the next time."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:518
#, priority:100
msgid "Note: the following core Perl modules that may be installed with your distribution of Perl are required: MIME::Base64, MIME::QuotedPrint, Net::Domain and Net::SMTP. These additional Perl modules are also required: Authen::SASL and Mail::Address."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:521
+#: en/git-send-email.txt:523
#, priority:100
msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
msgstr ""
@@ -46320,25 +46581,25 @@ msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--a
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:92
+#: en/git-stash.txt:93
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs, and any non-option arguments form the message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:93
+#: en/git-stash.txt:94
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:100
+#: en/git-stash.txt:101
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:104
+#: en/git-stash.txt:105
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46346,139 +46607,139 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:108
+#: en/git-stash.txt:109
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:109
+#: en/git-stash.txt:110
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:119
+#: en/git-stash.txt:120
#, priority:240
msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:120
+#: en/git-stash.txt:121
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:126
+#: en/git-stash.txt:127
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:130
+#: en/git-stash.txt:131
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:135
+#: en/git-stash.txt:136
#, priority:240
msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:138
+#: en/git-stash.txt:139
#, priority:240
msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:139
+#: en/git-stash.txt:140
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:145
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:145
+#: en/git-stash.txt:146
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:153
+#: en/git-stash.txt:154
#, priority:240
msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:159
+#: en/git-stash.txt:160
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:160
+#: en/git-stash.txt:161
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:164
+#: en/git-stash.txt:165
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:165
+#: en/git-stash.txt:166
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:171
+#: en/git-stash.txt:172
#, priority:240
msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:172 en/git-update-ref.txt:100
+#: en/git-stash.txt:173 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:179
+#: en/git-stash.txt:180
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:180
+#: en/git-stash.txt:181
#, no-wrap, priority:240
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:186
+#: en/git-stash.txt:187
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:195
+#: en/git-stash.txt:196
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:199
+#: en/git-stash.txt:200
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46487,31 +46748,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:203
+#: en/git-stash.txt:204
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:208
+#: en/git-stash.txt:209
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:214
+#: en/git-stash.txt:215
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:219
+#: en/git-stash.txt:220
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:227
+#: en/git-stash.txt:228
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -46523,13 +46784,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:235
+#: en/git-stash.txt:236
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:246
+#: en/git-stash.txt:247
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46544,13 +46805,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:249
+#: en/git-stash.txt:250
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:257
+#: en/git-stash.txt:258
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46562,19 +46823,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:259
+#: en/git-stash.txt:260
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:264
+#: en/git-stash.txt:265
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:275
+#: en/git-stash.txt:276
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46589,19 +46850,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:277
+#: en/git-stash.txt:278
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:283
+#: en/git-stash.txt:284
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:288
+#: en/git-stash.txt:289
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -46610,7 +46871,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:298
+#: en/git-stash.txt:299
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -46688,61 +46949,61 @@ msgid "In addition to the names of files that have been changed, also show the t
msgstr ""
#. type: Plain text
-#: en/git-status.txt:65
+#: en/git-status.txt:66
#, priority:280
msgid "The mode parameter is used to specify the handling of untracked files. It is optional: it defaults to 'all', and if specified, it must be stuck to the option (e.g. `-uno`, but not `-u no`)."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:69
+#: en/git-status.txt:70
#, no-wrap, priority:280
msgid "'no' - Show no untracked files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:70
+#: en/git-status.txt:71
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:81
+#: en/git-status.txt:82
#, priority:280
msgid "When `-u` option is not used, untracked files and directories are shown (i.e. the same as specifying `normal`), to help you avoid forgetting to add newly created files. Because it takes extra work to find untracked files in the filesystem, this mode may take some time in a large working tree. Consider enabling untracked cache and split index if supported (see `git update-index --untracked-cache` and `git update-index --split-index`), Otherwise you can use `no` to have `git status` return more quickly without showing untracked files."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:99
+#: en/git-status.txt:101
#, priority:280
msgid "Ignore changes to submodules when looking for changes. <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 before 1.7.0). Using \"all\" hides all changes to submodules (and suppresses the output of submodule summaries when the config option `status.submoduleSummary` is set)."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:100
+#: en/git-status.txt:102
#, no-wrap, priority:280
msgid "--ignored[=<mode>]"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:102
+#: en/git-status.txt:104
#, priority:280
msgid "Show ignored files as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:105
+#: en/git-status.txt:108
#, priority:280
msgid "The mode parameter is used to specify the handling of ignored files. It is optional: it defaults to 'traditional'."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:109
+#: en/git-status.txt:112
#, priority:280
msgid "'traditional' - Shows ignored files and directories, unless"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:112
+#: en/git-status.txt:115
#, no-wrap, priority:280
msgid ""
"--untracked-files=all is specified, in which case\n"
@@ -46751,109 +47012,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:113
+#: en/git-status.txt:116
#, no-wrap, priority:280
msgid "'no'\t - Show no ignored files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:114
+#: en/git-status.txt:117
#, no-wrap, priority:280
msgid "'matching' - Shows ignored files and directories matching an\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:115
+#: en/git-status.txt:118
#, no-wrap, priority:280
msgid "ignore pattern.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:121
+#: en/git-status.txt:124
#, priority:280
msgid "When 'matching' mode is specified, paths that explicitly match an ignored pattern are shown. If a directory matches an ignore pattern, then it is shown, but not paths contained in the ignored directory. If a directory does not match an ignore pattern, but all contents are ignored, then the directory is not shown, but all contents are shown."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:125
+#: en/git-status.txt:129
#, priority:280
msgid "Terminate entries with NUL, instead of LF. This implies the `--porcelain=v1` output format if no other format is given."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:132
+#: en/git-status.txt:136
#, priority:280
msgid "Display untracked files in columns. See configuration variable column.status for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:133
+#: en/git-status.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--ahead-behind"
msgstr "--ahead-behind"
#. type: Labeled list
-#: en/git-status.txt:134
+#: en/git-status.txt:138
#, ignore-same, no-wrap, priority:280
msgid "--no-ahead-behind"
msgstr "--no-ahead-behind"
#. type: Plain text
-#: en/git-status.txt:137
+#: en/git-status.txt:141
#, priority:280
msgid "Display or do not display detailed ahead/behind counts for the branch relative to its upstream branch. Defaults to true."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:138
+#: en/git-status.txt:142
#, ignore-same, no-wrap, priority:280
msgid "--renames"
msgstr "--renames"
#. type: Plain text
-#: en/git-status.txt:142
+#: en/git-status.txt:146
#, priority:280
msgid "Turn on/off rename detection regardless of user configuration. See also linkgit:git-diff[1] `--no-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:147
+#: en/git-status.txt:151
#, priority:280
msgid "Turn on rename detection, optionally setting the similarity threshold. See also linkgit:git-diff[1] `--find-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:150
+#: en/git-status.txt:154
#, priority:280
msgid "See the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:158
+#: en/git-status.txt:162
#, priority:280
msgid "The output from this command is designed to be used as a commit template comment. The default, long format, is designed to be human readable, verbose and descriptive. Its contents and format are subject to change at any time."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:163
+#: en/git-status.txt:167
#, priority:280
msgid "The paths mentioned in the output, unlike many other Git commands, are made relative to the current directory if you are working in a subdirectory (this is on purpose, to help cutting and pasting). See the status.relativePaths config option below."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:165
+#: en/git-status.txt:169
#, no-wrap, priority:280
msgid "Short Format"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:169
+#: en/git-status.txt:173
#, priority:280
msgid "In the short-format, the status of each path is shown as one of these forms"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:172
+#: en/git-status.txt:176
#, no-wrap, priority:280
msgid ""
"\tXY PATH\n"
@@ -46861,73 +47122,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:176
+#: en/git-status.txt:180
#, priority:280
msgid "where `ORIG_PATH` is where the renamed/copied contents came from. `ORIG_PATH` is only shown when the entry is renamed or copied. The `XY` is a two-letter status code."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:182
+#: en/git-status.txt:186
#, priority:280
msgid "The fields (including the `->`) are separated from each other by a single space. If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash-escaped."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:188
+#: en/git-status.txt:192
#, priority:280
msgid "For paths with merge conflicts, `X` and `Y` show the modification states of each side of the merge. For paths that do not have merge conflicts, `X` shows the status of the index, and `Y` shows the status of the work tree. For untracked paths, `XY` are `??`. Other status codes can be interpreted as follows:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:190
+#: en/git-status.txt:194
#, priority:280
msgid "' ' = unmodified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:191
+#: en/git-status.txt:195
#, priority:280
msgid "'M' = modified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:192
+#: en/git-status.txt:196
#, priority:280
msgid "'A' = added"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:193
+#: en/git-status.txt:197
#, priority:280
msgid "'D' = deleted"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:194
+#: en/git-status.txt:198
#, priority:280
msgid "'R' = renamed"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:195
+#: en/git-status.txt:199
#, priority:280
msgid "'C' = copied"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:196
+#: en/git-status.txt:200
#, priority:280
msgid "'U' = updated but unmerged"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:199
+#: en/git-status.txt:203
#, priority:280
msgid "Ignored files are not listed, unless `--ignored` option is in effect, in which case `XY` are `!!`."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:226
+#: en/git-status.txt:230
#, no-wrap, priority:280
msgid ""
"X Y Meaning\n"
@@ -46958,7 +47219,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:235
+#: en/git-status.txt:239
#, no-wrap, priority:280
msgid ""
"Submodules have more state and instead report\n"
@@ -46971,91 +47232,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:238
+#: en/git-status.txt:242
#, priority:280
msgid "'m' and '?' are applied recursively. For example if a nested submodule in a submodule contains an untracked file, this is reported as '?' as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:240
+#: en/git-status.txt:244
#, priority:280
msgid "If -b is used the short-format status is preceded by a line"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:242
+#: en/git-status.txt:246
#, no-wrap, priority:280
msgid " ## branchname tracking info\n"
msgstr ""
#. type: Title ~
-#: en/git-status.txt:244
+#: en/git-status.txt:248
#, no-wrap, priority:280
msgid "Porcelain Format Version 1"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:251
+#: en/git-status.txt:255
#, priority:280
msgid "Version 1 porcelain format is similar to the short format, but is guaranteed not to change in a backwards-incompatible way between Git versions or based on user configuration. This makes it ideal for parsing by scripts. The description of the short format above also describes the porcelain format, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:254
+#: en/git-status.txt:258
#, priority:280
msgid "The user's color.status configuration is not respected; color will always be off."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:257
+#: en/git-status.txt:261
#, priority:280
msgid "The user's status.relativePaths configuration is not respected; paths shown will always be relative to the repository root."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:267
+#: en/git-status.txt:271
#, priority:280
msgid "There is also an alternate -z format recommended for machine parsing. In that format, the status field is the same, but some other things change. First, the '\\->' is omitted from rename entries and the field order is reversed (e.g 'from \\-> to' becomes 'to from'). Second, a NUL (ASCII 0) follows each filename, replacing space as a field separator and the terminating newline (but a space still separates the status field from the first filename). Third, filenames containing special characters are not specially formatted; no quoting or backslash-escaping is performed."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:269
+#: en/git-status.txt:273
#, priority:280
msgid "Any submodule changes are reported as modified `M` instead of `m` or single `?`."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:271
+#: en/git-status.txt:275
#, no-wrap, priority:280
msgid "Porcelain Format Version 2"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:276
+#: en/git-status.txt:280
#, priority:280
msgid "Version 2 format adds more detailed information about the state of the worktree and changed items. Version 2 also defines an extensible set of easy to parse optional headers."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:280
+#: en/git-status.txt:284
#, priority:280
msgid "Header lines start with \"#\" and are added in response to specific command line arguments. Parsers should ignore headers they don't recognize."
msgstr ""
#. type: Title ^
-#: en/git-status.txt:282
+#: en/git-status.txt:286
#, no-wrap, priority:280
msgid "Branch Headers"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:286
+#: en/git-status.txt:290
#, priority:280
msgid "If `--branch` is given, a series of header lines are printed with information about the current branch."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:296
+#: en/git-status.txt:300
#, no-wrap, priority:280
msgid ""
"Line Notes\n"
@@ -47069,43 +47330,43 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:299
+#: en/git-status.txt:303
#, no-wrap, priority:280
msgid "Changed Tracked Entries"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:306
+#: en/git-status.txt:310
#, priority:280
msgid "Following the headers, a series of lines are printed for tracked entries. One of three different line formats may be used to describe an entry depending on the type of change. Tracked entries are printed in an undefined order; parsers should allow for a mixture of the 3 line types in any order."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:308
+#: en/git-status.txt:312
#, priority:280
msgid "Ordinary changed entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:310
+#: en/git-status.txt:314
#, no-wrap, priority:280
msgid " 1 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:312
+#: en/git-status.txt:316
#, priority:280
msgid "Renamed or copied entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:314
+#: en/git-status.txt:318
#, no-wrap, priority:280
msgid " 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:345
+#: en/git-status.txt:349
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47140,19 +47401,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:349
+#: en/git-status.txt:353
#, priority:280
msgid "Unmerged entries have the following format; the first character is a \"u\" to distinguish from ordinary changed entries."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:351
+#: en/git-status.txt:355
#, no-wrap, priority:280
msgid " u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:368
+#: en/git-status.txt:372
#, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47173,85 +47434,85 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:371
+#: en/git-status.txt:375
#, no-wrap, priority:280
msgid "Other Items"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:376
+#: en/git-status.txt:380
#, priority:280
msgid "Following the tracked entries (and if requested), a series of lines will be printed for untracked and then ignored items found in the worktree."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:378
+#: en/git-status.txt:382
#, priority:280
msgid "Untracked items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:380
+#: en/git-status.txt:384
#, no-wrap, priority:280
msgid " ? <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:382
+#: en/git-status.txt:386
#, priority:280
msgid "Ignored items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:384
+#: en/git-status.txt:388
#, no-wrap, priority:280
msgid " ! <path>\n"
msgstr ""
#. type: Title ^
-#: en/git-status.txt:386
+#: en/git-status.txt:390
#, no-wrap, priority:280
msgid "Pathname Format Notes and -z"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:391
+#: en/git-status.txt:395
#, priority:280
msgid "When the `-z` option is given, pathnames are printed as is and without any quoting and lines are terminated with a NUL (ASCII 0x00) byte."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:395
+#: en/git-status.txt:399
#, 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])."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:404
+#: en/git-status.txt:408
#, priority:280
msgid "The command honors `color.status` (or `status.color` -- they mean the same thing and the latter is kept for backward compatibility) and `color.status.<slot>` configuration variables to colorize its output."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:408
+#: en/git-status.txt:412
#, priority:280
msgid "If the config variable `status.relativePaths` is set to false, then all paths shown are relative to the repository root, not to the current directory."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:419
+#: en/git-status.txt:423
#, priority:280
msgid "If `status.submoduleSummary` is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). Please note that the summary output from the status command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings."
msgstr ""
#. type: Title -
-#: en/git-status.txt:421
+#: en/git-status.txt:425
#, no-wrap, priority:280
msgid "BACKGROUND REFRESH"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:432
+#: en/git-status.txt:436
#, priority:280
msgid "By default, `git status` will automatically refresh the index, updating the cached stat information from the working tree and writing out the result. Writing out the updated index is an optimization that isn't strictly necessary (`status` computes the values for itself, but writing them out is just to save subsequent programs from repeating our computation). When `status` is run in the background, the lock held during the write may conflict with other simultaneous processes, causing them to fail. Scripts running `status` in the background should consider using `git --no-optional-locks status` (see linkgit:git[1] for details)."
msgstr ""
@@ -47695,281 +47956,287 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:176
#, no-wrap, priority:220
-msgid "set-branch ((-d|--default)|(-b|--branch <branch>)) [--] <path>"
+msgid "set-branch (-b|--branch) <branch> [--] <path>"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-submodule.txt:177
+#, no-wrap, priority:220
+msgid "set-branch (-d|--default) [--] <path>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:181
+#: en/git-submodule.txt:182
#, priority:220
msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:182
+#: en/git-submodule.txt:183
#, ignore-ellipsis, no-wrap, priority:220
msgid "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:191
+#: en/git-submodule.txt:192
#, priority:220
msgid "Show commit summary between the given commit (defaults to HEAD) and working tree/index. For a submodule in question, a series of commits in the submodule between the given super project commit and the index or working tree (switched by `--cached`) are shown. If the option `--files` is given, show the series of commits in the submodule between the index of the super project and the working tree of the submodule (this option doesn't allow to use the `--cached` option or to provide an explicit commit)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:194
+#: en/git-submodule.txt:195
#, priority:220
msgid "Using the `--submodule=log` option with linkgit:git-diff[1] will provide that information too."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:195
+#: en/git-submodule.txt:196
#, no-wrap, priority:220
msgid "foreach [--recursive] <command>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:216
+#: en/git-submodule.txt:217
#, priority:220
msgid "Evaluates an arbitrary shell command in each checked out submodule. The command has access to the variables $name, $sm_path, $displaypath, $sha1 and $toplevel: $name is the name of the relevant submodule section in `.gitmodules`, $sm_path is the path of the submodule as recorded in the immediate superproject, $displaypath contains the relative path from the current working directory to the submodules root directory, $sha1 is the commit as recorded in the immediate superproject, and $toplevel is the absolute path to the top-level of the immediate superproject. Note that to avoid conflicts with '$PATH' on Windows, the '$path' variable is now a deprecated synonym of '$sm_path' variable. Any submodules defined in the superproject but not checked out are ignored by this command. Unless given `--quiet`, foreach prints the name of each submodule before evaluating the command. If `--recursive` is given, submodules are traversed recursively (i.e. the given shell command is evaluated in nested submodules as well). A non-zero return from the command in any submodule causes the processing to terminate. This can be overridden by adding '|| :' to the end of the command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:219
+#: en/git-submodule.txt:220
#, priority:220
msgid "As an example, the command below will show the path and currently checked out commit for each submodule:"
msgstr ""
#. type: delimited block -
-#: en/git-submodule.txt:222
+#: en/git-submodule.txt:223
#, no-wrap, priority:220
msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:224
+#: en/git-submodule.txt:225
#, ignore-ellipsis, no-wrap, priority:220
msgid "sync [--recursive] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:231
+#: en/git-submodule.txt:232
#, priority:220
msgid "Synchronizes submodules' remote URL configuration setting to the value specified in `.gitmodules`. It will only affect those submodules which already have a URL entry in .git/config (that is the case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:234
+#: en/git-submodule.txt:235
#, priority:220
msgid "`git submodule sync` synchronizes all submodules while `git submodule sync -- A` synchronizes submodule \"A\" only."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:237
+#: en/git-submodule.txt:238
#, priority:220
msgid "If `--recursive` is specified, this command will recurse into the registered submodules, and sync any nested submodules within."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:238
+#: en/git-submodule.txt:239
#, no-wrap, priority:220
msgid "absorbgitdirs"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:245
+#: en/git-submodule.txt:246
#, priority:220
msgid "If a git directory of a submodule is inside the submodule, move the git directory of the submodule into its superprojects `$GIT_DIR/modules` path and then connect the git directory and its working directory by setting the `core.worktree` and adding a .git file pointing to the git directory embedded in the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:249
+#: en/git-submodule.txt:250
#, priority:220
msgid "A repository that was cloned independently and later added as a submodule or old setups have the submodules git directory inside the submodule instead of embedded into the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:251
+#: en/git-submodule.txt:252
#, priority:220
msgid "This command is recursive by default."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:257
+#: en/git-submodule.txt:258
#, priority:220
msgid "Only print error messages."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:264
+#: en/git-submodule.txt:265
#, priority:220
msgid "This option is only valid for add and update commands. Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:268
+#: en/git-submodule.txt:269
#, priority:220
msgid "This option is only valid for the deinit command. Unregister all submodules in the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:269
+#: en/git-submodule.txt:270
#, no-wrap, priority:220
msgid "-b <branch>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:277
+#: en/git-submodule.txt:278
#, priority:220
msgid "Branch of repository to add as submodule. The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository. If the option is not specified, it defaults to 'master'."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:290
+#: en/git-submodule.txt:291
#, priority:220
msgid "This option is only valid for add, deinit and update commands. When running add, allow adding an otherwise ignored submodule path. When running deinit the submodule working trees will be removed even if they contain local changes. When running update (only effective with the checkout procedure), throw away local changes in submodules when switching to a different commit; and always run a checkout operation in the submodule, even if the commit listed in the index of the containing repository matches the commit checked out in the submodule."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:295
+#: en/git-submodule.txt:296
#, priority:220
msgid "This option is only valid for status and summary commands. These commands typically use the commit found in the submodule HEAD, but with this option, the commit stored in the index is used instead."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:296
+#: en/git-submodule.txt:297
#, ignore-same, no-wrap, priority:220
msgid "--files"
msgstr "--files"
#. type: Plain text
-#: en/git-submodule.txt:300
+#: en/git-submodule.txt:301
#, priority:220
msgid "This option is only valid for the summary command. This command compares the commit in the index with that in the submodule HEAD when this option is used."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:302
+#: en/git-submodule.txt:303
#, ignore-same, no-wrap, priority:220
msgid "--summary-limit"
msgstr "--summary-limit"
#. type: Plain text
-#: en/git-submodule.txt:308
+#: en/git-submodule.txt:309
#, priority:220
msgid "This option is only valid for the summary command. Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:309
+#: en/git-submodule.txt:310
#, ignore-same, no-wrap, priority:220
msgid "--remote"
msgstr "--remote"
#. type: Plain text
-#: en/git-submodule.txt:318
+#: en/git-submodule.txt:319
#, priority:220
msgid "This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:324
+#: en/git-submodule.txt:325
#, priority:220
msgid "This works for any of the supported update procedures (`--checkout`, `--rebase`, etc.). The only change is the source of the target SHA-1. For example, `submodule update --remote --merge` will merge upstream submodule changes into the submodules, while `submodule update --merge` will merge superproject gitlink changes into the submodules."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:329
+#: en/git-submodule.txt:330
#, priority:220
msgid "In order to ensure a current tracking branch state, `update --remote` fetches the submodule's remote repository before calculating the SHA-1. If you don't want to fetch, you should use `submodule update --remote --no-fetch`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:339
+#: en/git-submodule.txt:340
#, priority:220
msgid "Use this option to integrate changes from the upstream subproject with your submodule's current HEAD. Alternatively, you can run `git pull` from the submodule, which is equivalent except for the remote branch name: `update --remote` uses the default upstream repository and `submodule.<name>.branch`, while `git pull` uses the submodule's `branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want to distribute the default upstream branch with the superproject and `branch.<name>.merge` if you want a more native feel while working in the submodule itself."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:341
+#: en/git-submodule.txt:342
#, ignore-same, no-wrap, priority:220
msgid "--no-fetch"
msgstr "--no-fetch"
#. type: Plain text
-#: en/git-submodule.txt:344
+#: en/git-submodule.txt:345
#, priority:220
msgid "This option is only valid for the update command. Don't fetch new objects from the remote site."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:345
+#: en/git-submodule.txt:346
#, ignore-same, no-wrap, priority:220
msgid "--checkout"
msgstr "--checkout"
#. type: Plain text
-#: en/git-submodule.txt:353
+#: en/git-submodule.txt:354
#, priority:220
msgid "This option is only valid for the update command. Checkout the commit recorded in the superproject on a detached HEAD in the submodule. This is the default behavior, the main use of this option is to override `submodule.$name.update` when set to a value other than `checkout`. If the key `submodule.$name.update` is either not explicitly set or set to `checkout`, this option is implicit."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:363
+#: en/git-submodule.txt:364
#, priority:220
msgid "This option is only valid for the update command. Merge the commit recorded in the superproject into the current branch of the submodule. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve the resulting conflicts within the submodule with the usual conflict resolution tools. If the key `submodule.$name.update` is set to `merge`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:364
+#: en/git-submodule.txt:365
#, ignore-same, no-wrap, priority:220
msgid "--rebase"
msgstr "--rebase"
#. type: Plain text
-#: en/git-submodule.txt:372
+#: en/git-submodule.txt:373
#, priority:220
msgid "This option is only valid for the update command. Rebase the current branch onto the commit recorded in the superproject. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve these failures with linkgit:git-rebase[1]. If the key `submodule.$name.update` is set to `rebase`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:373
+#: en/git-submodule.txt:374
#, ignore-same, no-wrap, priority:220
msgid "--init"
msgstr "--init"
#. type: Plain text
-#: en/git-submodule.txt:377
+#: en/git-submodule.txt:378
#, priority:220
msgid "This option is only valid for the update command. Initialize all submodules for which \"git submodule init\" has not been called so far before updating."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:378
+#: en/git-submodule.txt:379
#, ignore-same, no-wrap, priority:220
msgid "--name"
msgstr "--name"
#. type: Plain text
-#: en/git-submodule.txt:382
+#: en/git-submodule.txt:383
#, priority:220
msgid "This option is only valid for the add command. It sets the submodule's name to the given string instead of defaulting to its path. The name must be valid as a directory name and may not end with a '/'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:383
+#: en/git-submodule.txt:384
#, no-wrap, priority:220
msgid "--reference <repository>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:387 en/git-submodule.txt:396
+#: en/git-submodule.txt:388 en/git-submodule.txt:397
#, priority:220
msgid "This option is only valid for add and update commands. These commands sometimes need to clone a remote repository. In this case, this option will be passed to the linkgit:git-clone[1] command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:391
+#: en/git-submodule.txt:392
#, no-wrap, priority:220
msgid ""
"*NOTE*: Do *not* use this option unless you have read the note\n"
@@ -47978,61 +48245,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:398
+#: en/git-submodule.txt:399
#, no-wrap, priority:220
msgid "*NOTE*: see the NOTE for the `--reference` option.\n"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:404
+#: en/git-submodule.txt:405
#, priority:220
msgid "This option is only valid for foreach, update, status and sync commands. Traverse submodules recursively. The operation is performed not only in the submodules of the current repo, but also in any nested submodules inside those submodules (and so on)."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:405
+#: en/git-submodule.txt:406
#, ignore-same, no-wrap, priority:220
msgid "--depth"
msgstr "--depth"
#. type: Plain text
-#: en/git-submodule.txt:409
+#: en/git-submodule.txt:410
#, priority:220
msgid "This option is valid for add and update commands. Create a 'shallow' clone with a history truncated to the specified number of revisions. See linkgit:git-clone[1]"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:410
+#: en/git-submodule.txt:411
#, ignore-same, no-wrap, priority:220
msgid "--[no-]recommend-shallow"
msgstr "--[no-]recommend-shallow"
#. type: Plain text
-#: en/git-submodule.txt:415
+#: en/git-submodule.txt:416
#, priority:220
msgid "This option is only valid for the update command. The initial clone of a submodule will use the recommended `submodule.<name>.shallow` as provided by the `.gitmodules` file by default. To ignore the suggestions use `--no-recommend-shallow`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:421
+#: en/git-submodule.txt:422
#, priority:220
msgid "This option is only valid for the update command. Clone new submodules in parallel with as many jobs. Defaults to the `submodule.fetchJobs` option."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:426
+#: en/git-submodule.txt:427
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:434
+#: en/git-submodule.txt:435
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:438
+#: en/git-submodule.txt:439
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -48664,7 +48931,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:889
+#: en/git-svn.txt:346 en/rev-list-options.txt:905
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -49477,7 +49744,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:777
#, priority:100
-msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider linkgit:git-filter-branch[1] instead. filter-branch also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
+msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports, and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider https://github.com/newren/git-filter-repo[git-filter-repo] instead. filter-repo also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
msgstr ""
#. type: Labeled list
@@ -51398,16 +51665,6 @@ msgid ""
"#\n"
msgstr ""
-#. type: delimited block -
-#: en/git.txt:310
-#, 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/git.txt:315
#, no-wrap, priority:100
@@ -55448,98 +55705,104 @@ msgstr ""
msgid "This option determines how the merge message will be cleaned up before commiting. See linkgit:git-commit[1] for more details. In addition, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on to the commit machinery in the case of a merge conflict."
msgstr ""
+#. type: Labeled list
+#: en/merge-options.txt:44
+#, ignore-same, no-wrap, priority:240
+msgid "--ff-only"
+msgstr "--ff-only"
+
#. type: Plain text
-#: en/merge-options.txt:46
+#: en/merge-options.txt:50
#, priority:240
-msgid "When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. This is the default behavior."
+msgid "Specifies how a merge is handled when the merged-in history is already a descendant of the current history. `--ff` is the default unless merging an annotated (and possibly signed) tag that is not stored in its natural place in the `refs/tags/` hierarchy, in which case `--no-ff` is assumed."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:52
+#: en/merge-options.txt:55
#, priority:240
-msgid "Create a merge commit even when the merge resolves as a fast-forward. This is the default behaviour when merging an annotated (and possibly signed) tag that is not stored in its natural place in 'refs/tags/' hierarchy."
+msgid "With `--ff`, when possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit."
msgstr ""
-#. type: Labeled list
-#: en/merge-options.txt:53
-#, ignore-same, no-wrap, priority:240
-msgid "--ff-only"
-msgstr "--ff-only"
+#. type: Plain text
+#: en/merge-options.txt:58
+#, priority:240
+msgid "With `--no-ff`, create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward."
+msgstr ""
#. type: Plain text
-#: en/merge-options.txt:57
+#: en/merge-options.txt:61
#, priority:240
-msgid "Refuse to merge and exit with a non-zero status unless the current `HEAD` is already up to date or the merge can be resolved as a fast-forward."
+msgid "With `--ff-only`, resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:63
+#: en/merge-options.txt:67
#, priority:240
msgid "GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:69
+#: en/merge-options.txt:73
#, priority:240
msgid "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also linkgit:git-fmt-merge-msg[1]."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:72
+#: en/merge-options.txt:76
#, priority:240
msgid "With --no-log do not list one-line descriptions from the actual commits being merged."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:74
+#: en/merge-options.txt:78
#, ignore-same, no-wrap, priority:240
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
-#: en/merge-options.txt:83
+#: en/merge-options.txt:87
#, priority:240
msgid "With --no-signoff do not add a Signed-off-by line."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:89
+#: en/merge-options.txt:93
#, priority:240
msgid "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:92
+#: en/merge-options.txt:96
#, priority:240
msgid "With -n or --no-stat do not show a diffstat at the end of the merge."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:93
+#: en/merge-options.txt:97
#, ignore-same, no-wrap, priority:240
msgid "--squash"
msgstr "--squash"
#. type: Labeled list
-#: en/merge-options.txt:94
+#: en/merge-options.txt:98
#, ignore-same, no-wrap, priority:240
msgid "--no-squash"
msgstr "--no-squash"
#. type: Plain text
-#: en/merge-options.txt:102
+#: en/merge-options.txt:106
#, priority:240
msgid "Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:105
+#: en/merge-options.txt:109
#, priority:240
msgid "With --no-squash perform the merge and commit the result. This option can be used to override --squash."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:107
+#: en/merge-options.txt:111
#, priority:240
msgid "With --squash, --commit is not allowed, and will fail."
msgstr ""
@@ -55547,71 +55810,77 @@ msgstr ""
#. type: Plain text
#: en/merge-options.txt:115
#, priority:240
+msgid "This option bypasses the pre-merge and commit-msg hooks. See also linkgit:githooks[5]."
+msgstr ""
+
+#. type: Plain text
+#: en/merge-options.txt:123
+#, priority:240
msgid "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise)."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:116
+#: en/merge-options.txt:124
#, no-wrap, priority:240
msgid "-X <option>"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:120
+#: en/merge-options.txt:128
#, priority:240
msgid "Pass merge strategy specific option through to the merge strategy."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:121
+#: en/merge-options.txt:129
#, ignore-same, no-wrap, priority:240
msgid "--verify-signatures"
msgstr "--verify-signatures"
#. type: Labeled list
-#: en/merge-options.txt:122
+#: en/merge-options.txt:130
#, ignore-same, no-wrap, priority:240
msgid "--no-verify-signatures"
msgstr "--no-verify-signatures"
#. type: Plain text
-#: en/merge-options.txt:128
+#: en/merge-options.txt:136
#, priority:240
msgid "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:130
+#: en/merge-options.txt:138
#, ignore-same, no-wrap, priority:240
msgid "--no-summary"
msgstr "--no-summary"
#. type: Plain text
-#: en/merge-options.txt:133
+#: en/merge-options.txt:141
#, priority:240
msgid "Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:138
+#: en/merge-options.txt:146
#, priority:240
msgid "Operate quietly. Implies --no-progress."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:149
+#: en/merge-options.txt:157
#, priority:240
msgid "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:152
+#: en/merge-options.txt:160
#, ignore-same, no-wrap, priority:240
msgid "--allow-unrelated-histories"
msgstr "--allow-unrelated-histories"
#. type: Plain text
-#: en/merge-options.txt:158
+#: en/merge-options.txt:166
#, priority:240
msgid "By default, `git merge` command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added."
msgstr ""
@@ -56934,7 +57203,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:215
#, priority:260
-msgid "minutes ago`}; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -59312,263 +59581,281 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:762
#, priority:260
+msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:771
+#, ignore-ellipsis, priority:260
+msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:775
+#, priority:260
+msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:778
+#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:779
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:766
+#: en/rev-list-options.txt:782
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:773
+#: en/rev-list-options.txt:789
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:781
+#: en/rev-list-options.txt:797
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:800
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:791
+#: en/rev-list-options.txt:807
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:793
+#: en/rev-list-options.txt:809
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:801
+#: en/rev-list-options.txt:817
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:802
+#: en/rev-list-options.txt:818
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:804
+#: en/rev-list-options.txt:820
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:822
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:812
+#: en/rev-list-options.txt:828
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:832
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:818
+#: en/rev-list-options.txt:834
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:819
+#: en/rev-list-options.txt:835
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:826
+#: en/rev-list-options.txt:842
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:847
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:833
+#: en/rev-list-options.txt:849
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:852
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:838
+#: en/rev-list-options.txt:854
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:839
+#: en/rev-list-options.txt:855
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:840
+#: en/rev-list-options.txt:856
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:859
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:846
+#: en/rev-list-options.txt:862
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:864
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:873
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:864
+#: en/rev-list-options.txt:880
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:868
+#: en/rev-list-options.txt:884
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:875
+#: en/rev-list-options.txt:891
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:894
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:880
+#: en/rev-list-options.txt:896
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:882
+#: en/rev-list-options.txt:898
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:884
+#: en/rev-list-options.txt:900
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:887
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:892
+#: en/rev-list-options.txt:908
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:909
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:896
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:898
+#: en/rev-list-options.txt:914
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:902
+#: en/rev-list-options.txt:918
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:907
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:925
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:932
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -59579,19 +59866,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:919
+#: en/rev-list-options.txt:935
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:922
+#: en/rev-list-options.txt:938
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:929
+#: en/rev-list-options.txt:945
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -59603,85 +59890,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:931
+#: en/rev-list-options.txt:947
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:937
+#: en/rev-list-options.txt:953
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:939
+#: en/rev-list-options.txt:955
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:942
+#: en/rev-list-options.txt:958
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:943
+#: en/rev-list-options.txt:959
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:949
+#: en/rev-list-options.txt:965
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:959
+#: en/rev-list-options.txt:975
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:963
+#: en/rev-list-options.txt:979
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:984
#, priority:260
msgid "Listed below are options that control the formatting of diff output. Some of them are specific to linkgit:git-rev-list[1], however other diff options may be given. See linkgit:git-diff-files[1] for more options."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:991
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:981
+#: en/rev-list-options.txt:997
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:1012
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1015
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1018
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.ru.po b/po/documentation.ru.po
index aa1f2fbe9ef4fac60bd60e1eb6f7cf766b51a122..549ca442133e63f6e508f5178bc09b1ff54263f5 100644
--- a/po/documentation.ru.po
+++ b/po/documentation.ru.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Git Documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2019-08-26 23:13+0200\n"
+"POT-Creation-Date: 2019-12-08 16:35+0100\n"
"PO-Revision-Date: 2019-08-29 20:24+0000\n"
"Last-Translator: Artem Buslov <buslov.artem@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:319 en/git-fsck.txt:38 en/git-rebase.txt:471
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:321 en/git-fsck.txt:38 en/git-rebase.txt:493
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -89,7 +89,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1000
+#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1016
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -125,7 +125,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:433 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -469,7 +469,7 @@ msgid "Get and set repository or global options."
msgstr "�棘剋��筠戟龜筠 龜 ���逵戟棘勻克逵 均剋棘閨逵剋�戟�� 棘極�龜橘 龜剋龜 棘極�龜橘 �筠極棘鈞龜�棘�龜�"
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1505
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1528
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-export[1]"
msgstr "linkgit:git-fast-export[1]"
@@ -481,7 +481,7 @@ msgid "Git data exporter."
msgstr "葵克�極棘�� 畇逵戟戟�� Git"
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:243
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-import[1]"
msgstr "linkgit:git-fast-import[1]"
@@ -2262,95 +2262,95 @@ msgstr ""
msgid "Example"
msgstr ""
-#. type: Plain text
-#: en/config.txt:185
+#. type: delimited block -
+#: en/config.txt:186
#, no-wrap, priority:100
msgid ""
-"\t# Core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"# Core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:190
+#. type: delimited block -
+#: en/config.txt:191
#, no-wrap, priority:100
msgid ""
-"\t# Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"# Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:194
+#. type: delimited block -
+#: en/config.txt:195
#, no-wrap, priority:100
msgid ""
-"\t[branch \"devel\"]\n"
-"\t\tremote = origin\n"
-"\t\tmerge = refs/heads/devel\n"
+"[branch \"devel\"]\n"
+"\tremote = origin\n"
+"\tmerge = refs/heads/devel\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:199
+#. type: delimited block -
+#: en/config.txt:200
#, no-wrap, priority:100
msgid ""
-"\t# Proxy settings\n"
-"\t[core]\n"
-"\t\tgitProxy=\"ssh\" for \"kernel.org\"\n"
-"\t\tgitProxy=default-proxy ; for the rest\n"
+"# Proxy settings\n"
+"[core]\n"
+"\tgitProxy=\"ssh\" for \"kernel.org\"\n"
+"\tgitProxy=default-proxy ; for the rest\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:204
+#. type: delimited block -
+#: en/config.txt:205
#, no-wrap, priority:100
msgid ""
-"\t[include]\n"
-"\t\tpath = /path/to/foo.inc ; include by absolute path\n"
-"\t\tpath = foo.inc ; find \"foo.inc\" relative to the current file\n"
-"\t\tpath = ~/foo.inc ; find \"foo.inc\" in your `$HOME` directory\n"
+"[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: Plain text
-#: en/config.txt:208
+#. type: delimited block -
+#: en/config.txt:209
#, no-wrap, priority:100
msgid ""
-"\t; include if $GIT_DIR is /path/to/foo/.git\n"
-"\t[includeIf \"gitdir:/path/to/foo/.git\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; 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: Plain text
-#: en/config.txt:212
+#. type: delimited block -
+#: en/config.txt:213
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside /path/to/group\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside /path/to/group\n"
+"[includeIf \"gitdir:/path/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:216
+#. type: delimited block -
+#: en/config.txt:217
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside $HOME/to/group\n"
-"\t[includeIf \"gitdir:~/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside $HOME/to/group\n"
+"[includeIf \"gitdir:~/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:222
+#. type: delimited block -
+#: en/config.txt:223
#, no-wrap, priority:100
msgid ""
-"\t; relative paths are always relative to the including\n"
-"\t; file (if the condition is true); their location is not\n"
-"\t; affected by the condition\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = foo.inc\n"
+"; 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:227
+#: en/config.txt:229
#, no-wrap, priority:100
msgid ""
"\t; include only if we are in a worktree where foo-branch is\n"
@@ -2360,43 +2360,43 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/config.txt:229
+#: en/config.txt:231
#, no-wrap, priority:100
msgid "Values"
msgstr ""
#. type: Plain text
-#: en/config.txt:234
+#: 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:235
+#: en/config.txt:237
#, no-wrap, priority:100
msgid "boolean"
msgstr ""
#. type: Plain text
-#: en/config.txt:240
+#: 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:241
+#: en/config.txt:243
#, no-wrap, priority:100
msgid "true"
msgstr ""
#. type: Plain text
-#: en/config.txt:242
+#: en/config.txt:244
#, priority:100
msgid "Boolean true literals are `yes`, `on`, `true`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:244
+#: en/config.txt:246
#, no-wrap, priority:100
msgid ""
"and `1`. Also, a variable defined without `= <value>`\n"
@@ -2404,109 +2404,109 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/config.txt:245
+#: en/config.txt:247
#, no-wrap, priority:100
msgid "false"
msgstr ""
#. type: Plain text
-#: en/config.txt:246
+#: en/config.txt:248
#, priority:100
msgid "Boolean false literals are `no`, `off`, `false`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:247
+#: en/config.txt:249
#, no-wrap, priority:100
msgid "`0` and the empty string.\n"
msgstr ""
#. type: Plain text
-#: en/config.txt:251
+#: 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:252
+#: en/config.txt:254
#, no-wrap, priority:100
msgid "integer"
msgstr ""
#. type: Plain text
-#: en/config.txt:256
+#: 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:257 en/diff-options.txt:356 en/git-for-each-ref.txt:177
+#: 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:261
+#: 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:265
+#: en/config.txt:267
#, 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."
msgstr ""
#. type: Plain text
-#: en/config.txt:270
+#: en/config.txt:272
#, 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:277
+#: en/config.txt:279
#, 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:280
+#: en/config.txt:282
#, 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:289
+#: en/config.txt:291
#, 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:290
+#: en/config.txt:292
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:296
+#: en/config.txt:298
#, 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:299 en/git-imap-send.txt:58
+#: en/config.txt:301 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:304
+#: en/config.txt:306
#, 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:309
+#: en/config.txt:311
#, 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 ""
@@ -3244,53 +3244,53 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
#, no-wrap, priority:260
-msgid "Generating patches with -p"
+msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:10
+#: en/diff-generate-patch.txt:14
#, priority:260
-msgid "When \"git-diff-index\", \"git-diff-tree\", or \"git-diff-files\" are run with a `-p` option, \"git diff\" without the `--raw` option, or \"git log\" with the \"-p\" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
+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:13
+#: 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:15
+#: 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:17
+#: 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:21
+#: 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:25
+#: 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:27
+#: 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:39
+#: en/diff-generate-patch.txt:43
#, no-wrap, priority:260
msgid ""
"old mode <mode>\n"
@@ -3307,43 +3307,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:42
+#: 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:44
+#: 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:51
+#: 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:55
+#: en/diff-generate-patch.txt:59
#, priority:260
-msgid "The index line includes the SHA-1 checksum 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."
+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:59
+#: 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:64
+#: 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:71
+#: en/diff-generate-patch.txt:75
#, no-wrap, priority:260
msgid ""
"diff --git a/a b/b\n"
@@ -3355,25 +3355,25 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/diff-generate-patch.txt:74
+#: en/diff-generate-patch.txt:78
#, no-wrap, priority:260
-msgid "combined diff format"
+msgid "Combined diff format"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:82
+#: 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:84
+#: en/diff-generate-patch.txt:88
#, priority:260
-msgid "A 'combined diff' format looks like this:"
+msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:93
+#: en/diff-generate-patch.txt:97
#, no-wrap, priority:260
msgid ""
"diff --combined describe.c\n"
@@ -3386,7 +3386,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:103
+#: en/diff-generate-patch.txt:107
#, no-wrap, priority:260
msgid ""
"- static void describe(char *arg)\n"
@@ -3401,7 +3401,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:113
+#: en/diff-generate-patch.txt:117
#, no-wrap, priority:260
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
@@ -3416,37 +3416,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:117
+#: en/diff-generate-patch.txt:121
#, priority:260
-msgid "It is preceded with a \"git diff\" header, that looks like this (when `-c` option is used):"
+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:119
+#: en/diff-generate-patch.txt:123
#, no-wrap, priority:260
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:121
+#: en/diff-generate-patch.txt:125
#, priority:260
-msgid "or like this (when `--cc` option is used):"
+msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:123
+#: en/diff-generate-patch.txt:127
#, no-wrap, priority:260
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:126
+#: 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:131
+#: en/diff-generate-patch.txt:135
#, no-wrap, priority:260
msgid ""
"index <hash>,<hash>..<hash>\n"
@@ -3456,91 +3456,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:137
+#: 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:139
+#: 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:141 en/diff-generate-patch.txt:152 en/diff-generate-patch.txt:153 en/diff-generate-patch.txt:154
+#: 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:142 en/diff-generate-patch.txt:155
+#: 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:146
+#: 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:150
+#: 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:159
+#: 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:165
+#: 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 for apply. The change is similar to the change in the extended 'index' header:"
+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:167
+#: 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:170
+#: 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:179
+#: 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:185
+#: 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:191
+#: 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:197
+#: 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:327 en/merge-options.txt:86
+#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3552,7 +3552,7 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:186 en/git-add.txt:111 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/diff-options.txt:23 en/fetch-options.txt:198 en/git-add.txt:111 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
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
@@ -3576,7 +3576,7 @@ msgid "\tThis is the default.\n"
msgstr ""
#. 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:117 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
+#: 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:118 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"
@@ -3995,7 +3995,7 @@ msgid "Synonym for --dirstat=files,param1,param2..."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:129
+#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--summary"
msgstr "--summary"
@@ -4019,7 +4019,7 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:122 en/git-update-index.txt:168
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:168
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4428,7 +4428,7 @@ msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:402 en/git-status.txt:139
+#: en/diff-options.txt:402 en/git-status.txt:143
#, ignore-same, no-wrap, priority:280
msgid "--no-renames"
msgstr "--no-renames"
@@ -4532,7 +4532,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:463
#, priority:280
-msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
+msgid "It affects the way a change that amounts to a total rewrite of a file does not appear as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
msgstr ""
#. type: Plain text
@@ -4548,7 +4548,7 @@ msgid "-M[<n>]"
msgstr "-M[<�龜�剋棘>]"
#. type: Labeled list
-#: en/diff-options.txt:473 en/git-status.txt:143
+#: en/diff-options.txt:473 en/git-status.txt:147
#, no-wrap, priority:280
msgid "--find-renames[=<n>]"
msgstr ""
@@ -4971,7 +4971,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:203 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:52 en/git-clone.txt:120 en/git-commit.txt:314 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:301 en/git-gc.txt:68 en/git-grep.txt:296 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:315 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:255 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:136 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:215 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:316 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:302 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:256 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5025,7 +5025,7 @@ msgid "Allow (or disallow) external text conversion filters to be run when compa
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:85
+#: en/diff-options.txt:722 en/git-status.txt:87
#, no-wrap, priority:280
msgid "--ignore-submodules[=<when>]"
msgstr ""
@@ -5103,7 +5103,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:265 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:266 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5235,7 +5235,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:48 en/git-commit.txt:317 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:50 en/git-commit.txt:319 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5247,13 +5247,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:34 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:195 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:347 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:278 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:279 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:35 en/git-fast-import.txt:37 en/git-filter-branch.txt:196 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:279 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:280 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5285,7 +5285,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:112 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:113 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5363,7 +5363,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:47 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:97 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:326 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:301 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:85
+#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:98 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:302 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5429,187 +5429,211 @@ msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:167
+#: en/fetch-options.txt:164
+#, priority:220
+msgid "Number of parallel children to be used for all forms of fetching."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:169
+#, priority:220
+msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:172
#, priority:220
-msgid "Number of parallel children to be used for fetching submodules. Each will fetch from different submodules, such that fetching many submodules will be faster. By default submodules will be fetched one at a time."
+msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:168 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:173 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:171
+#: en/fetch-options.txt:176
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:172
+#: en/fetch-options.txt:177 en/git-branch.txt:225 en/git-push.txt:349
+#, ignore-same, no-wrap, priority:240
+msgid "--set-upstream"
+msgstr "--set-upstream"
+
+#. type: Plain text
+#: en/fetch-options.txt:183
+#, priority:220
+msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:184
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:188
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177
+#: en/fetch-options.txt:189
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:184
+#: en/fetch-options.txt:196
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:199
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:194
+#: en/fetch-options.txt:206
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:195 en/git-clone.txt:182
+#: en/fetch-options.txt:207 en/git-clone.txt:182
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:212
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:202 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:51 en/git-clone.txt:119 en/git-commit.txt:313 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:300 en/git-grep.txt:295 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:314 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:254 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:135
+#: en/fetch-options.txt:214 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:315 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:301 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:255 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:207
+#: en/fetch-options.txt:219
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:208 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:298 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:318 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:139
+#: en/fetch-options.txt:220 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:300 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:209 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:299 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:319 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:140
+#: en/fetch-options.txt:221 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:301 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:211 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:142
+#: en/fetch-options.txt:223 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:150
#, fuzzy, priority:300
msgid "Be verbose."
msgstr "閨��� 劇戟棘均棘�剋棘勻戟筠筠"
#. type: Labeled list
-#: en/fetch-options.txt:213 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:326 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:258 en/git-switch.txt:144 en/merge-options.txt:143
+#: en/fetch-options.txt:225 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:328 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:259 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:218 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:230 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:219 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:231 en/git-ls-remote.txt:73 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:220 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:232 en/git-clone.txt:135 en/git-ls-remote.txt:74
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-clone.txt:142
+#: en/fetch-options.txt:239 en/git-clone.txt:142
#, priority:300
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:240
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:233
+#: en/fetch-options.txt:245
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:234
+#: en/fetch-options.txt:246
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:240
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:241 en/git-push.txt:398
+#: en/fetch-options.txt:253 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:242 en/git-push.txt:399
+#: en/fetch-options.txt:254 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:244 en/git-push.txt:401
+#: en/fetch-options.txt:256 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr "��極棘剋�鈞棘勻逵�� �棘剋�克棘 IPv4 畇�筠�逵, 龜均戟棘�龜��� IPv6 逵畇�筠�逵."
#. type: Labeled list
-#: en/fetch-options.txt:245 en/git-push.txt:402
+#: en/fetch-options.txt:257 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:246 en/git-push.txt:403
+#: en/fetch-options.txt:258 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:247 en/git-push.txt:405
+#: en/fetch-options.txt:259 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr "��極棘剋�鈞棘勻逵�� �棘剋�克棘 IPv6 逵畇�筠�逵, 龜均戟棘�龜��� 逵畇�筠�逵 IPv4."
@@ -5649,7 +5673,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:20 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:67 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
+#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr "���鬼����"
@@ -5691,13 +5715,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr ""
#. type: Title -
-#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:83 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:85 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:115 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:253 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:86 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:254 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr "������龜�竅"
#. type: Labeled list
-#: en/git-add.txt:52 en/git-grep.txt:308 en/git-status.txt:148
+#: en/git-add.txt:52 en/git-grep.txt:325 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
@@ -5709,7 +5733,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:67 en/git-grep.txt:314
+#: en/git-add.txt:67 en/git-grep.txt:331
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -5727,13 +5751,13 @@ msgid "Allow adding otherwise ignored files."
msgstr "�逵鈞�筠�龜�� 畇棘閨逵勻剋筠戟龜筠 龜均戟棘�龜��筠劇�� 龜戟逵�筠 �逵橘剋棘勻"
#. type: Labeled list
-#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:42 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:394 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:43 en/git-rebase.txt:395 en/git-rebase.txt:536 en/git-svn.txt:297
+#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5757,7 +5781,7 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:275 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
@@ -5847,7 +5871,7 @@ msgid "This option is primarily to help users who are used to older versions of
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:146 en/git-format-patch.txt:101 en/git-submodule.txt:340
+#: en/git-add.txt:146 en/git-format-patch.txt:102 en/git-submodule.txt:341
#, no-wrap, priority:300
msgid "-N"
msgstr ""
@@ -5937,7 +5961,7 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:343 en/git-grep.txt:304 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
+#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:345 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr "\\--"
@@ -5949,7 +5973,7 @@ msgid "This option can be used to separate command-line options from the list of
msgstr ""
#. type: Title -
-#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:357 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:153 en/git-fetch.txt:242 en/git-filter-branch.txt:234 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:634 en/git-grep.txt:316 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:206 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:359 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:638 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr "������竅"
@@ -5991,7 +6015,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:221 en/git-rebase.txt:591
+#: en/git-add.txt:221 en/git-rebase.txt:613
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr "��龜����龜���竅� �����"
@@ -6003,7 +6027,7 @@ msgid "When the command enters the interactive mode, it shows the output of the
msgstr ""
#. type: Plain text
-#: en/git-add.txt:230 en/git-clean.txt:83
+#: en/git-add.txt:230 en/git-clean.txt:85
#, priority:300
msgid "The command loop shows the list of subcommands available, and gives a prompt \"What now> \". In general, when the prompt ends with a single '>', you can pick only one of the choices given and type return, like this:"
msgstr ""
@@ -6303,7 +6327,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:135 en/git-commit-tree.txt:118 en/git-commit.txt:487 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:241 en/git-fast-import.txt:1503 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:679 en/git-gc.txt:154 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:112 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:247 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:519 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:292 en/git-status.txt:434 en/git-submodule.txt:436 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
+#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:489 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1526 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:683 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:437 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr "鬼��龜�� 龜����"
@@ -6315,13 +6339,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:139 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:495 en/git-config.txt:492 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:245 en/git-fast-import.txt:1507 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:480 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:683 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:334 en/git-gui.txt:126 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:116 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:230 en/git-merge-file.txt:94 en/git-merge-index.txt:78 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1052 en/git-receive-pack.txt:251 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:123 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:523 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:300 en/git-status.txt:438 en/git-stripspace.txt:93 en/git-submodule.txt:440 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
+#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:497 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1530 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:693 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:687 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:441 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
#, no-wrap, priority:300
msgid "GIT"
msgstr "GIT"
#. type: Plain text
-#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:140 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:496 en/git-config.txt:493 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:246 en/git-fast-import.txt:1508 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:481 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:684 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:335 en/git-gui.txt:127 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:117 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:231 en/git-merge-file.txt:95 en/git-merge-index.txt:79 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1053 en/git-receive-pack.txt:252 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:124 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:524 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:301 en/git-status.txt:439 en/git-stripspace.txt:94 en/git-submodule.txt:441 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
+#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:498 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1531 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:694 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:688 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:442 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6379,7 +6403,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:118 en/git-rebase.txt:387 en/git-revert.txt:98 en/merge-options.txt:73
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:119 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6421,7 +6445,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:969
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:985
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6451,7 +6475,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:267 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:989
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1005
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6543,37 +6567,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:303 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:304 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:307 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:373 en/git-rebase.txt:524
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:374
+#: en/git-am.txt:109 en/git-rebase.txt:396
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:337
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6633,7 +6657,7 @@ msgid "Run interactively."
msgstr "鈞逵極���龜�� 勻 龜戟�筠�逵克�龜勻戟棘劇 �筠菌龜劇筠"
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:380 en/git-rebase.txt:521
+#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6645,7 +6669,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:381 en/git-rebase.txt:522
+#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6657,7 +6681,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:256 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6669,31 +6693,31 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:333 en/git-rebase.txt:308 en/git-revert.txt:91 en/merge-options.txt:58
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:335 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:334 en/git-rebase.txt:309 en/git-revert.txt:92 en/merge-options.txt:59
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:336 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:338 en/git-rebase.txt:313 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:340 en/git-rebase.txt:331 en/git-revert.txt:96
#, priority:280
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:228 en/sequencer.txt:1
+#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:246 en/sequencer.txt:1
#, ignore-same, no-wrap, priority:240
msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:406 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:997
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1013
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6723,7 +6747,7 @@ msgid "When a patch failure occurs, <msg> will be printed to the screen before e
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:231 en/sequencer.txt:15
+#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:249 en/sequencer.txt:15
#, ignore-same, no-wrap, priority:240
msgid "--abort"
msgstr "--abort"
@@ -6735,7 +6759,7 @@ msgid "Restore the original branch and abort the patching operation."
msgstr "勻棘���逵戟棘勻龜�� 棘�龜均龜戟逵剋�戟�� 勻筠�克� 龜 棘�劇筠戟龜�� 棘極筠�逵�龜� 極�龜劇筠戟筠戟龜� 龜鈞劇筠戟筠戟龜橘."
#. type: Labeled list
-#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:238 en/sequencer.txt:10
+#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:256 en/sequencer.txt:10
#, ignore-same, no-wrap, priority:240
msgid "--quit"
msgstr "--quit"
@@ -6747,7 +6771,7 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:262
+#: en/git-am.txt:179 en/git-rebase.txt:280
#, ignore-same, no-wrap, priority:100
msgid "--show-current-patch"
msgstr "--show-current-patch"
@@ -6759,7 +6783,7 @@ msgid "Show the patch being applied when \"git am\" is stopped because of confli
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:451 en/git-format-patch.txt:351 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:188 en/git-tag.txt:231
+#: en/git-am.txt:184 en/git-commit.txt:453 en/git-format-patch.txt:355 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
@@ -6843,7 +6867,7 @@ msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the curren
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:471 en/git-gc.txt:147
+#: en/git-am.txt:234 en/git-commit.txt:473 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
@@ -6941,7 +6965,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:322 en/merge-options.txt:84
+#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -6983,7 +7007,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:291
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:292
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7055,7 +7079,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:342
+#: en/git-apply.txt:134 en/git-rebase.txt:360
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7271,7 +7295,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:330 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:398 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:332 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr "���圭��叫��揆�赳"
@@ -9193,7 +9217,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:525
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9229,13 +9253,13 @@ msgid "Sorting and filtering branches are case insensitive."
msgstr "�棘��龜�棘勻克逵 龜 �龜剋���逵�龜� 戟筠 鈞逵勻龜��� 棘� �筠均龜���逵"
#. type: Labeled list
-#: en/git-branch.txt:153 en/git-status.txt:126 en/git-tag.txt:134
+#: en/git-branch.txt:153 en/git-status.txt:130 en/git-tag.txt:134
#, no-wrap, priority:280
msgid "--column[=<options>]"
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:154 en/git-status.txt:127 en/git-tag.txt:135
+#: en/git-branch.txt:154 en/git-status.txt:131 en/git-tag.txt:135
#, ignore-same, no-wrap, priority:280
msgid "--no-column"
msgstr "--no-column"
@@ -9360,12 +9384,6 @@ msgstr "--no-track"
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
-#. type: Labeled list
-#: en/git-branch.txt:225 en/git-push.txt:349
-#, ignore-same, no-wrap, priority:240
-msgid "--set-upstream"
-msgstr "--set-upstream"
-
#. type: Plain text
#: en/git-branch.txt:228
#, priority:240
@@ -9635,7 +9653,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-filter-branch.txt:449 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10255,7 +10273,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:152 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10904,7 +10922,7 @@ msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will al
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:226
+#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
@@ -11101,7 +11119,7 @@ msgid "Only meaningful with `--stdin`; paths are separated with NUL character in
msgstr ""
#. type: Plain text
-#: en/git-checkout-index.txt:73 en/git-commit.txt:345 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
+#: en/git-checkout-index.txt:73 en/git-commit.txt:347 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
#, priority:280
msgid "Do not interpret any more arguments as options."
msgstr ""
@@ -11422,7 +11440,7 @@ msgid "Quiet, suppress feedback messages."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:144
+#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:152
#, ignore-same, no-wrap, priority:240
msgid "--no-progress"
msgstr "--no-progress"
@@ -11608,7 +11626,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:241 en/git-rebase.txt:268 en/git-rebase.txt:529 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:354 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
+#: en/git-checkout.txt:241 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:355 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11728,7 +11746,7 @@ msgid "In the default overlay mode, `git checkout` never removes files from the
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:312 en/git-rebase.txt:225 en/git-switch.txt:36
+#: en/git-checkout.txt:312 en/git-rebase.txt:243 en/git-switch.txt:36
#, no-wrap, priority:240
msgid "<branch>"
msgstr "<勻筠�克逵>"
@@ -12434,7 +12452,7 @@ msgid "This option determines how the commit message will be cleaned up before b
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:65 en/git-clean.txt:61
+#: en/git-cherry-pick.txt:65 en/git-clean.txt:63
#, ignore-same, no-wrap, priority:100
msgid "-x"
msgstr "-x"
@@ -12518,7 +12536,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:249 en/git-rebase.txt:532
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:267 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12542,7 +12560,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:282 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:109
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12560,7 +12578,7 @@ msgid "-X<option>"
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:125
#, no-wrap, priority:240
msgid "--strategy-option=<option>"
msgstr ""
@@ -12756,7 +12774,7 @@ msgid "Show the commit subjects next to the SHA1s."
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:32 en/git-rebase.txt:220
+#: en/git-cherry.txt:32 en/git-rebase.txt:238
#, fuzzy, no-wrap, priority:100
msgid "<upstream>"
msgstr "勻��筠��棘��逵�"
@@ -12774,7 +12792,7 @@ msgid "<head>"
msgstr ""
#. type: Plain text
-#: en/git-cherry.txt:38 en/git-rebase.txt:227
+#: en/git-cherry.txt:38 en/git-rebase.txt:245
#, priority:100
msgid "Working branch; defaults to HEAD."
msgstr ""
@@ -12987,85 +13005,85 @@ msgid "If any optional `<path>...` arguments are given, only those paths are aff
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:33
+#: en/git-clean.txt:35
#, priority:100
-msgid "Remove untracked directories in addition to untracked files. If an untracked directory is managed by a different Git repository, it is not removed by default. Use -f option twice if you really want to remove such a directory."
+msgid "Normally, when no <path> is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. If any paths are specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under `--force`) will be removed."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:41
+#: en/git-clean.txt:43
#, priority:100
-msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f, -n or -i. Git will refuse to delete directories with .git sub directory or file unless a second -f is given."
+msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f or -i. Git will refuse to modify untracked nested git repositories (directories with a .git subdirectory) unless a second -f is given."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:46
+#: en/git-clean.txt:48
#, priority:100
msgid "Show what would be done and clean files interactively. See ``Interactive mode'' for details."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:50
+#: en/git-clean.txt:52
#, priority:100
msgid "Don't actually remove anything, just show what would be done."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:55
+#: en/git-clean.txt:57
#, priority:100
msgid "Be quiet, only report errors, but not the files that are successfully removed."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:56
+#: en/git-clean.txt:58
#, no-wrap, priority:100
msgid "-e <pattern>"
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:57 en/git-ls-files.txt:85 en/git-name-rev.txt:33
+#: en/git-clean.txt:59 en/git-ls-files.txt:85 en/git-name-rev.txt:33
#, no-wrap, priority:100
msgid "--exclude=<pattern>"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:60
+#: en/git-clean.txt:62
#, priority:100
msgid "Use the given exclude pattern in addition to the standard ignore rules (see linkgit:gitignore[5])."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:68
+#: en/git-clean.txt:70
#, priority:100
msgid "Don't use the standard ignore rules (see linkgit:gitignore[5]), but still use the ignore rules given with `-e` options from the command line. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git restore' or 'git reset') to create a pristine working directory to test a clean build."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:69
+#: en/git-clean.txt:71
#, no-wrap, priority:100
msgid "-X"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:72
+#: en/git-clean.txt:74
#, priority:100
msgid "Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files."
msgstr ""
#. type: Title -
-#: en/git-clean.txt:74
+#: en/git-clean.txt:76
#, no-wrap, priority:100
msgid "Interactive mode"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:78
+#: en/git-clean.txt:80
#, priority:100
msgid "When the command enters the interactive mode, it shows the files and directories to be cleaned, and goes into its interactive command loop."
msgstr ""
#. type: delimited block -
-#: en/git-clean.txt:89
+#: en/git-clean.txt:91
#, no-wrap, priority:100
msgid ""
" *** Commands ***\n"
@@ -13075,91 +13093,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:92
+#: en/git-clean.txt:94
#, priority:100
msgid "You also could say `c` or `clean` above as long as the choice is unique."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:94
+#: en/git-clean.txt:96
#, priority:100
msgid "The main command loop has 6 subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:95
+#: en/git-clean.txt:97
#, no-wrap, priority:100
msgid "clean"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:98
+#: en/git-clean.txt:100
#, priority:100
msgid "Start cleaning files and directories, and then quit."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:99
+#: en/git-clean.txt:101
#, no-wrap, priority:100
msgid "filter by pattern"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:107
+#: en/git-clean.txt:109
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Input ignore patterns>>\" prompt. You can input space-separated patterns to exclude files and directories from deletion. E.g. \"*.c *.h\" will excludes files end with \".c\" and \".h\" from deletion. When you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:108
+#: en/git-clean.txt:110
#, no-wrap, priority:100
msgid "select by numbers"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:119
+#: en/git-clean.txt:121
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Select items to delete>>\" prompt. When the prompt ends with double '>>' like this, you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything. Also when you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:120
+#: en/git-clean.txt:122
#, no-wrap, priority:100
msgid "ask each"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:125
+#: en/git-clean.txt:127
#, priority:100
msgid "This will start to clean, and you must confirm one by one in order to delete items. Please note that this action is not as efficient as the above two actions."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:126
+#: en/git-clean.txt:128
#, fuzzy, no-wrap, priority:100
msgid "quit"
msgstr "�龜�龜橘 �筠菌龜劇"
#. type: Plain text
-#: en/git-clean.txt:129
+#: en/git-clean.txt:131
#, priority:100
msgid "This lets you quit without do cleaning."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:130
+#: en/git-clean.txt:132
#, no-wrap, priority:100
msgid "help"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:133
+#: en/git-clean.txt:135
#, priority:100
msgid "Show brief usage of interactive git-clean."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:137 en/git-status.txt:436
+#: en/git-clean.txt:139 en/git-status.txt:440
#, ignore-same, priority:280
msgid "linkgit:gitignore[5]"
msgstr "linkgit:gitignore[5]"
@@ -13298,7 +13316,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:108 en/git-submodule.txt:392
+#: en/git-clone.txt:108 en/git-submodule.txt:393
#, ignore-same, no-wrap, priority:300
msgid "--dissociate"
msgstr "--dissociate"
@@ -13544,13 +13562,13 @@ msgid "Instead of placing the cloned repository where it is supposed to be, plac
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:277 en/git-submodule.txt:416
+#: en/git-clone.txt:277 en/git-submodule.txt:417
#, no-wrap, priority:300
msgid "-j <n>"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:278 en/git-submodule.txt:417
+#: en/git-clone.txt:278 en/git-submodule.txt:418
#, no-wrap, priority:300
msgid "--jobs <n>"
msgstr ""
@@ -13908,7 +13926,7 @@ msgid "Read the commit log message from the given file. Use `-` to read from the
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:68 en/git-commit.txt:339
+#: en/git-commit-tree.txt:68 en/git-commit.txt:341
#, ignore-same, no-wrap, priority:280
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
@@ -13992,7 +14010,7 @@ msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:477 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:428 en/git-svn.txt:1156
+#: en/git-commit-tree.txt:114 en/git-commit.txt:479 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:429 en/git-svn.txt:1156
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
@@ -14298,13 +14316,13 @@ msgid "When editing the commit message, start the editor with the contents in th
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:173 en/merge-options.txt:81
+#: en/git-commit.txt:173 en/merge-options.txt:85
#, priority:280
msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:175 en/git-rebase.txt:330
+#: en/git-commit.txt:175 en/git-rebase.txt:348 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14511,115 +14529,115 @@ msgid "Show untracked files."
msgstr "�筠� 戟筠棘��剋筠菌龜勻逵筠劇�� �逵橘剋棘勻.\n"
#. type: Plain text
-#: en/git-commit.txt:288
+#: en/git-commit.txt:289
#, priority:280
msgid "The mode parameter is optional (defaults to 'all'), and is used to specify the handling of untracked files; when -u is not used, the default is 'normal', i.e. show untracked files and directories."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:290 en/git-status.txt:67 en/git-status.txt:107
+#: en/git-commit.txt:291 en/git-status.txt:68 en/git-status.txt:110
#, priority:280
msgid "The possible options are:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:292
+#: en/git-commit.txt:293
#, no-wrap, priority:280
msgid "'no' - Show no untracked files\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:293
+#: en/git-commit.txt:294
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:294 en/git-status.txt:71
+#: en/git-commit.txt:295 en/git-status.txt:72
#, no-wrap, priority:280
msgid "'all' - Also shows individual files in untracked directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:297 en/git-status.txt:84
+#: en/git-commit.txt:298 en/git-status.txt:85
#, priority:280
msgid "The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:308
+#: en/git-commit.txt:310
#, priority:280
msgid "Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template to help the user describe the commit by reminding what changes the commit has. Note that this diff output doesn't have its lines prefixed with '#'. This diff will not be a part of the commit message. See the `commit.verbose` configuration variable in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:312
+#: en/git-commit.txt:314
#, priority:280
msgid "If specified twice, show in addition the unified diff between what would be committed and the worktree files, i.e. the unstaged changes to tracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:316
+#: en/git-commit.txt:318
#, priority:280
msgid "Suppress commit summary message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:321
+#: en/git-commit.txt:323
#, priority:280
msgid "Do not create a commit, but show a list of paths that are to be committed, paths with local changes that will be left uncommitted and paths that are untracked."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:322
+#: en/git-commit.txt:324
#, ignore-same, no-wrap, priority:280
msgid "--status"
msgstr "--status"
#. type: Plain text
-#: en/git-commit.txt:327
+#: en/git-commit.txt:329
#, priority:280
msgid "Include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the commit message. Defaults to on, but can be used to override configuration variable commit.status."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:328
+#: en/git-commit.txt:330
#, ignore-same, no-wrap, priority:280
msgid "--no-status"
msgstr "--no-status"
#. type: Plain text
-#: en/git-commit.txt:332
+#: en/git-commit.txt:334
#, priority:280
msgid "Do not include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the default commit message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:342
+#: en/git-commit.txt:344
#, priority:280
msgid "Countermand `commit.gpgSign` configuration variable that is set to force each and every commit to be signed."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:346 en/git-rm.txt:29
+#: en/git-commit.txt:348 en/git-rm.txt:29
#, ignore-ellipsis, no-wrap, priority:280
msgid "<file>..."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:352
+#: en/git-commit.txt:354
#, priority:280
msgid "When files are given on the command line, the command commits the contents of the named files, without recording the changes already staged. The contents of these files are also staged for the next commit on top of what have been staged before."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:369
+#: en/git-commit.txt:371
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:375
+#: en/git-commit.txt:377
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14629,13 +14647,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:383
+#: en/git-commit.txt:385
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:388
+#: en/git-commit.txt:390
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14644,19 +14662,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:393
+#: en/git-commit.txt:395
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:398
+#: en/git-commit.txt:400
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:404
+#: en/git-commit.txt:406
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14666,31 +14684,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:411
+#: en/git-commit.txt:413
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:414 en/git-commit.txt:440
+#: en/git-commit.txt:416 en/git-commit.txt:442
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:418
+#: en/git-commit.txt:420
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:426
+#: en/git-commit.txt:428
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:432
+#: en/git-commit.txt:434
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14700,55 +14718,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:437
+#: en/git-commit.txt:439
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:448
+#: en/git-commit.txt:450
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:460
+#: en/git-commit.txt:462
#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:464
+#: en/git-commit.txt:466
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:469
+#: en/git-commit.txt:471
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:475
+#: en/git-commit.txt:477
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:479
+#: en/git-commit.txt:481
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:485
+#: en/git-commit.txt:487
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:493
+#: en/git-commit.txt:495
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -15416,211 +15434,211 @@ msgstr ""
msgid "Given a .git/config like this:"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:347
+#. type: delimited block -
+#: en/git-config.txt:348
#, no-wrap, priority:100
msgid ""
-"\t#\n"
-"\t# This is the config file, and\n"
-"\t# a '#' or ';' character indicates\n"
-"\t# a comment\n"
-"\t#\n"
+"#\n"
+"# This is the config file, and\n"
+"# a '#' or ';' character indicates\n"
+"# a comment\n"
+"#\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:352
+#. type: delimited block -
+#: en/git-config.txt:353 en/git.txt:310
#, no-wrap, priority:100
msgid ""
-"\t; core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"; core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:357
+#. type: delimited block -
+#: en/git-config.txt:358
#, no-wrap, priority:100
msgid ""
-"\t; Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"; Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:362
+#. type: delimited block -
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
-"\t; Proxy settings\n"
-"\t[core]\n"
-"\t\tgitproxy=proxy-command for kernel.org\n"
-"\t\tgitproxy=default-proxy ; for all the rest\n"
+"; Proxy settings\n"
+"[core]\n"
+"\tgitproxy=proxy-command for kernel.org\n"
+"\tgitproxy=default-proxy ; for all the rest\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:369
+#. type: delimited block -
+#: en/git-config.txt:370
#, no-wrap, priority:100
msgid ""
-"\t; HTTP\n"
-"\t[http]\n"
-"\t\tsslVerify\n"
-"\t[http \"https://weak.example.com\"]\n"
-"\t\tsslVerify = false\n"
-"\t\tcookieFile = /tmp/cookie.txt\n"
+"; HTTP\n"
+"[http]\n"
+"\tsslVerify\n"
+"[http \"https://weak.example.com\"]\n"
+"\tsslVerify = false\n"
+"\tcookieFile = /tmp/cookie.txt\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:371
+#: en/git-config.txt:373
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:374
+#: en/git-config.txt:376
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:379
+#: en/git-config.txt:381
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:382
+#: en/git-config.txt:384
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:385
+#: en/git-config.txt:387
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:389
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:390
+#: en/git-config.txt:392
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:394
+#: en/git-config.txt:396
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:398
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:399
+#: en/git-config.txt:401
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:402 en/git-gui.txt:120 en/git-merge-index.txt:64
+#: en/git-config.txt:404 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:407
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:410
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:413
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:414
+#: en/git-config.txt:416
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:417
+#: en/git-config.txt:419
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:421
+#: en/git-config.txt:423
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:424
+#: en/git-config.txt:426
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:428
+#: en/git-config.txt:430
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:431
+#: en/git-config.txt:433
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:434
+#: en/git-config.txt:436
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:437
+#: en/git-config.txt:439
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:440
+#: en/git-config.txt:442
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:443
+#: en/git-config.txt:445
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:447
+#: en/git-config.txt:449
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:453
+#: en/git-config.txt:455
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15630,13 +15648,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:457
+#: en/git-config.txt:459
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:466
+#: en/git-config.txt:468
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15649,19 +15667,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:471 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1029 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
+#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:476
+#: en/git-config.txt:478
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:482
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15669,13 +15687,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:483
+#: en/git-config.txt:485
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:488
+#: en/git-config.txt:490
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -17038,7 +17056,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
msgstr ""
#. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:234
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
#, no-wrap, priority:100
msgid "LIMITATIONS"
msgstr ""
@@ -18543,7 +18561,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:976
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:992
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19095,7 +19113,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:422
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:423
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -19191,13 +19209,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:982
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:998
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:988
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1004
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -19552,9 +19570,9 @@ msgid "This program dumps the given revisions in a form suitable to be piped int
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:22
+#: en/git-fast-export.txt:23
#, priority:100
-msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a kind of an interactive 'git filter-branch'."
+msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
@@ -19641,146 +19659,158 @@ msgstr ""
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
+#. type: Labeled list
+#: en/git-fast-export.txt:79
+#, ignore-same, no-wrap, priority:100
+msgid "--mark-tags"
+msgstr "--mark-tags"
+
+#. type: Plain text
+#: en/git-fast-export.txt:87
+#, priority:100
+msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
+msgstr ""
+
#. type: Plain text
-#: en/git-fast-export.txt:83
+#: en/git-fast-export.txt:92
#, priority:100
-msgid "Any commits that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
+msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:84
+#: en/git-fast-export.txt:93
#, ignore-same, no-wrap, priority:100
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
-#: en/git-fast-export.txt:89
+#: en/git-fast-export.txt:98
#, priority:100
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:90
+#: en/git-fast-export.txt:99
#, ignore-same, no-wrap, priority:100
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
-#: en/git-fast-export.txt:93
+#: en/git-fast-export.txt:102
#, priority:100
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:94
+#: en/git-fast-export.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
-#: en/git-fast-export.txt:101
+#: en/git-fast-export.txt:110
#, priority:100
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
+#: en/git-fast-export.txt:111 en/git-ls-tree.txt:72
#, ignore-same, no-wrap, priority:100
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
-#: en/git-fast-export.txt:107
+#: en/git-fast-export.txt:116
#, priority:100
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:108
+#: en/git-fast-export.txt:117
#, ignore-same, no-wrap, priority:100
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
-#: en/git-fast-export.txt:112
+#: en/git-fast-export.txt:121
#, priority:100
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:113
+#: en/git-fast-export.txt:122
#, ignore-same, no-wrap, priority:100
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
-#: en/git-fast-export.txt:124
+#: en/git-fast-export.txt:133
#, priority:100
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:125
+#: en/git-fast-export.txt:134
#, ignore-same, no-wrap, priority:100
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
-#: en/git-fast-export.txt:131
+#: en/git-fast-export.txt:140
#, priority:100
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:132
+#: en/git-fast-export.txt:141
#, no-wrap, priority:100
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:138
+#: en/git-fast-export.txt:147
#, priority:100
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be reencoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:139
+#: en/git-fast-export.txt:148
#, ignore-same, no-wrap, priority:100
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
-#: en/git-fast-export.txt:142
+#: en/git-fast-export.txt:151
#, priority:100
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:143
+#: en/git-fast-export.txt:152
#, ignore-ellipsis, no-wrap, priority:100
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:160
#, priority:100
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:157
+#: en/git-fast-export.txt:166
#, no-wrap, priority:100
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:162
+#: en/git-fast-export.txt:171
#, priority:100
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:167
+#: en/git-fast-export.txt:176
#, no-wrap, priority:100
msgid ""
"$ git fast-export master~5..master |\n"
@@ -19789,55 +19819,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:180
#, priority:100
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:175
+#: en/git-fast-export.txt:184
#, priority:100
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
-#: en/git-fast-export.txt:178
+#: en/git-fast-export.txt:187
#, no-wrap, priority:100
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:186
+#: en/git-fast-export.txt:195
#, priority:100
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:198
+#: en/git-fast-export.txt:207
#, priority:100
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:201
+#: en/git-fast-export.txt:210
#, priority:100
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:204
+#: en/git-fast-export.txt:213
#, no-wrap, priority:100
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:209
+#: en/git-fast-export.txt:218
#, priority:100
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:215
+#: en/git-fast-export.txt:224
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git init anon-repo\n"
@@ -19847,25 +19877,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:222
+#: en/git-fast-export.txt:231
#, priority:100
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:225
+#: en/git-fast-export.txt:234
#, no-wrap, priority:100
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:240
#, priority:100
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:239
+#: en/git-fast-export.txt:248
#, priority:100
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
@@ -20099,7 +20129,7 @@ msgid "See linkgit:git-config[1]"
msgstr "linkgit:git-config[1]"
#. type: Title -
-#: en/git-fast-import.txt:144 en/git-p4.txt:507
+#: en/git-fast-import.txt:144 en/git-filter-branch.txt:463 en/git-p4.txt:507
#, no-wrap, priority:100
msgid "PERFORMANCE"
msgstr ""
@@ -20333,7 +20363,7 @@ msgid "fast-import accepts several commands to update the current repository and
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:319 en/git-fast-import.txt:381
+#: en/git-fast-import.txt:319 en/git-fast-import.txt:388
#, ignore-same, no-wrap, priority:100
msgid "`commit`"
msgstr "`commit`"
@@ -20345,7 +20375,7 @@ msgid "Creates a new branch or updates an existing branch by creating a new comm
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:324 en/git-fast-import.txt:771
+#: en/git-fast-import.txt:324 en/git-fast-import.txt:778
#, ignore-same, no-wrap, priority:100
msgid "`tag`"
msgstr "`tag`"
@@ -20357,7 +20387,7 @@ msgid "Creates an annotated tag object from an existing commit or branch. Light
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:330 en/git-fast-import.txt:815
+#: en/git-fast-import.txt:330 en/git-fast-import.txt:823
#, ignore-same, no-wrap, priority:100
msgid "`reset`"
msgstr "`reset`"
@@ -20369,7 +20399,7 @@ msgid "Reset an existing branch (or a new branch) to a specific revision. This
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:335 en/git-fast-import.txt:844
+#: en/git-fast-import.txt:335 en/git-fast-import.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`blob`"
msgstr "`blob`"
@@ -20381,109 +20411,121 @@ msgid "Convert raw file data into a blob, for future use in a `commit` command.
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:340 en/git-fast-import.txt:917
+#: en/git-fast-import.txt:340 en/git-fast-import.txt:925
+#, ignore-same, no-wrap, priority:100
+msgid "`alias`"
+msgstr "`alias`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:346
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
+msgstr ""
+
+#. type: Title ~
+#: en/git-fast-import.txt:347 en/git-fast-import.txt:940
#, ignore-same, no-wrap, priority:100
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
-#: en/git-fast-import.txt:345
+#: en/git-fast-import.txt:352
#, priority:100
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:346 en/git-fast-import.txt:945
+#: en/git-fast-import.txt:353 en/git-fast-import.txt:968
#, ignore-same, no-wrap, priority:100
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
-#: en/git-fast-import.txt:350
+#: en/git-fast-import.txt:357
#, priority:100
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:351 en/git-fast-import.txt:1152
+#: en/git-fast-import.txt:358 en/git-fast-import.txt:1175
#, ignore-same, no-wrap, priority:100
msgid "`done`"
msgstr "`done`"
#. type: Plain text
-#: en/git-fast-import.txt:355
+#: en/git-fast-import.txt:362
#, priority:100
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:356 en/git-fast-import.txt:970
+#: en/git-fast-import.txt:363 en/git-fast-import.txt:993
#, ignore-same, no-wrap, priority:100
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
-#: en/git-fast-import.txt:360
+#: en/git-fast-import.txt:367
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:361 en/git-fast-import.txt:985
+#: en/git-fast-import.txt:368 en/git-fast-import.txt:1008
#, ignore-same, no-wrap, priority:100
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
-#: en/git-fast-import.txt:365
+#: en/git-fast-import.txt:372
#, priority:100
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:366 en/git-fast-import.txt:1016
+#: en/git-fast-import.txt:373 en/git-fast-import.txt:1039
#, ignore-same, no-wrap, priority:100
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
-#: en/git-fast-import.txt:370
+#: en/git-fast-import.txt:377
#, priority:100
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:371 en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:378 en/git-fast-import.txt:1092
#, ignore-same, no-wrap, priority:100
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
#, priority:100
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:1124
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:1147
#, ignore-same, no-wrap, priority:100
msgid "`option`"
msgstr "`option`"
#. type: Plain text
-#: en/git-fast-import.txt:379
+#: en/git-fast-import.txt:386
#, priority:100
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:384
+#: en/git-fast-import.txt:391
#, priority:100
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
#, no-wrap, priority:100
msgid ""
"\t'commit' SP <ref> LF\n"
@@ -20494,247 +20536,247 @@ msgid ""
"\t('encoding' SP <encoding>)?\n"
"\tdata\n"
"\t('from' SP <commit-ish> LF)?\n"
-"\t('merge' SP <commit-ish> LF)?\n"
+"\t('merge' SP <commit-ish> LF)*\n"
"\t(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*\n"
"\tLF?\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:405
+#: en/git-fast-import.txt:412
#, priority:100
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:411
+#: en/git-fast-import.txt:418
#, priority:100
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:417
+#: en/git-fast-import.txt:424
#, priority:100
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:425
+#: en/git-fast-import.txt:432
#, priority:100
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:432
+#: en/git-fast-import.txt:439
#, priority:100
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:434
+#: en/git-fast-import.txt:441
#, ignore-same, no-wrap, priority:100
msgid "`author`"
msgstr "`author`"
#. type: Plain text
-#: en/git-fast-import.txt:440
+#: en/git-fast-import.txt:447
#, priority:100
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:442
+#: en/git-fast-import.txt:449
#, ignore-same, no-wrap, priority:100
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
-#: en/git-fast-import.txt:445
+#: en/git-fast-import.txt:452
#, priority:100
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
#, priority:100
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:458
+#: en/git-fast-import.txt:465
#, priority:100
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:460
+#: en/git-fast-import.txt:467
#, ignore-same, no-wrap, priority:100
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
-#: en/git-fast-import.txt:464
+#: en/git-fast-import.txt:471
#, priority:100
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:466
+#: en/git-fast-import.txt:473
#, ignore-same, no-wrap, priority:100
msgid "`from`"
msgstr "`from`"
#. type: Plain text
-#: en/git-fast-import.txt:472
+#: en/git-fast-import.txt:479
#, priority:100
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
#, priority:100
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:485
+#: en/git-fast-import.txt:492
#, priority:100
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
#, priority:100
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:491
+#: en/git-fast-import.txt:498
#, priority:100
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:493
+#: en/git-fast-import.txt:500
#, priority:100
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:499
+#: en/git-fast-import.txt:506
#, priority:100
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:501
+#: en/git-fast-import.txt:508
#, priority:100
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:503
+#: en/git-fast-import.txt:510
#, priority:100
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
#, priority:100
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:509
+#: en/git-fast-import.txt:516
#, priority:100
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:512
+#: en/git-fast-import.txt:519
#, priority:100
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
#, no-wrap, priority:100
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:521
+#: en/git-fast-import.txt:528
#, priority:100
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:523
+#: en/git-fast-import.txt:530
#, ignore-same, no-wrap, priority:100
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
-#: en/git-fast-import.txt:531
+#: en/git-fast-import.txt:538
#, priority:100
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:534
+#: en/git-fast-import.txt:541
#, priority:100
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:536
+#: en/git-fast-import.txt:543
#, ignore-same, no-wrap, priority:100
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:540
+#: en/git-fast-import.txt:547
#, priority:100
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:541 en/git-fast-import.txt:708
+#: en/git-fast-import.txt:548 en/git-fast-import.txt:715
#, no-wrap, priority:100
msgid "External data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:544
+#: en/git-fast-import.txt:551
#, priority:100
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:547
+#: en/git-fast-import.txt:554
#, no-wrap, priority:100
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
#, priority:100
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:555 en/git-fast-import.txt:721
+#: en/git-fast-import.txt:562 en/git-fast-import.txt:728
#, no-wrap, priority:100
msgid "Inline data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:559
+#: en/git-fast-import.txt:566
#, priority:100
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
#, no-wrap, priority:100
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -20742,259 +20784,259 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:566 en/git-fast-import.txt:732
+#: en/git-fast-import.txt:573 en/git-fast-import.txt:739
#, priority:100
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:569
+#: en/git-fast-import.txt:576
#, priority:100
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
#, priority:100
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:574
+#: en/git-fast-import.txt:581
#, priority:100
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:575
+#: en/git-fast-import.txt:582
#, priority:100
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
#, priority:100
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:580
+#: en/git-fast-import.txt:587
#, priority:100
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:583
+#: en/git-fast-import.txt:590
#, priority:100
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:587
+#: en/git-fast-import.txt:594
#, priority:100
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:594
+#: en/git-fast-import.txt:601
#, priority:100
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
#, priority:100
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:598
+#: en/git-fast-import.txt:605
#, priority:100
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:599
+#: en/git-fast-import.txt:606
#, priority:100
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:600
+#: en/git-fast-import.txt:607
#, priority:100
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:602
+#: en/git-fast-import.txt:609
#, priority:100
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:604
+#: en/git-fast-import.txt:611
#, priority:100
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:606
+#: en/git-fast-import.txt:613
#, priority:100
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:608
+#: en/git-fast-import.txt:615
#, ignore-same, no-wrap, priority:100
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
-#: en/git-fast-import.txt:614
+#: en/git-fast-import.txt:621
#, priority:100
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
#, no-wrap, priority:100
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
#, priority:100
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:624
+#: en/git-fast-import.txt:631
#, ignore-same, no-wrap, priority:100
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
#, priority:100
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:632
+#: en/git-fast-import.txt:639
#, no-wrap, priority:100
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:638 en/git-fast-import.txt:658
+#: en/git-fast-import.txt:645 en/git-fast-import.txt:665
#, priority:100
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:643
+#: en/git-fast-import.txt:650
#, priority:100
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:645
+#: en/git-fast-import.txt:652
#, ignore-same, no-wrap, priority:100
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
-#: en/git-fast-import.txt:649
+#: en/git-fast-import.txt:656
#, priority:100
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:652
+#: en/git-fast-import.txt:659
#, no-wrap, priority:100
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:663
+#: en/git-fast-import.txt:670
#, priority:100
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:672
+#: en/git-fast-import.txt:679
#, priority:100
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
-#: en/git-fast-import.txt:679
+#: en/git-fast-import.txt:686
#, priority:100
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:682
+#: en/git-fast-import.txt:689
#, no-wrap, priority:100
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:688
+#: en/git-fast-import.txt:695
#, priority:100
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:696
+#: en/git-fast-import.txt:703
#, priority:100
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:698
+#: en/git-fast-import.txt:705
#, ignore-same, no-wrap, priority:100
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:707
+#: en/git-fast-import.txt:714
#, priority:100
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:712
+#: en/git-fast-import.txt:719
#, priority:100
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:715
+#: en/git-fast-import.txt:722
#, no-wrap, priority:100
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:720
+#: en/git-fast-import.txt:727
#, priority:100
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:725
+#: en/git-fast-import.txt:732
#, priority:100
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:729
+#: en/git-fast-import.txt:736
#, no-wrap, priority:100
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -21002,76 +21044,77 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:735
+#: en/git-fast-import.txt:742
#, priority:100
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:737
+#: en/git-fast-import.txt:744
#, ignore-same, no-wrap, priority:100
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
-#: en/git-fast-import.txt:743
+#: en/git-fast-import.txt:750
#, priority:100
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:746
+#: en/git-fast-import.txt:753
#, no-wrap, priority:100
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:752
+#: en/git-fast-import.txt:759
#, priority:100
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:756
+#: en/git-fast-import.txt:763
#, priority:100
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:758
+#: en/git-fast-import.txt:765
#, ignore-same, no-wrap, priority:100
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
-#: en/git-fast-import.txt:763
+#: en/git-fast-import.txt:770
#, priority:100
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:766
+#: en/git-fast-import.txt:773
#, no-wrap, priority:100
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:769
+#: en/git-fast-import.txt:776
#, priority:100
msgid "where `<object-identifer>` is any string not containing LF."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:774
+#: en/git-fast-import.txt:781
#, priority:100
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:781
+#: en/git-fast-import.txt:789
#, no-wrap, priority:100
msgid ""
"\t'tag' SP <name> LF\n"
+"\tmark?\n"
"\t'from' SP <commit-ish> LF\n"
"\toriginal-oid?\n"
"\t'tagger' (SP <name>)? SP LT <email> GT SP <when> LF\n"
@@ -21079,55 +21122,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:784
+#: en/git-fast-import.txt:792
#, priority:100
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:789
+#: en/git-fast-import.txt:797
#, priority:100
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:793
+#: en/git-fast-import.txt:801
#, priority:100
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:796
+#: en/git-fast-import.txt:804
#, priority:100
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:799
+#: en/git-fast-import.txt:807
#, priority:100
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:813
#, priority:100
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:813
+#: en/git-fast-import.txt:821
#, priority:100
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:820
+#: en/git-fast-import.txt:828
#, priority:100
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:825
+#: en/git-fast-import.txt:833
#, no-wrap, priority:100
msgid ""
"\t'reset' SP <ref> LF\n"
@@ -21136,25 +21179,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:829
+#: en/git-fast-import.txt:837
#, priority:100
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:831 en/git-fast-import.txt:943
+#: en/git-fast-import.txt:839 en/git-fast-import.txt:966
#, priority:100
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:834
+#: en/git-fast-import.txt:842
#, priority:100
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:838
+#: en/git-fast-import.txt:846
#, no-wrap, priority:100
msgid ""
"\treset refs/tags/938\n"
@@ -21162,19 +21205,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:850
#, priority:100
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:849
+#: en/git-fast-import.txt:857
#, priority:100
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:855
+#: en/git-fast-import.txt:863
#, no-wrap, priority:100
msgid ""
"\t'blob' LF\n"
@@ -21184,43 +21227,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:861
+#: en/git-fast-import.txt:869
#, priority:100
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:871
#, ignore-same, no-wrap, priority:100
msgid "`data`"
msgstr "`data`"
#. type: Plain text
-#: en/git-fast-import.txt:870
+#: en/git-fast-import.txt:878
#, priority:100
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:875
+#: en/git-fast-import.txt:883
#, priority:100
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:876
+#: en/git-fast-import.txt:884
#, no-wrap, priority:100
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:878
+#: en/git-fast-import.txt:886
#, priority:100
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:882
+#: en/git-fast-import.txt:890
#, no-wrap, priority:100
msgid ""
"\t'data' SP <count> LF\n"
@@ -21228,31 +21271,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:888
+#: en/git-fast-import.txt:896
#, priority:100
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:893
+#: en/git-fast-import.txt:901
#, priority:100
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:894
+#: en/git-fast-import.txt:902
#, no-wrap, priority:100
msgid "Delimited format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:899
+#: en/git-fast-import.txt:907
#, priority:100
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:905
+#: en/git-fast-import.txt:913
#, no-wrap, priority:100
msgid ""
"\t'data' SP '<<' <delim> LF\n"
@@ -21262,25 +21305,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:921
#, priority:100
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:915
+#: en/git-fast-import.txt:923
#, priority:100
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:920
+#: en/git-fast-import.txt:928
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object."
+msgstr ""
+
+#. type: delimited block .
+#: en/git-fast-import.txt:934
+#, no-wrap, priority:100
+msgid ""
+"\t'alias' LF\n"
+"\tmark\n"
+"\t'to' SP <commit-ish> LF\n"
+"\tLF?\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:937
+#, priority:100
+msgid "For a detailed description of `<commit-ish>` see above under `from`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:943
#, priority:100
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:924
+#: en/git-fast-import.txt:947
#, no-wrap, priority:100
msgid ""
"\t'checkpoint' LF\n"
@@ -21288,31 +21353,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:930
+#: en/git-fast-import.txt:953
#, priority:100
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:935
+#: en/git-fast-import.txt:958
#, priority:100
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:941
+#: en/git-fast-import.txt:964
#, priority:100
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:950
+#: en/git-fast-import.txt:973
#, priority:100
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:954
+#: en/git-fast-import.txt:977
#, no-wrap, priority:100
msgid ""
"\t'progress' SP <any> LF\n"
@@ -21320,67 +21385,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:960
+#: en/git-fast-import.txt:983
#, priority:100
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:986
#, no-wrap, priority:100
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:968
+#: en/git-fast-import.txt:991
#, priority:100
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:976
+#: en/git-fast-import.txt:999
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:979
+#: en/git-fast-import.txt:1002
#, no-wrap, priority:100
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:983 en/git-fast-import.txt:1014 en/git-fast-import.txt:1067
+#: en/git-fast-import.txt:1006 en/git-fast-import.txt:1037 en/git-fast-import.txt:1090
#, priority:100
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:991
+#: en/git-fast-import.txt:1014
#, priority:100
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:994
+#: en/git-fast-import.txt:1017
#, no-wrap, priority:100
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1022
#, priority:100
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:1024
#, priority:100
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1005
+#: en/git-fast-import.txt:1028
#, no-wrap, priority:100
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21388,283 +21453,283 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1011
+#: en/git-fast-import.txt:1034
#, priority:100
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1022
+#: en/git-fast-import.txt:1045
#, priority:100
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1025
+#: en/git-fast-import.txt:1048
#, priority:100
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1049
#, no-wrap, priority:100
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1030
+#: en/git-fast-import.txt:1053
#, priority:100
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1033
+#: en/git-fast-import.txt:1056
#, no-wrap, priority:100
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1035
+#: en/git-fast-import.txt:1058
#, no-wrap, priority:100
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1041
+#: en/git-fast-import.txt:1064
#, priority:100
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1044
+#: en/git-fast-import.txt:1067
#, no-wrap, priority:100
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1047
+#: en/git-fast-import.txt:1070
#, priority:100
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1072
#, priority:100
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1075
#, no-wrap, priority:100
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1080
#, priority:100
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1060
+#: en/git-fast-import.txt:1083
#, priority:100
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1086
#, no-wrap, priority:100
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1072
+#: en/git-fast-import.txt:1095
#, priority:100
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1075
+#: en/git-fast-import.txt:1098
#, no-wrap, priority:100
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1078
+#: en/git-fast-import.txt:1101
#, priority:100
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1079 en/git-fast-import.txt:1146
+#: en/git-fast-import.txt:1102 en/git-fast-import.txt:1169
#, no-wrap, priority:100
msgid "date-format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1080 en/git-fast-import.txt:1148
+#: en/git-fast-import.txt:1103 en/git-fast-import.txt:1171
#, no-wrap, priority:100
msgid "export-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1081
+#: en/git-fast-import.txt:1104
#, no-wrap, priority:100
msgid "relative-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1082
+#: en/git-fast-import.txt:1105
#, fuzzy, no-wrap, priority:100
msgid "no-relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
-#: en/git-fast-import.txt:1083 en/git-fast-import.txt:1150
+#: en/git-fast-import.txt:1106 en/git-fast-import.txt:1173
#, no-wrap, priority:100
msgid "force"
msgstr "極�龜戟�畇龜�筠剋�戟棘"
#. type: Plain text
-#: en/git-fast-import.txt:1087
+#: en/git-fast-import.txt:1110
#, priority:100
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1088 en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1111 en/git-fast-import.txt:1170
#, no-wrap, priority:100
msgid "import-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1089
+#: en/git-fast-import.txt:1112
#, no-wrap, priority:100
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1097
+#: en/git-fast-import.txt:1120
#, priority:100
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1098
+#: en/git-fast-import.txt:1121
#, fuzzy, no-wrap, priority:100
msgid "get-mark"
msgstr "`get-mark`"
#. type: Labeled list
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1122
#, fuzzy, no-wrap, priority:100
msgid "cat-blob"
msgstr "`cat-blob`"
#. type: Labeled list
-#: en/git-fast-import.txt:1100
+#: en/git-fast-import.txt:1123
#, no-wrap, priority:100
msgid "ls"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1108
+#: en/git-fast-import.txt:1131
#, priority:100
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1109
+#: en/git-fast-import.txt:1132
#, no-wrap, priority:100
msgid "notes"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1114
+#: en/git-fast-import.txt:1137
#, priority:100
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1138
#, no-wrap, priority:100
msgid "done"
msgstr "均棘�棘勻棘"
#. type: Plain text
-#: en/git-fast-import.txt:1122
+#: en/git-fast-import.txt:1145
#, priority:100
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1129
+#: en/git-fast-import.txt:1152
#, priority:100
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1132
+#: en/git-fast-import.txt:1155
#, no-wrap, priority:100
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1137
+#: en/git-fast-import.txt:1160
#, priority:100
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1141
+#: en/git-fast-import.txt:1164
#, priority:100
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1144
+#: en/git-fast-import.txt:1167
#, priority:100
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1149
+#: en/git-fast-import.txt:1172
#, priority:100
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1178
#, priority:100
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1159
+#: en/git-fast-import.txt:1182
#, priority:100
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1161
+#: en/git-fast-import.txt:1184
#, no-wrap, priority:100
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1168
+#: en/git-fast-import.txt:1191
#, priority:100
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1175
+#: en/git-fast-import.txt:1198
#, priority:100
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1203
#, no-wrap, priority:100
msgid ""
"\tmkfifo fast-import-output\n"
@@ -21673,49 +21738,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1184
+#: en/git-fast-import.txt:1207
#, priority:100
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1188
+#: en/git-fast-import.txt:1211
#, priority:100
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1213
#, no-wrap, priority:100
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1196
+#: en/git-fast-import.txt:1219
#, priority:100
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1203
+#: en/git-fast-import.txt:1226
#, priority:100
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1211
+#: en/git-fast-import.txt:1234
#, priority:100
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1236
#, priority:100
msgid "An example crash:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1229
+#: en/git-fast-import.txt:1252
#, no-wrap, priority:100
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
@@ -21735,7 +21800,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1256
#, no-wrap, priority:100
msgid ""
"\t$ git fast-import <in\n"
@@ -21744,7 +21809,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1239
+#: en/git-fast-import.txt:1262
#, no-wrap, priority:100
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
@@ -21755,13 +21820,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1241
+#: en/git-fast-import.txt:1264
#, no-wrap, priority:100
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1251
+#: en/git-fast-import.txt:1274
#, no-wrap, priority:100
msgid ""
"\tMost Recent Commands Before Crash\n"
@@ -21776,13 +21841,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1252
+#: en/git-fast-import.txt:1275
#, no-wrap, priority:100
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1255
+#: en/git-fast-import.txt:1278
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
@@ -21790,25 +21855,25 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1256
+#: en/git-fast-import.txt:1279
#, no-wrap, priority:100
msgid "active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1259
+#: en/git-fast-import.txt:1282
#, priority:100
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1260
+#: en/git-fast-import.txt:1283
#, priority:100
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1264
+#: en/git-fast-import.txt:1287
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
@@ -21817,7 +21882,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1270
+#: en/git-fast-import.txt:1293
#, no-wrap, priority:100
msgid ""
"status : active loaded dirty\n"
@@ -21829,307 +21894,307 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1274
+#: en/git-fast-import.txt:1297
#, priority:100
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1277
+#: en/git-fast-import.txt:1300
#, no-wrap, priority:100
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1280
+#: en/git-fast-import.txt:1303
#, priority:100
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1282
+#: en/git-fast-import.txt:1305
#, no-wrap, priority:100
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1290
+#: en/git-fast-import.txt:1313
#, priority:100
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1294
+#: en/git-fast-import.txt:1317
#, priority:100
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1296
+#: en/git-fast-import.txt:1319
#, no-wrap, priority:100
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1301
+#: en/git-fast-import.txt:1324
#, priority:100
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1305
+#: en/git-fast-import.txt:1328
#, priority:100
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1307
+#: en/git-fast-import.txt:1330
#, no-wrap, priority:100
msgid "Handling Renames"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1312
+#: en/git-fast-import.txt:1335
#, priority:100
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1337
#, no-wrap, priority:100
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1341
#, priority:100
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1325
+#: en/git-fast-import.txt:1348
#, priority:100
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1331
+#: en/git-fast-import.txt:1354
#, priority:100
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1337
+#: en/git-fast-import.txt:1360
#, priority:100
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1363
#, priority:100
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1342
+#: en/git-fast-import.txt:1365
#, no-wrap, priority:100
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1346
+#: en/git-fast-import.txt:1369
#, priority:100
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1353
+#: en/git-fast-import.txt:1376
#, priority:100
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1358
+#: en/git-fast-import.txt:1381
#, priority:100
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1360
+#: en/git-fast-import.txt:1383
#, no-wrap, priority:100
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1367
+#: en/git-fast-import.txt:1390
#, priority:100
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1369
+#: en/git-fast-import.txt:1392
#, no-wrap, priority:100
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1399
#, priority:100
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1379
+#: en/git-fast-import.txt:1402
#, no-wrap, priority:100
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1385
+#: en/git-fast-import.txt:1408
#, priority:100
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1393
+#: en/git-fast-import.txt:1416
#, priority:100
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1423
#, priority:100
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1407
+#: en/git-fast-import.txt:1430
#, priority:100
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1415
+#: en/git-fast-import.txt:1438
#, priority:100
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1417
+#: en/git-fast-import.txt:1440
#, no-wrap, priority:100
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1423
+#: en/git-fast-import.txt:1446
#, priority:100
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1448
#, no-wrap, priority:100
msgid "per object"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1432
+#: en/git-fast-import.txt:1455
#, priority:100
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1438
+#: en/git-fast-import.txt:1461
#, priority:100
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1440
+#: en/git-fast-import.txt:1463
#, no-wrap, priority:100
msgid "per mark"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1446
+#: en/git-fast-import.txt:1469
#, priority:100
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1448
+#: en/git-fast-import.txt:1471
#, no-wrap, priority:100
msgid "per branch"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1474
#, priority:100
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1457
+#: en/git-fast-import.txt:1480
#, priority:100
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1464
+#: en/git-fast-import.txt:1487
#, priority:100
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1468
+#: en/git-fast-import.txt:1491
#, priority:100
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1496
#, priority:100
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1498
#, no-wrap, priority:100
msgid "per active tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1480
+#: en/git-fast-import.txt:1503
#, priority:100
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1482
+#: en/git-fast-import.txt:1505
#, no-wrap, priority:100
msgid "per active file entry"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1488
+#: en/git-fast-import.txt:1511
#, priority:100
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1493
+#: en/git-fast-import.txt:1516
#, priority:100
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1495
+#: en/git-fast-import.txt:1518
#, no-wrap, priority:100
msgid "SIGNALS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1501
+#: en/git-fast-import.txt:1524
#, priority:100
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -22690,7 +22755,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1041
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -22806,20 +22871,32 @@ msgid ""
"\t[--state-branch <branch>] [--] [<rev-list options>...]\n"
msgstr ""
+#. type: Title -
+#: en/git-filter-branch.txt:20
+#, no-wrap, priority:100
+msgid "WARNING"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:31
+#, priority:100
+msgid "'git filter-branch' has a plethora of pitfalls that can produce non-obvious manglings of the intended history rewrite (and can leave you with little time to investigate such problems since it has such abysmal performance). These safety and performance issues cannot be backward compatibly fixed and as such, its use is not recommended. Please use an alternative history filtering tool such as https://github.com/newren/git-filter-repo/[git filter-repo]. If you still need to use 'git filter-branch', please carefully read <<SAFETY>> (and <<PERFORMANCE>>) to learn about the land mines of filter-branch, and then vigilantly avoid as many of the hazards listed there as reasonably possible."
+msgstr ""
+
#. type: Plain text
-#: en/git-filter-branch.txt:27
+#: en/git-filter-branch.txt:40
#, priority:100
msgid "Lets you rewrite Git revision history by rewriting the branches mentioned in the <rev-list options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge information) will be preserved."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:34
+#: en/git-filter-branch.txt:47
#, priority:100
msgid "The command will only rewrite the _positive_ refs mentioned in the command line (e.g. if you pass 'a..b', only 'b' will be rewritten). If you specify no filters, the commits will be recommitted without any changes, which would normally have no effect. Nevertheless, this may be useful in the future for compensating for some Git bugs or such, therefore such a usage is permitted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:39
+#: en/git-filter-branch.txt:52
#, no-wrap, priority:100
msgid ""
"*NOTE*: This command honors `.git/info/grafts` file and refs in\n"
@@ -22829,7 +22906,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:48
+#: en/git-filter-branch.txt:61
#, no-wrap, priority:100
msgid ""
"*WARNING*! The rewritten history will have different object names for all\n"
@@ -22843,337 +22920,337 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:52
+#: en/git-filter-branch.txt:65
#, priority:100
msgid "Always verify that the rewritten version is correct: The original refs, if different from the rewritten ones, will be stored in the namespace 'refs/original/'."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:56
+#: en/git-filter-branch.txt:69
#, priority:100
msgid "Note that since this operation is very I/O expensive, it might be a good idea to redirect the temporary directory off-disk with the `-d` option, e.g. on tmpfs. Reportedly the speedup is very noticeable."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:59
+#: en/git-filter-branch.txt:72
#, no-wrap, priority:100
msgid "Filters"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:71
+#: en/git-filter-branch.txt:84
#, priority:100
msgid "The filters are applied in the order as listed below. The <command> argument is always evaluated in the shell context using the 'eval' command (with the notable exception of the commit filter, for technical reasons). Prior to that, the `$GIT_COMMIT` environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, and GIT_COMMITTER_DATE are taken from the current commit and exported to the environment, in order to affect the author and committer identities of the replacement commit created by linkgit:git-commit-tree[1] after the filters have run."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:74
+#: en/git-filter-branch.txt:87
#, priority:100
msgid "If any evaluation of <command> returns a non-zero exit status, the whole operation will be aborted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:80
+#: en/git-filter-branch.txt:93
#, priority:100
msgid "A 'map' function is available that takes an \"original sha1 id\" argument and outputs a \"rewritten sha1 id\" if the commit has been already rewritten, and \"original sha1 id\" otherwise; the 'map' function can return several ids on separate lines if your commit filter emitted multiple commits."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:85
+#: en/git-filter-branch.txt:98
#, no-wrap, priority:100
msgid "--setup <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:91
+#: en/git-filter-branch.txt:104
#, priority:100
msgid "This is not a real filter executed for each commit but a one time setup just before the loop. Therefore no commit-specific variables are defined yet. Functions or variables defined here can be used or modified in the following filter steps except the commit filter, for technical reasons."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:92
+#: en/git-filter-branch.txt:105
#, no-wrap, priority:100
msgid "--subdirectory-filter <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:96
+#: en/git-filter-branch.txt:109
#, priority:100
msgid "Only look at the history which touches the given subdirectory. The result will contain that directory (and only that) as its project root. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:97
+#: en/git-filter-branch.txt:110
#, no-wrap, priority:100
msgid "--env-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:102
+#: en/git-filter-branch.txt:115
#, priority:100
msgid "This filter may be used if you only need to modify the environment in which the commit will be performed. Specifically, you might want to rewrite the author/committer name/email/time environment variables (see linkgit:git-commit-tree[1] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:103
+#: en/git-filter-branch.txt:116
#, no-wrap, priority:100
msgid "--tree-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:110
+#: en/git-filter-branch.txt:123
#, priority:100
msgid "This is the filter for rewriting the tree and its contents. The argument is evaluated in shell with the working directory set to the root of the checked out tree. The new tree is then used as-is (new files are auto-added, disappeared files are auto-removed - neither .gitignore files nor any other ignore rules *HAVE ANY EFFECT*!)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:111
+#: en/git-filter-branch.txt:124
#, no-wrap, priority:100
msgid "--index-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:117
+#: en/git-filter-branch.txt:130
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the index. It is similar to the tree filter but does not check out the tree, which makes it much faster. Frequently used with `git rm --cached --ignore-unmatch ...`, see EXAMPLES below. For hairy cases, see linkgit:git-update-index[1]."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:118
+#: en/git-filter-branch.txt:131
#, no-wrap, priority:100
msgid "--parent-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:125
+#: en/git-filter-branch.txt:138
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the commit's parent list. It will receive the parent string on stdin and shall output the new parent string on stdout. The parent string is in the format described in linkgit:git-commit-tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and \"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:126
+#: en/git-filter-branch.txt:139
#, no-wrap, priority:100
msgid "--msg-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:131
+#: en/git-filter-branch.txt:144
#, priority:100
msgid "This is the filter for rewriting the commit messages. The argument is evaluated in the shell with the original commit message on standard input; its standard output is used as the new commit message."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:132
+#: en/git-filter-branch.txt:145
#, no-wrap, priority:100
msgid "--commit-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:138
+#: en/git-filter-branch.txt:151
#, ignore-ellipsis, priority:100
msgid "This is the filter for performing the commit. If this filter is specified, it will be called instead of the 'git commit-tree' command, with arguments of the form \"<TREE_ID> [(-p <PARENT_COMMIT_ID>)...]\" and the log message on stdin. The commit id is expected on stdout."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:142
+#: en/git-filter-branch.txt:155
#, priority:100
msgid "As a special extension, the commit filter may emit multiple commit ids; in that case, the rewritten children of the original commit will have all of them as parents."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:147
+#: en/git-filter-branch.txt:160
#, priority:100
msgid "You can use the 'map' convenience function in this filter, and other convenience functions, too. For example, calling 'skip_commit \"$@\"' will leave out the current commit (but not its changes! If you want that, use 'git rebase' instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:151
+#: en/git-filter-branch.txt:164
#, priority:100
msgid "You can also use the `git_commit_non_empty_tree \"$@\"` instead of `git commit-tree \"$@\"` if you don't wish to keep commits with a single parent and that makes no change to the tree."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:152
+#: en/git-filter-branch.txt:165
#, no-wrap, priority:100
msgid "--tag-name-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:158
+#: en/git-filter-branch.txt:171
#, priority:100
msgid "This is the filter for rewriting tag names. When passed, it will be called for every tag ref that points to a rewritten object (or to a tag object which points to a rewritten object). The original tag name is passed via standard input, and the new tag name is expected on standard output."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:163
+#: en/git-filter-branch.txt:176
#, priority:100
msgid "The original tags are not deleted, but can be overwritten; use \"--tag-name-filter cat\" to simply update the tags. In this case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:174
+#: en/git-filter-branch.txt:187
#, priority:100
msgid "Nearly proper rewriting of tag objects is supported. If the tag has a message attached, a new tag object will be created with the same message, author, and timestamp. If the tag has a signature attached, the signature will be stripped. It is by definition impossible to preserve signatures. The reason this is \"nearly\" proper, is because ideally if the tag did not change (points to the same object, has the same name, etc.) it should retain any signature. That is not the case, signatures will always be removed, buyer beware. There is also no support for changing the author or timestamp (or the tag message for that matter). Tags which point to other tags will be rewritten to point to the underlying commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:175
+#: en/git-filter-branch.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--prune-empty"
msgstr "--prune-empty"
#. type: Plain text
-#: en/git-filter-branch.txt:182
+#: en/git-filter-branch.txt:195
#, priority:100
msgid "Some filters will generate empty commits that leave the tree untouched. This option instructs git-filter-branch to remove such commits if they have exactly one or zero non-pruned parents; merge commits will therefore remain intact. This option cannot be used together with `--commit-filter`, though the same effect can be achieved by using the provided `git_commit_non_empty_tree` function in a commit filter."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:183
+#: en/git-filter-branch.txt:196
#, no-wrap, priority:100
msgid "--original <namespace>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:186
+#: en/git-filter-branch.txt:199
#, priority:100
msgid "Use this option to set the namespace where the original commits will be stored. The default value is 'refs/original'."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:187
+#: en/git-filter-branch.txt:200
#, no-wrap, priority:100
msgid "-d <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:194
+#: en/git-filter-branch.txt:207
#, priority:100
msgid "Use this option to set the path to the temporary directory used for rewriting. When applying a tree filter, the command needs to temporarily check out the tree to some directory, which may consume considerable space in case of large projects. By default it does this in the `.git-rewrite/` directory but you can override that choice by this parameter."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:200
+#: en/git-filter-branch.txt:213
#, priority:100
msgid "'git filter-branch' refuses to start with an existing temporary directory or when there are already refs starting with 'refs/original/', unless forced."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:201
+#: en/git-filter-branch.txt:214
#, no-wrap, priority:100
msgid "--state-branch <branch>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:206
+#: en/git-filter-branch.txt:219
#, priority:100
msgid "This option will cause the mapping from old to new objects to be loaded from named branch upon startup and saved as a new commit to that branch upon exit, enabling incremental of large trees. If '<branch>' does not exist it will be created."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:207
+#: en/git-filter-branch.txt:220
#, ignore-ellipsis, no-wrap, priority:100
msgid "<rev-list options>..."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:212
+#: en/git-filter-branch.txt:225
#, priority:100
msgid "Arguments for 'git rev-list'. All positive refs included by these options are rewritten. You may also specify options such as `--all`, but you must use `--` to separate them from the 'git filter-branch' options. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:216
+#: en/git-filter-branch.txt:229
#, no-wrap, priority:100
msgid "Remap to ancestor"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:223
+#: en/git-filter-branch.txt:236
#, priority:100
msgid "By using linkgit:git-rev-list[1] arguments, e.g., path limiters, you can limit the set of revisions which get rewritten. However, positive refs on the command line are distinguished: we don't let them be excluded by such limiters. For this purpose, they are instead rewritten to point at the nearest ancestor that was not excluded."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:231
+#: en/git-filter-branch.txt:244
#, priority:100
msgid "On success, the exit status is `0`. If the filter can't find any commits to rewrite, the exit status is `2`. On any other error, the exit status may be any other non-zero value."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:238
+#: en/git-filter-branch.txt:251
#, priority:100
msgid "Suppose you want to remove a file (containing confidential information or copyright violation) from all commits:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:241
+#: en/git-filter-branch.txt:254
#, no-wrap, priority:100
msgid "git filter-branch --tree-filter 'rm filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:246
+#: en/git-filter-branch.txt:259
#, priority:100
msgid "However, if the file is absent from the tree of some commit, a simple `rm filename` will fail for that tree and commit. Thus you may instead want to use `rm -f filename` as the script."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:252
+#: en/git-filter-branch.txt:265
#, priority:100
msgid "Using `--index-filter` with 'git rm' yields a significantly faster version. Like with using `rm filename`, `git rm --cached filename` will fail if the file is absent from the tree of a commit. If you want to \"completely forget\" a file, it does not matter when it entered history, so we also add `--ignore-unmatch`:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:255
+#: en/git-filter-branch.txt:268
#, no-wrap, priority:100
msgid "git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:258
+#: en/git-filter-branch.txt:271
#, priority:100
msgid "Now, you will get the rewritten history saved in HEAD."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:261
+#: en/git-filter-branch.txt:274
#, priority:100
msgid "To rewrite the repository to look as if `foodir/` had been its project root, and discard all other history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:264
+#: en/git-filter-branch.txt:277
#, no-wrap, priority:100
msgid "git filter-branch --subdirectory-filter foodir -- --all\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:269
+#: en/git-filter-branch.txt:282
#, priority:100
msgid "Thus you can, e.g., turn a library subdirectory into a repository of its own. Note the `--` that separates 'filter-branch' options from revision options, and the `--all` to rewrite all branches and tags."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:273
+#: en/git-filter-branch.txt:286
#, priority:100
msgid "To set a commit (which typically is at the tip of another history) to be the parent of the current initial commit, in order to paste the other history behind the current history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:276
+#: en/git-filter-branch.txt:289
#, no-wrap, priority:100
msgid "git filter-branch --parent-filter 'sed \"s/^\\$/-p <graft-id>/\"' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:282
+#: en/git-filter-branch.txt:295
#, priority:100
msgid "(if the parent string is empty - which happens when we are dealing with the initial commit - add graftcommit as a parent). Note that this assumes history with a single root (that is, no merge without common ancestors happened). If this is not the case, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:286
+#: en/git-filter-branch.txt:299
#, no-wrap, priority:100
msgid ""
"git filter-branch --parent-filter \\\n"
@@ -23181,13 +23258,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:289
+#: en/git-filter-branch.txt:302
#, priority:100
msgid "or even simpler:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:293
+#: en/git-filter-branch.txt:306
#, no-wrap, priority:100
msgid ""
"git replace --graft $commit-id $graft-id\n"
@@ -23195,13 +23272,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:296
+#: en/git-filter-branch.txt:309
#, priority:100
msgid "To remove commits authored by \"Darl McBribe\" from the history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:305
+#: en/git-filter-branch.txt:318
#, no-wrap, priority:100
msgid ""
"git filter-branch --commit-filter '\n"
@@ -23214,13 +23291,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:308
+#: en/git-filter-branch.txt:321
#, priority:100
msgid "The function 'skip_commit' is defined as follows:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:320
+#: en/git-filter-branch.txt:333
#, no-wrap, priority:100
msgid ""
"skip_commit()\n"
@@ -23236,13 +23313,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:327
+#: en/git-filter-branch.txt:340
#, priority:100
msgid "The shift magic first throws away the tree id and then the -p parameters. Note that this handles merges properly! In case Darl committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 as their parents instead of the merge commit."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:332
+#: en/git-filter-branch.txt:345
#, no-wrap, priority:100
msgid ""
"*NOTE* the changes introduced by the commits, and which are not reverted\n"
@@ -23252,13 +23329,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:336
+#: en/git-filter-branch.txt:349
#, priority:100
msgid "You can rewrite the commit log messages using `--msg-filter`. For example, 'git svn-id' strings in a repository created by 'git svn' can be removed this way:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:341
+#: en/git-filter-branch.txt:354
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23267,13 +23344,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:345
+#: en/git-filter-branch.txt:358
#, priority:100
msgid "If you need to add 'Acked-by' lines to, say, the last 10 commits (none of which is a merge), use this command:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:351
+#: en/git-filter-branch.txt:364
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23283,13 +23360,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:357
+#: en/git-filter-branch.txt:370
#, priority:100
msgid "The `--env-filter` option can be used to modify committer and/or author identity. For example, if you found out that your commits have the wrong identity due to a misconfigured user.email, you can make a correction, before publishing the project, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:369
+#: en/git-filter-branch.txt:382
#, no-wrap, priority:100
msgid ""
"git filter-branch --env-filter '\n"
@@ -23305,19 +23382,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:375
+#: en/git-filter-branch.txt:388
#, priority:100
msgid "To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will point to the top-most revision that a 'git rev-list' of this range will print."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:377
+#: en/git-filter-branch.txt:390
#, priority:100
msgid "Consider this history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:382
+#: en/git-filter-branch.txt:395
#, no-wrap, priority:100
msgid ""
" D--E--F--G--H\n"
@@ -23326,25 +23403,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:385
+#: en/git-filter-branch.txt:398
#, priority:100
msgid "To rewrite only commits D,E,F,G,H, but leave A, B and C alone, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:388
+#: en/git-filter-branch.txt:401
#, ignore-ellipsis, no-wrap, priority:100
msgid "git filter-branch ... C..H\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:391
+#: en/git-filter-branch.txt:404
#, priority:100
msgid "To rewrite commits E,F,G,H, use one of these:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:395
+#: en/git-filter-branch.txt:408
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"git filter-branch ... C..H --not D\n"
@@ -23352,13 +23429,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:398
+#: en/git-filter-branch.txt:411
#, priority:100
msgid "To move the whole tree into a subdirectory, or remove it from there:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:405
+#: en/git-filter-branch.txt:418
#, no-wrap, priority:100
msgid ""
"git filter-branch --index-filter \\\n"
@@ -23369,87 +23446,279 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-filter-branch.txt:410
+#: en/git-filter-branch.txt:423
#, no-wrap, priority:100
msgid "CHECKLIST FOR SHRINKING A REPOSITORY"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:418
+#: en/git-filter-branch.txt:431
#, priority:100
msgid "git-filter-branch can be used to get rid of a subset of files, usually with some combination of `--index-filter` and `--subdirectory-filter`. People expect the resulting repository to be smaller than the original, but you need a few more steps to actually make it smaller, because Git tries hard not to lose your objects until you tell it to. First make sure that:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:422
+#: en/git-filter-branch.txt:435
#, priority:100
msgid "You really removed all variants of a filename, if a blob was moved over its lifetime. `git log --name-only --follow --all -- filename` can help you find renames."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:425
+#: en/git-filter-branch.txt:438
#, priority:100
msgid "You really filtered all refs: use `--tag-name-filter cat -- --all` when calling git-filter-branch."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:428
+#: en/git-filter-branch.txt:441
#, priority:100
msgid "Then there are two ways to get a smaller repository. A safer way is to clone, that keeps your original intact."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:432
+#: en/git-filter-branch.txt:445
#, priority:100
msgid "Clone it with `git clone file:///path/to/repo`. The clone will not have the removed objects. See linkgit:git-clone[1]. (Note that cloning with a plain path just hardlinks everything!)"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:437
+#: en/git-filter-branch.txt:450
#, priority:100
msgid "If you really don't want to clone it, for whatever reasons, check the following points instead (in this order). This is a very destructive approach, so *make a backup* or go back to cloning it. You have been warned."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:441
+#: en/git-filter-branch.txt:454
#, priority:100
msgid "Remove the original refs backed up by git-filter-branch: say `git for-each-ref --format=\"%(refname)\" refs/original/ | xargs -n 1 git update-ref -d`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:443
+#: en/git-filter-branch.txt:456
#, priority:100
msgid "Expire all reflogs with `git reflog expire --expire=now --all`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:447
+#: en/git-filter-branch.txt:460
#, priority:100
msgid "Garbage collect all unreferenced objects with `git gc --prune=now` (or if your git-gc is not new enough to support arguments to `--prune`, use `git repack -ad; git prune` instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:459
+#: en/git-filter-branch.txt:467
#, priority:100
-msgid "git-filter-branch allows you to make complex shell-scripted rewrites of your Git history, but you probably don't need this flexibility if you're simply _removing unwanted data_ like large files or passwords. For those operations you may want to consider http://rtyley.github.io/bfg-repo-cleaner/[The BFG Repo-Cleaner], a JVM-based alternative to git-filter-branch, typically at least 10-50x faster for those use-cases, and with quite different characteristics:"
+msgid "The performance of git-filter-branch is glacially slow; its design makes it impossible for a backward-compatible implementation to ever be fast:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:467
+#: en/git-filter-branch.txt:473
#, priority:100
-msgid "Any particular version of a file is cleaned exactly _once_. The BFG, unlike git-filter-branch, does not give you the opportunity to handle a file differently based on where or when it was committed within your history. This constraint gives the core performance benefit of The BFG, and is well-suited to the task of cleansing bad data - you don't care _where_ the bad data is, you just want it _gone_."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:473
+#: en/git-filter-branch.txt:476
+#, priority:100
+msgid "If you try and cheat and try to make git-filter-branch only work on files modified in a commit, then two things happen"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:482
+#, priority:100
+msgid "you run into problems with deletions whenever the user is simply trying to rename files (because attempting to delete files that don't exist looks like a no-op; it takes some chicanery to remap deletes across file renames when the renames happen via arbitrary user-provided shell)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:488
+#, priority:100
+msgid "even if you succeed at the map-deletes-for-renames chicanery, you still technically violate backward compatibility because users are allowed to filter files in ways that depend upon topology of commits instead of filtering solely based on file contents or names (though this has not been observed in the wild)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:494
+#, priority:100
+msgid "Even if you don't need to edit files but only want to e.g. rename or remove some and thus can avoid checking out each file (i.e. you can use --index-filter), you still are passing shell snippets for your filters. This means that for every commit, you have to have a prepared git repo where those filters can be run. That's a significant setup."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:505
+#, priority:100
+msgid "Further, several additional files are created or updated per commit by git-filter-branch. Some of these are for supporting the convenience functions provided by git-filter-branch (such as map()), while others are for keeping track of internal state (but could have also been accessed by user filters; one of git-filter-branch's regression tests does so). This essentially amounts to using the filesystem as an IPC mechanism between git-filter-branch and the user-provided filters. Disks tend to be a slow IPC mechanism, and writing these files also effectively represents a forced synchronization point between separate processes that we hit with every commit."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:511
+#, priority:100
+msgid "The user-provided shell commands will likely involve a pipeline of commands, resulting in the creation of many processes per commit. Creating and running another process takes a widely varying amount of time between operating systems, but on any platform it is very slow relative to invoking a function."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:517
#, priority:100
-msgid "By default The BFG takes full advantage of multi-core machines, cleansing commit file-trees in parallel. git-filter-branch cleans commits sequentially (i.e. in a single-threaded manner), though it _is_ possible to write filters that include their own parallelism, in the scripts executed against each commit."
+msgid "git-filter-branch itself is written in shell, which is kind of slow. This is the one performance issue that could be backward-compatibly fixed, but compared to the above problems that are intrinsic to the design of git-filter-branch, the language of the tool itself is a relatively minor issue."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:478
+#: en/git-filter-branch.txt:528
#, priority:100
-msgid "The http://rtyley.github.io/bfg-repo-cleaner/#examples[command options] are much more restrictive than git-filter branch, and dedicated just to the tasks of removing unwanted data- e.g: `--strip-blobs-bigger-than 1M`."
+msgid "Side note: Unfortunately, people tend to fixate on the written-in-shell aspect and periodically ask if git-filter-branch could be rewritten in another language to fix the performance issues. Not only does that ignore the bigger intrinsic problems with the design, it'd help less than you'd expect: if git-filter-branch itself were not shell, then the convenience functions (map(), skip_commit(), etc) and the `--setup` argument could no longer be executed once at the beginning of the program but would instead need to be prepended to every user filter (and thus re-executed with every commit)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:539
+#, priority:100
+msgid "The https://github.com/newren/git-filter-repo/[git filter-repo] tool is an alternative to git-filter-branch which does not suffer from these performance problems or the safety problems (mentioned below). For those with existing tooling which relies upon git-filter-branch, 'git repo-filter' also provides https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], a drop-in git-filter-branch replacement (with a few caveats). While filter-lamely suffers from all the same safety issues as git-filter-branch, it at least ameloriates the performance issues a little."
+msgstr ""
+
+#. type: Title -
+#: en/git-filter-branch.txt:542
+#, no-wrap, priority:100
+msgid "SAFETY"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:547
+#, priority:100
+msgid "git-filter-branch is riddled with gotchas resulting in various ways to easily corrupt repos or end up with a mess worse than what you started with:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:560
+#, priority:100
+msgid "Someone can have a set of \"working and tested filters\" which they document or provide to a coworker, who then runs them on a different OS where the same commands are not working/tested (some examples in the git-filter-branch manpage are also affected by this). BSD vs. GNU userland differences can really bite. If lucky, error messages are spewed. But just as likely, the commands either don't do the filtering requested, or silently corrupt by making some unwanted change. The unwanted change may only affect a few commits, so it's not necessarily obvious either. (The fact that problems won't necessarily be obvious means they are likely to go unnoticed until the rewritten history is in use for quite a while, at which point it's really hard to justify another flag-day for another rewrite.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:570
+#, priority:100
+msgid "Filenames with spaces are often mishandled by shell snippets since they cause problems for shell pipelines. Not everyone is familiar with find -print0, xargs -0, git-ls-files -z, etc. Even people who are familiar with these may assume such flags are not relevant because someone else renamed any such files in their repo back before the person doing the filtering joined the project. And often, even those familiar with handling arguments with spaces may not do so just because they aren't in the mindset of thinking about everything that could possibly go wrong."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:580
+#, priority:100
+msgid "Non-ascii filenames can be silently removed despite being in a desired directory. Keeping only wanted paths is often done using pipelines like `git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`. ls-files will only quote filenames if needed, so folks may not notice that one of the files didn't match the regex (at least not until it's much too late). Yes, someone who knows about core.quotePath can avoid this (unless they have other special characters like \\t, \\n, or \"), and people who use ls-files -z with something other than grep can avoid this, but that doesn't mean they will."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:586
+#, priority:100
+msgid "Similarly, when moving files around, one can find that filenames with non-ascii or special characters end up in a different directory, one that includes a double quote character. (This is technically the same issue as above with quoting, but perhaps an interesting different way that it can and has manifested as a problem.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:594
+#, priority:100
+msgid "It's far too easy to accidentally mix up old and new history. It's still possible with any tool, but git-filter-branch almost invites it. If lucky, the only downside is users getting frustrated that they don't know how to shrink their repo and remove the old stuff. If unlucky, they merge old and new history and end up with multiple \"copies\" of each commit, some of which have unwanted or sensitive files and others which don't. This comes about in multiple different ways:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:597
+#, priority:100
+msgid "the default to only doing a partial history rewrite ('--all' is not the default and few examples show it)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:599
+#, priority:100
+msgid "the fact that there's no automatic post-run cleanup"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:602
+#, priority:100
+msgid "the fact that --tag-name-filter (when used to rename tags) doesn't remove the old tags but just adds new ones with the new name"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:611
+#, priority:100
+msgid "the fact that little educational information is provided to inform users of the ramifications of a rewrite and how to avoid mixing old and new history. For example, this man page discusses how users need to understand that they need to rebase their changes for all their branches on top of new history (or delete and reclone), but that's only one of multiple concerns to consider. See the \"DISCUSSION\" section of the git filter-repo manual page for more details."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:614
+#, priority:100
+msgid "Annotated tags can be accidentally converted to lightweight tags, due to either of two issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:619
+#, priority:100
+msgid "Someone can do a history rewrite, realize they messed up, restore from the backups in refs/original/, and then redo their git-filter-branch command. (The backup in refs/original/ is not a real backup; it dereferences tags first.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:624
+#, priority:100
+msgid "Running git-filter-branch with either --tags or --all in your <rev-list options>. In order to retain annotated tags as annotated, you must use --tag-name-filter (and must not have restored from refs/original/ in a previously botched rewrite)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:629
+#, priority:100
+msgid "Any commit messages that specify an encoding will become corrupted by the rewrite; git-filter-branch ignores the encoding, takes the original bytes, and feeds it to commit-tree without telling it the proper encoding. (This happens whether or not --msg-filter is used.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:633
+#, priority:100
+msgid "Commit messages (even if they are all UTF-8) by default become corrupted due to not being updated -- any references to other commit hashes in commit messages will now refer to no-longer-extant commits."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:644
+#, priority:100
+msgid "There are no facilities for helping users find what unwanted crud they should delete, which means they are much more likely to have incomplete or partial cleanups that sometimes result in confusion and people wasting time trying to understand. (For example, folks tend to just look for big files to delete instead of big directories or extensions, and once they do so, then sometime later folks using the new repository who are going through history will notice a build artifact directory that has some files but not others, or a cache of dependencies (node_modules or similar) which couldn't have ever been functional since it's missing some files.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:647
+#, priority:100
+msgid "If --prune-empty isn't specified, then the filtering process can create hoards of confusing empty commits"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:651
+#, priority:100
+msgid "If --prune-empty is specified, then intentionally placed empty commits from before the filtering operation are also pruned instead of just pruning commits that became empty due to filtering rules."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:654
+#, ignore-ellipsis, priority:100
+msgid "If --prune empty is specified, sometimes empty commits are missed and left around anyway (a somewhat rare bug, but it happens...)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:658
+#, priority:100
+msgid "A minor issue, but users who have a goal to update all names and emails in a repository may be led to --env-filter which will only update authors and committers, missing taggers."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:664
+#, priority:100
+msgid "If the user provides a --tag-name-filter that maps multiple tags to the same name, no warning or error is provided; git-filter-branch simply overwrites each tag in some undocumented pre-defined order resulting in only one tag at the end. (A git-filter-branch regression test requires this surprising behavior.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:667
+#, priority:100
+msgid "Also, the poor performance of git-filter-branch often leads to safety issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:683
+#, priority:100
+msgid "Coming up with the correct shell snippet to do the filtering you want is sometimes difficult unless you're just doing a trivial modification such as deleting a couple files. Unfortunately, people often learn if the snippet is right or wrong by trying it out, but the rightness or wrongness can vary depending on special circumstances (spaces in filenames, non-ascii filenames, funny author names or emails, invalid timezones, presence of grafts or replace objects, etc.), meaning they may have to wait a long time, hit an error, then restart. The performance of git-filter-branch is so bad that this cycle is painful, reducing the time available to carefully re-check (to say nothing about what it does to the patience of the person doing the rewrite even if they do technically have more time available). This problem is extra compounded because errors from broken filters may not be shown for a long time and/or get lost in a sea of output. Even worse, broken filters often just result in silent incorrect rewrites."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:691
+#, priority:100
+msgid "To top it all off, even when users finally find working commands, they naturally want to share them. But they may be unaware that their repo didn't have some special cases that someone else's does. So, when someone else with a different repository runs the same commands, they get hit by the problems above. Or, the user just runs commands that really were vetted for special cases, but they run it on a different OS where it doesn't work, as noted above."
msgstr ""
#. type: Title =
@@ -23485,7 +23754,7 @@ msgid "This command is intended mostly for internal use by scripts automatically
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:64
+#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:68
#, no-wrap, priority:240
msgid "--log[=<n>]"
msgstr ""
@@ -23497,7 +23766,7 @@ msgid "In addition to branch names, populate the log message with one-line descr
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:65
+#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:69
#, ignore-same, no-wrap, priority:240
msgid "--no-log"
msgstr "--no-log"
@@ -24168,9 +24437,9 @@ msgid ""
"\t\t [--signature-file=<file>]\n"
"\t\t [-n | --numbered | -N | --no-numbered]\n"
"\t\t [--start-number <n>] [--numbered-files]\n"
-"\t\t [--in-reply-to=Message-Id] [--suffix=.<sfx>]\n"
+"\t\t [--in-reply-to=<message id>] [--suffix=.<sfx>]\n"
"\t\t [--ignore-if-in-upstream]\n"
-"\t\t [--rfc] [--subject-prefix=Subject-Prefix]\n"
+"\t\t [--rfc] [--subject-prefix=<subject prefix>]\n"
"\t\t [(--reroll-count|-v) <n>]\n"
"\t\t [--to=<email>] [--cc=<email>]\n"
"\t\t [--[no-]cover-letter] [--quiet]\n"
@@ -24219,523 +24488,524 @@ msgid "By default, each output file is numbered sequentially from 1, and uses th
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:70
+#: en/git-format-patch.txt:71
#, priority:100
-msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`."
+msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`. All directory components will be created."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:74
+#: en/git-format-patch.txt:75
#, priority:100
msgid "By default, the subject of a single patch is \"[PATCH] \" followed by the concatenation of lines from the commit message up to the first blank line (see the DISCUSSION section of linkgit:git-commit[1])."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:78
+#: en/git-format-patch.txt:79
#, priority:100
msgid "When multiple patches are output, the subject prefix will instead be \"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. To omit patch numbers from the subject, use `-N`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:83
+#: en/git-format-patch.txt:84
#, priority:100
msgid "If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a `Message-Id` header to reference."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:89
+#: en/git-format-patch.txt:90
#, no-wrap, priority:100
msgid "-<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:91
+#: en/git-format-patch.txt:92
#, priority:100
msgid "Prepare patches from the topmost <n> commits."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:92
+#: en/git-format-patch.txt:93
#, no-wrap, priority:100
msgid "-o <dir>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:93
+#: en/git-format-patch.txt:94
#, no-wrap, priority:100
msgid "--output-directory <dir>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:96
+#: en/git-format-patch.txt:97
#, priority:100
msgid "Use <dir> to store the resulting files, instead of the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:98 en/git-shortlog.txt:30
+#: en/git-format-patch.txt:99 en/git-shortlog.txt:30
#, ignore-same, no-wrap, priority:260
msgid "--numbered"
msgstr "--numbered"
#. type: Plain text
-#: en/git-format-patch.txt:100
+#: en/git-format-patch.txt:101
#, priority:100
msgid "Name output in '[PATCH n/m]' format, even with a single patch."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:102
+#: en/git-format-patch.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-numbered"
msgstr "--no-numbered"
#. type: Plain text
-#: en/git-format-patch.txt:104
+#: en/git-format-patch.txt:105
#, priority:100
msgid "Name output in '[PATCH]' format."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:105
+#: en/git-format-patch.txt:106
#, no-wrap, priority:100
msgid "--start-number <n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:107
+#: en/git-format-patch.txt:108
#, fuzzy, priority:100
msgid "Start numbering the patches at <n> instead of 1."
msgstr "戟逵�逵�� 戟�劇筠�逵�龜� 極逵��筠橘 � <n>, 逵 戟筠 � 1"
#. type: Labeled list
-#: en/git-format-patch.txt:108
+#: en/git-format-patch.txt:109
#, ignore-same, no-wrap, priority:100
msgid "--numbered-files"
msgstr "--numbered-files"
#. type: Plain text
-#: en/git-format-patch.txt:111
+#: en/git-format-patch.txt:112
#, priority:100
msgid "Output file names will be a simple number sequence without the default first line of the commit appended."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:113
+#: en/git-format-patch.txt:114
#, ignore-same, no-wrap, priority:100
msgid "--keep-subject"
msgstr "--keep-subject"
#. type: Plain text
-#: en/git-format-patch.txt:116
+#: en/git-format-patch.txt:117
#, priority:100
msgid "Do not strip/add '[PATCH]' from the first line of the commit log message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:122
+#: en/git-format-patch.txt:123
#, priority:100
msgid "Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:123 en/git-pack-objects.txt:59
+#: en/git-format-patch.txt:124 en/git-pack-objects.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--stdout"
msgstr "--stdout"
#. type: Plain text
-#: en/git-format-patch.txt:126
+#: en/git-format-patch.txt:127
#, priority:100
msgid "Print all commits to the standard output in mbox format, instead of creating a file for each one."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:127
+#: en/git-format-patch.txt:128
#, no-wrap, priority:100
msgid "--attach[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:131
+#: en/git-format-patch.txt:132
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: attachment`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:132
+#: en/git-format-patch.txt:133
#, ignore-same, no-wrap, priority:100
msgid "--no-attach"
msgstr "--no-attach"
#. type: Plain text
-#: en/git-format-patch.txt:135
+#: en/git-format-patch.txt:136
#, priority:100
msgid "Disable the creation of an attachment, overriding the configuration setting."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:136
+#: en/git-format-patch.txt:137
#, no-wrap, priority:100
msgid "--inline[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:140
+#: en/git-format-patch.txt:141
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: inline`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:141
+#: en/git-format-patch.txt:142
#, no-wrap, priority:100
msgid "--thread[=<style>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:142
+#: en/git-format-patch.txt:143
#, ignore-same, no-wrap, priority:100
msgid "--no-thread"
msgstr "--no-thread"
#. type: Plain text
-#: en/git-format-patch.txt:147
+#: en/git-format-patch.txt:148
#, priority:100
msgid "Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the first. Also controls generation of the `Message-Id` header to reference."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:153
+#: en/git-format-patch.txt:154
#, priority:100
msgid "The optional <style> argument can be either `shallow` or `deep`. 'shallow' threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order. 'deep' threading makes every mail a reply to the previous one."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:157
+#: en/git-format-patch.txt:158
#, priority:100
msgid "The default is `--no-thread`, unless the `format.thread` configuration is set. If `--thread` is specified without a style, it defaults to the style specified by `format.thread` if any, or else `shallow`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:161
+#: en/git-format-patch.txt:162
#, priority:100
msgid "Beware that the default for 'git send-email' is to thread emails itself. If you want `git format-patch` to take care of threading, you will want to ensure that threading is disabled for `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:162
-#, no-wrap, priority:100
-msgid "--in-reply-to=Message-Id"
-msgstr ""
+#: en/git-format-patch.txt:163
+#, fuzzy, no-wrap, priority:100
+#| msgid "--no-message-id"
+msgid "--in-reply-to=<message id>"
+msgstr "--no-message-id"
#. type: Plain text
-#: en/git-format-patch.txt:166
+#: en/git-format-patch.txt:167
#, priority:100
-msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given Message-Id, which avoids breaking threads to provide a new patch series."
+msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given <message id>, which avoids breaking threads to provide a new patch series."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:167
+#: en/git-format-patch.txt:168
#, ignore-same, no-wrap, priority:100
msgid "--ignore-if-in-upstream"
msgstr "--ignore-if-in-upstream"
#. type: Plain text
-#: en/git-format-patch.txt:173
+#: en/git-format-patch.txt:174
#, priority:100
msgid "Do not include a patch that matches a commit in <until>..<since>. This will examine all patches reachable from <since> but not from <until> and compare them with the patches being generated, and any patch that matches is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:174
+#: en/git-format-patch.txt:175
#, no-wrap, priority:100
-msgid "--subject-prefix=<Subject-Prefix>"
+msgid "--subject-prefix=<subject prefix>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:179
+#: en/git-format-patch.txt:180
#, priority:100
-msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<Subject-Prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
+msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<subject prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:180
+#: en/git-format-patch.txt:181
#, ignore-same, no-wrap, priority:100
msgid "--rfc"
msgstr "--rfc"
#. type: Plain text
-#: en/git-format-patch.txt:184
+#: en/git-format-patch.txt:185
#, priority:100
msgid "Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For Comments\"; use this when sending an experimental patch for discussion rather than application."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:185
+#: en/git-format-patch.txt:186
#, no-wrap, priority:100
msgid "-v <n>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:186
+#: en/git-format-patch.txt:187
#, no-wrap, priority:100
msgid "--reroll-count=<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:193
+#: en/git-format-patch.txt:194
#, priority:100
msgid "Mark the series as the <n>-th iteration of the topic. The output filenames have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default, but configurable via the `--subject-prefix` option) has ` v<n>` appended to it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:194
+#: en/git-format-patch.txt:195
#, no-wrap, priority:100
msgid "--to=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:199
+#: en/git-format-patch.txt:200
#, priority:100
msgid "Add a `To:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-to` discards all `To:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:200
+#: en/git-format-patch.txt:201
#, no-wrap, priority:100
msgid "--cc=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:205
+#: en/git-format-patch.txt:206
#, priority:100
msgid "Add a `Cc:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-cc` discards all `Cc:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:206
+#: en/git-format-patch.txt:207
#, ignore-same, no-wrap, priority:100
msgid "--from"
msgstr "--from"
#. type: Labeled list
-#: en/git-format-patch.txt:207
+#: en/git-format-patch.txt:208
#, no-wrap, priority:100
msgid "--from=<ident>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:213
+#: en/git-format-patch.txt:214
#, priority:100
msgid "Use `ident` in the `From:` header of each commit email. If the author ident of the commit is not textually identical to the provided `ident`, place a `From:` header in the body of the message with the original author. If no `ident` is given, use the committer ident."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:220
+#: en/git-format-patch.txt:221
#, priority:100
msgid "Note that this option is only useful if you are actually sending the emails and want to identify yourself as the sender, but retain the original author (and `git am` will correctly pick up the in-body header). Note also that `git send-email` already handles this transformation for you, and this option should not be used if you are feeding the result to `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:221
+#: en/git-format-patch.txt:222
#, no-wrap, priority:100
msgid "--add-header=<header>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:228
+#: en/git-format-patch.txt:229
#, priority:100
msgid "Add an arbitrary header to the email headers. This is in addition to any configured headers, and may be used multiple times. For example, `--add-header=\"Organization: git-foo\"`. The negated form `--no-add-header` discards *all* (`To:`, `Cc:`, and custom) headers added so far from config or command line."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:229
+#: en/git-format-patch.txt:230
#, ignore-same, no-wrap, priority:100
msgid "--[no-]cover-letter"
msgstr "--[no-]cover-letter"
#. type: Plain text
-#: en/git-format-patch.txt:233
+#: en/git-format-patch.txt:234
#, priority:100
msgid "In addition to the patches, generate a cover letter file containing the branch description, shortlog and the overall diffstat. You can fill in a description in the file before sending it out."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:234
+#: en/git-format-patch.txt:235
#, no-wrap, priority:100
msgid "--interdiff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:242
+#: en/git-format-patch.txt:243
#, priority:100
msgid "As a reviewer aid, insert an interdiff into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` is a single revision naming the tip of the previous series which shares a common base with the series being formatted (for example `git format-patch --cover-letter --interdiff=feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:243
+#: en/git-format-patch.txt:244
#, no-wrap, priority:100
msgid "--range-diff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:254
+#: en/git-format-patch.txt:255
#, priority:100
msgid "As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1]) into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` can be a single revision naming the tip of the previous series if it shares a common base with the series being formatted (for example `git format-patch --cover-letter --range-diff=feature/v1 -3 feature/v2`), or a revision range if the two versions of the series are disjoint (for example `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:259
+#: en/git-format-patch.txt:260
#, priority:100
msgid "Note that diff options passed to the command affect how the primary product of `format-patch` is generated, and they are not passed to the underlying `range-diff` machinery used to generate the cover-letter material (this may change in the future)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:260
+#: en/git-format-patch.txt:261
#, no-wrap, priority:100
msgid "--creation-factor=<percent>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:265
+#: en/git-format-patch.txt:266
#, priority:100
msgid "Used with `--range-diff`, tweak the heuristic which matches up commits between the previous and current series of patches by adjusting the creation/deletion cost fudge factor. See linkgit:git-range-diff[1]) for details."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:266
+#: en/git-format-patch.txt:267
#, no-wrap, priority:100
msgid "--notes[=<ref>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:267 en/pretty-options.txt:81
+#: en/git-format-patch.txt:268 en/pretty-options.txt:81
#, ignore-same, no-wrap, priority:260
msgid "--no-notes"
msgstr "--no-notes"
#. type: Plain text
-#: en/git-format-patch.txt:270
+#: en/git-format-patch.txt:271
#, priority:100
msgid "Append the notes (see linkgit:git-notes[1]) for the commit after the three-dash line."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:278
+#: en/git-format-patch.txt:279
#, priority:100
msgid "The expected use case of this is to write supporting explanation for the commit that does not belong to the commit log message proper, and include it with the patch submission. While one can simply write these explanations after `format-patch` has run but before sending, keeping them as Git notes allows them to be maintained between versions of the patch series (but see the discussion of the `notes.rewrite` configuration options in linkgit:git-notes[1] to use this workflow)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:281
+#: en/git-format-patch.txt:282
#, priority:100
msgid "The default is `--no-notes`, unless the `format.notes` configuration is set."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:282
+#: en/git-format-patch.txt:283
#, no-wrap, priority:100
msgid "--[no-]signature=<signature>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:287
+#: en/git-format-patch.txt:288
#, priority:100
msgid "Add a signature to each message produced. Per RFC 3676 the signature is separated from the body by a line with '-- ' on it. If the signature option is omitted the signature defaults to the Git version number."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:288
+#: en/git-format-patch.txt:289
#, no-wrap, priority:100
msgid "--signature-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:290
+#: en/git-format-patch.txt:291
#, priority:100
msgid "Works just like --signature except the signature is read from a file."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:291
+#: en/git-format-patch.txt:292
#, no-wrap, priority:100
msgid "--suffix=.<sfx>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:296
+#: en/git-format-patch.txt:297
#, priority:100
msgid "Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is `--suffix=.txt`. Leaving this empty will remove the `.patch` suffix."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:299
+#: en/git-format-patch.txt:300
#, priority:100
msgid "Note that the leading character does not have to be a dot; for example, you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:303
+#: en/git-format-patch.txt:304
#, priority:100
msgid "Do not print the names of the generated files to standard output."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:304
+#: en/git-format-patch.txt:305
#, ignore-same, no-wrap, priority:100
msgid "--no-binary"
msgstr "--no-binary"
#. type: Plain text
-#: en/git-format-patch.txt:309
+#: en/git-format-patch.txt:310
#, priority:100
msgid "Do not output contents of changes in binary files, instead display a notice that those files changed. Patches generated using this option cannot be applied properly, but they are still useful for code review."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:310
+#: en/git-format-patch.txt:311
#, ignore-same, no-wrap, priority:100
msgid "--zero-commit"
msgstr "--zero-commit"
#. type: Plain text
-#: en/git-format-patch.txt:313
+#: en/git-format-patch.txt:314
#, priority:100
msgid "Output an all-zero hash in each patch's From header instead of the hash of the commit."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:314
+#: en/git-format-patch.txt:315
#, no-wrap, priority:100
msgid "--base=<commit>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:318
+#: en/git-format-patch.txt:320
#, priority:100
-msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details."
+msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details. If <commit> is \"auto\", a base commit is automatically chosen."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:325
+#: en/git-format-patch.txt:327
#, priority:100
msgid "Treat the revision argument as a <revision range>, even if it is just a single commit (that would normally be treated as a <since>). Note that root commits included in the specified range are always formatted as creation patches, independently of this flag."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:328
+#: en/git-format-patch.txt:330
#, priority:100
msgid "Show progress reports on stderr as patches are generated."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:335
+#: en/git-format-patch.txt:338
#, priority:100
-msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To\" or \"Cc:\" headers, configure attachments, and sign off patches with configuration variables."
+msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To:\" or \"Cc:\" headers, configure attachments, change the patch output directory, and sign off patches with configuration variables."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:347
+#: en/git-format-patch.txt:351
#, no-wrap, priority:100
msgid ""
"[format]\n"
@@ -24747,17 +25017,18 @@ msgid ""
"\tcc = <email>\n"
"\tattach [ = mime-boundary-string ]\n"
"\tsignOff = true\n"
-"\tcoverletter = auto\n"
+"\toutputDirectory = <directory>\n"
+"\tcoverLetter = auto\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:356
+#: en/git-format-patch.txt:360
#, priority:100
msgid "The patch produced by 'git format-patch' is in UNIX mailbox format, with a fixed \"magic\" time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:366
+#: en/git-format-patch.txt:370
#, no-wrap, priority:100
msgid ""
"From 8f72bad1baf19a53459661343e21d6491c3908d3 Mon Sep 17 00:00:00 2001\n"
@@ -24771,7 +25042,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:369
+#: en/git-format-patch.txt:373
#, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -24779,7 +25050,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:372
+#: en/git-format-patch.txt:376
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"Do the same for ia64 so we can have sleek & trim looking\n"
@@ -24787,19 +25058,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:380
+#: en/git-format-patch.txt:384
#, ignore-ellipsis, priority:100
msgid "Typically it will be placed in a MUA's drafts folder, edited to add timely commentary that should not go in the changelog after the three dashes, and then sent as a message whose body, in our example, starts with \"arch/arm config files were...\". On the receiving end, readers can save interesting patches in a UNIX mailbox and apply them with linkgit:git-am[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:386
+#: en/git-format-patch.txt:390
#, priority:100
msgid "When a patch is part of an ongoing discussion, the patch generated by 'git format-patch' can be tweaked to take advantage of the 'git am --scissors' feature. After your response to the discussion comes a line that consists solely of \"`-- >8 --`\" (scissors and perforation), followed by the patch with unnecessary header fields removed:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:390
+#: en/git-format-patch.txt:394
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"...\n"
@@ -24807,13 +25078,13 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:392
+#: en/git-format-patch.txt:396
#, no-wrap, priority:100
msgid "Makes sense to me. How about this patch?\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:395
+#: en/git-format-patch.txt:399
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
@@ -24821,7 +25092,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:398
+#: en/git-format-patch.txt:402
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -24829,61 +25100,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:406
+#: en/git-format-patch.txt:410
#, priority:100
msgid "When sending a patch this way, most often you are sending your own patch, so in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit `From:` and `Date:` lines from the patch file. The patch title is likely to be different from the subject of the discussion the patch is in response to, so it is likely that you would want to keep the Subject: line, like the example above."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:408
+#: en/git-format-patch.txt:412
#, no-wrap, priority:100
msgid "Checking for patch corruption"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:411
+#: en/git-format-patch.txt:415
#, priority:100
msgid "Many mailers if not set up properly will corrupt whitespace. Here are two common types of corruption:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:413
+#: en/git-format-patch.txt:417
#, priority:100
msgid "Empty context lines that do not have _any_ whitespace."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:416
+#: en/git-format-patch.txt:420
#, priority:100
msgid "Non-empty context lines that have one extra whitespace at the beginning."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:418
+#: en/git-format-patch.txt:422
#, priority:100
msgid "One way to test if your MUA is set up correctly is:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:422
+#: en/git-format-patch.txt:426
#, priority:100
msgid "Send the patch to yourself, exactly the way you would, except with To: and Cc: lines that do not contain the list and maintainer address."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:425
+#: en/git-format-patch.txt:429
#, priority:100
msgid "Save that patch to a file in UNIX mailbox format. Call it a.patch, say."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:427
+#: en/git-format-patch.txt:431
#, priority:100
msgid "Apply it:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:432
+#: en/git-format-patch.txt:436
#, no-wrap, priority:100
msgid ""
"$ git fetch <project> master:test-apply\n"
@@ -24893,175 +25164,175 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:434
+#: en/git-format-patch.txt:438
#, priority:100
msgid "If it does not apply correctly, there can be various reasons."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:439
+#: en/git-format-patch.txt:443
#, priority:100
msgid "The patch itself does not apply cleanly. That is _bad_ but does not have much to do with your MUA. You might want to rebase the patch with linkgit:git-rebase[1] before regenerating it in this case."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:444
+#: en/git-format-patch.txt:448
#, priority:100
msgid "The MUA corrupted your patch; \"am\" would complain that the patch does not apply. Look in the .git/rebase-apply/ subdirectory and see what 'patch' file contains and check for the common corruption patterns mentioned above."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:452
+#: en/git-format-patch.txt:456
#, priority:100
msgid "While at it, check the 'info' and 'final-commit' files as well. If what is in 'final-commit' is not exactly what you would want to see in the commit log message, it is very likely that the receiver would end up hand editing the log message when applying your patch. Things like \"Hi, this is my first patch.\\n\" in the patch e-mail should come after the three-dash line that signals the end of the commit message."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:454
+#: en/git-format-patch.txt:458
#, no-wrap, priority:100
msgid "MUA-SPECIFIC HINTS"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:457
+#: en/git-format-patch.txt:461
#, priority:100
msgid "Here are some hints on how to successfully submit patches inline using various mailers."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:459
+#: en/git-format-patch.txt:463
#, no-wrap, priority:100
msgid "GMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:465
+#: en/git-format-patch.txt:469
#, priority:100
msgid "GMail does not have any way to turn off line wrapping in the web interface, so it will mangle any emails that you send. You can however use \"git send-email\" and send your patches through the GMail SMTP server, or use any IMAP email client to connect to the google IMAP server and forward the emails through that."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:468
+#: en/git-format-patch.txt:472
#, priority:100
msgid "For hints on using 'git send-email' to send your patches through the GMail SMTP server, see the EXAMPLE section of linkgit:git-send-email[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:471
+#: en/git-format-patch.txt:475
#, priority:100
msgid "For hints on submission using the IMAP interface, see the EXAMPLE section of linkgit:git-imap-send[1]."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:473
+#: en/git-format-patch.txt:477
#, no-wrap, priority:100
msgid "Thunderbird"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:477
+#: en/git-format-patch.txt:481
#, priority:100
msgid "By default, Thunderbird will both wrap emails as well as flag them as being 'format=flowed', both of which will make the resulting email unusable by Git."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:481
+#: en/git-format-patch.txt:485
#, priority:100
msgid "There are three different approaches: use an add-on to turn off line wraps, configure Thunderbird to not mangle patches, or use an external editor to keep Thunderbird from mangling the patches."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:483
+#: en/git-format-patch.txt:487
#, no-wrap, priority:100
msgid "Approach #1 (add-on)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:491
+#: en/git-format-patch.txt:495
#, priority:100
msgid "Install the Toggle Word Wrap add-on that is available from https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you can tick off. Now you can compose the message as you otherwise do (cut + paste, 'git format-patch' | 'git imap-send', etc), but you have to insert line breaks manually in any text that you type."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:493
+#: en/git-format-patch.txt:497
#, no-wrap, priority:100
msgid "Approach #2 (configuration)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:495
+#: en/git-format-patch.txt:499
#, priority:100
msgid "Three steps:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:499
+#: en/git-format-patch.txt:503
#, ignore-ellipsis, priority:100
msgid "Configure your mail server composition as plain text: Edit...Account Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:501
+#: en/git-format-patch.txt:505
#, priority:100
msgid "Configure your general composition window to not wrap."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:504
+#: en/git-format-patch.txt:508
#, priority:100
msgid "In Thunderbird 2: Edit..Preferences..Composition, wrap plain text messages at 0"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:510
+#: en/git-format-patch.txt:514
#, priority:100
msgid "In Thunderbird 3: Edit..Preferences..Advanced..Config Editor. Search for \"mail.wrap_long_lines\". Toggle it to make sure it is set to `false`. Also, search for \"mailnews.wraplength\" and set the value to 0."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:515
+#: en/git-format-patch.txt:519
#, priority:100
msgid "Disable the use of format=flowed: Edit..Preferences..Advanced..Config Editor. Search for \"mailnews.send_plaintext_flowed\". Toggle it to make sure it is set to `false`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:519
+#: en/git-format-patch.txt:523
#, priority:100
msgid "After that is done, you should be able to compose email as you otherwise would (cut + paste, 'git format-patch' | 'git imap-send', etc), and the patches will not be mangled."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:521
+#: en/git-format-patch.txt:525
#, no-wrap, priority:100
msgid "Approach #3 (external editor)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:526
+#: en/git-format-patch.txt:530
#, priority:100
msgid "The following Thunderbird extensions are needed: AboutConfig from http://aboutconfig.mozdev.org/ and External Editor from http://globs.org/articles.php?lng=en&pg=8"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:528
+#: en/git-format-patch.txt:532
#, priority:100
msgid "Prepare the patch as a text file using your method of choice."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:533
+#: en/git-format-patch.txt:537
#, priority:100
msgid "Before opening a compose window, use Edit->Account Settings to uncheck the \"Compose messages in HTML format\" setting in the \"Composition & Addressing\" panel of the account to be used to send the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:537
+#: en/git-format-patch.txt:541
#, priority:100
msgid "In the main Thunderbird window, 'before' you open the compose window for the patch, use Tools->about:config to set the following to the indicated values:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:541
+#: en/git-format-patch.txt:545
#, no-wrap, priority:100
msgid ""
"\tmailnews.send_plaintext_flowed => false\n"
@@ -25069,25 +25340,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:544
+#: en/git-format-patch.txt:548
#, priority:100
msgid "Open a compose window and click the external editor icon."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:547
+#: en/git-format-patch.txt:551
#, priority:100
msgid "In the external editor window, read in the patch file and exit the editor normally."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:550
+#: en/git-format-patch.txt:554
#, priority:100
msgid "Side note: it may be possible to do step 2 with about:config and the following settings but no one's tried yet."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:555
+#: en/git-format-patch.txt:559
#, no-wrap, priority:100
msgid ""
"\tmail.html_compose => false\n"
@@ -25096,91 +25367,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:560
+#: en/git-format-patch.txt:564
#, priority:100
msgid "There is a script in contrib/thunderbird-patch-inline which can help you include patches with Thunderbird in an easy way. To use it, do the steps above and then use the script as the external editor."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:562
+#: en/git-format-patch.txt:566
#, no-wrap, priority:100
msgid "KMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:564
+#: en/git-format-patch.txt:568
#, priority:100
msgid "This should help you to submit patches inline using KMail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:566
+#: en/git-format-patch.txt:570
#, priority:100
msgid "Prepare the patch as a text file."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:568
+#: en/git-format-patch.txt:572
#, priority:100
msgid "Click on New Mail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:571
+#: en/git-format-patch.txt:575
#, priority:100
msgid "Go under \"Options\" in the Composer window and be sure that \"Word wrap\" is not set."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:573
+#: en/git-format-patch.txt:577
#, ignore-ellipsis, priority:100
msgid "Use Message -> Insert file... and insert the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:576
+#: en/git-format-patch.txt:580
#, priority:100
msgid "Back in the compose window: add whatever other text you wish to the message, complete the addressing and subject fields, and press send."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:578
+#: en/git-format-patch.txt:582
#, no-wrap, priority:100
msgid "BASE TREE INFORMATION"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:587
+#: en/git-format-patch.txt:591
#, priority:100
msgid "The base tree information block is used for maintainers or third party testers to know the exact state the patch series applies to. It consists of the 'base commit', which is a well-known commit that is part of the stable part of the project history everybody else works off of, and zero or more 'prerequisite patches', which are well-known patches in flight that is not yet part of the 'base commit' that need to be applied on top of 'base commit' in topological order before the patches can be applied."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:593
+#: en/git-format-patch.txt:597
#, priority:100
msgid "The 'base commit' is shown as \"base-commit: \" followed by the 40-hex of the commit object name. A 'prerequisite patch' is shown as \"prerequisite-patch-id: \" followed by the 40-hex 'patch id', which can be obtained by passing the patch through the `git patch-id --stable` command."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:597
+#: en/git-format-patch.txt:601
#, priority:100
msgid "Imagine that on top of the public commit P, you applied well-known patches X, Y and Z from somebody else, and then built your three-patch series A, B, C, the history would be like:"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:600
+#: en/git-format-patch.txt:604
#, no-wrap, priority:100
msgid "---P---X---Y---Z---A---B---C\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:607
+#: en/git-format-patch.txt:611
#, priority:100
msgid "With `git format-patch --base=P -3 C` (or variants thereof, e.g. with `--cover-letter` or using `Z..C` instead of `-3 C` to specify the range), the base tree information block is shown at the end of the first message the command outputs (either the first patch, or the cover letter), like this:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:613
+#: en/git-format-patch.txt:617
#, no-wrap, priority:100
msgid ""
"base-commit: P\n"
@@ -25190,13 +25461,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:616
+#: en/git-format-patch.txt:620
#, priority:100
msgid "For non-linear topology, such as"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:621
+#: en/git-format-patch.txt:625
#, no-wrap, priority:100
msgid ""
"---P---X---A---M---C\n"
@@ -25205,91 +25476,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:626
+#: en/git-format-patch.txt:630
#, priority:100
msgid "You can also use `git format-patch --base=P -3 C` to generate patches for A, B and C, and the identifiers for P, X, Y, Z are appended at the end of the first message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:632
+#: en/git-format-patch.txt:636
#, priority:100
msgid "If set `--base=auto` in cmdline, it will track base commit automatically, the base commit will be the merge base of tip commit of the remote-tracking branch and revision-range specified in cmdline. For a local branch, you need to track a remote branch by `git branch --set-upstream-to` before using this option."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:638
+#: en/git-format-patch.txt:642
#, priority:100
msgid "Extract commits between revisions R1 and R2, and apply them on top of the current branch using 'git am' to cherry-pick them:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:641
+#: en/git-format-patch.txt:645
#, no-wrap, priority:100
msgid "$ git format-patch -k --stdout R1..R2 | git am -3 -k\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:645
+#: en/git-format-patch.txt:649
#, priority:100
msgid "Extract all commits which are in the current branch but not in the origin branch:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:648
+#: en/git-format-patch.txt:652
#, no-wrap, priority:100
msgid "$ git format-patch origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:651
+#: en/git-format-patch.txt:655
#, priority:100
msgid "For each commit a separate file is created in the current directory."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:654
+#: en/git-format-patch.txt:658
#, priority:100
msgid "Extract all commits that lead to 'origin' since the inception of the project:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:657
+#: en/git-format-patch.txt:661
#, no-wrap, priority:100
msgid "$ git format-patch --root origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:660
+#: en/git-format-patch.txt:664
#, priority:100
msgid "The same as the previous one:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:663
+#: en/git-format-patch.txt:667
#, no-wrap, priority:100
msgid "$ git format-patch -M -B origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:670
+#: en/git-format-patch.txt:674
#, priority:100
msgid "Additionally, it detects and handles renames and complete rewrites intelligently to produce a renaming patch. A renaming patch reduces the amount of text output, and generally makes it easier to review. Note that non-Git \"patch\" programs won't understand renaming patches, so use it only when you know the recipient uses Git to apply your patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:673
+#: en/git-format-patch.txt:677
#, priority:100
msgid "Extract three topmost commits from the current branch and format them as e-mailable patches:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:676
+#: en/git-format-patch.txt:680
#, no-wrap, priority:100
msgid "$ git format-patch -3\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:681
+#: en/git-format-patch.txt:685
#, ignore-same, priority:100
msgid "linkgit:git-am[1], linkgit:git-send-email[1]"
msgstr "linkgit:git-am[1], linkgit:git-send-email[1]"
@@ -25785,43 +26056,43 @@ msgid "The below documentation is the same as what's found in linkgit:git-config
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:127
+#: en/git-gc.txt:126
#, priority:100
-msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, refs saved by 'git filter-branch' in refs/original/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
+msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, notes saved by 'git notes' under refs/notes/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:134
+#: en/git-gc.txt:133
#, priority:100
msgid "On the other hand, when 'git gc' runs concurrently with another process, there is a risk of it deleting an object that the other process is using but hasn't created a reference to. This may just cause the other process to fail or may corrupt the repository if the other process later adds a reference to the deleted object. Git has two features that significantly mitigate this problem:"
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:137
+#: en/git-gc.txt:136
#, priority:100
msgid "Any object with modification time newer than the `--prune` date is kept, along with everything reachable from it."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:141
+#: en/git-gc.txt:140
#, priority:100
msgid "Most operations that add an object to the database update the modification time of the object if it is already present so that #1 applies."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:145
+#: en/git-gc.txt:144
#, priority:100
msgid "However, these features fall short of a complete solution, so users who run commands concurrently have to live with some risk of corruption (which seems to be low in practice)."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:151
+#: en/git-gc.txt:150
#, priority:100
msgid "The 'git gc --auto' command will run the 'pre-auto-gc' hook. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:159
+#: en/git-gc.txt:158
#, ignore-same, priority:100
msgid "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
msgstr "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
@@ -26087,7 +26358,7 @@ msgid "For each <pathspec> given on command line, descend at most <depth> levels
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:399
+#: en/git-grep.txt:128 en/git-submodule.txt:400
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
@@ -26303,7 +26574,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:951
+#: en/git-grep.txt:217 en/rev-list-options.txt:967
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -26453,127 +26724,151 @@ msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:280
+#: en/git-grep.txt:277
+#, priority:100
+msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:282
+#, priority:100
+msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:287
+#, priority:100
+msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:291
+#, priority:100
+msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:297
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:281
+#: en/git-grep.txt:298
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:282
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:283 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:284
+#: en/git-grep.txt:301
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:289
+#: en/git-grep.txt:306
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:290 en/rev-list-options.txt:65
+#: en/git-grep.txt:307 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:294
+#: en/git-grep.txt:311
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:299
+#: en/git-grep.txt:316
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:300
+#: en/git-grep.txt:317
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:303
+#: en/git-grep.txt:320
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:307
+#: en/git-grep.txt:324
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:328
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:318
+#: en/git-grep.txt:335
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:321
+#: en/git-grep.txt:338
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:322
+#: en/git-grep.txt:339
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:325
+#: en/git-grep.txt:342
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:326
+#: en/git-grep.txt:343
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:329
+#: en/git-grep.txt:346
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:330
+#: en/git-grep.txt:347
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:332
+#: en/git-grep.txt:349
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
@@ -26791,25 +27086,13 @@ msgstr ""
#. type: Plain text
#: en/git-gui.txt:116
#, priority:100
-msgid "A 'git gui' development repository can be obtained from:"
+msgid "The official repository of the 'git gui' project can be found at:"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:118
#, no-wrap, priority:100
-msgid " git clone git://repo.or.cz/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:122
-#, no-wrap, priority:100
-msgid " git clone http://repo.or.cz/r/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:124
-#, priority:100
-msgid "or browsed online at http://repo.or.cz/w/git-gui.git/[]."
+msgid " https://github.com/prati0100/git-gui.git/\n"
msgstr ""
#. type: Title =
@@ -30424,29 +30707,29 @@ msgstr ""
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
-#. type: Plain text
-#: en/git-ls-remote.txt:110
+#. type: delimited block -
+#: en/git-ls-remote.txt:111
#, no-wrap, priority:100
msgid ""
-"\t$ git ls-remote --tags ./.\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"\t$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
-"\t5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"\tc781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
-"\t$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
-"\t$ git ls-remote --tags korg v\\*\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"$ git ls-remote --tags ./.\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
+"$ git ls-remote --tags korg v\\*\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:114
+#: en/git-ls-remote.txt:116
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -30954,7 +31237,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:358
+#: en/git-merge-base.txt:60 en/git-rebase.txt:376
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -30983,235 +31266,235 @@ msgstr ""
msgid "For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:86
+#. type: delimited block .
+#: en/git-merge-base.txt:87
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---B\n"
-"\t /\n"
-"\t---o---1---o---o---o---A\n"
+"\t o---o---o---B\n"
+"\t/\n"
+"---o---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:88
+#: en/git-merge-base.txt:90
#, priority:100
msgid "the merge base between 'A' and 'B' is '1'."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:92
+#: en/git-merge-base.txt:94
#, priority:100
msgid "Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the merge base between 'A' and a hypothetical commit 'M', which is a merge between 'B' and 'C'. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:98
+#. type: delimited block .
+#: en/git-merge-base.txt:101
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---C\n"
-"\t /\n"
-"\t / o---o---o---B\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---C\n"
+" /\n"
+" / o---o---o---B\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:101
+#: en/git-merge-base.txt:105
#, priority:100
msgid "the result of `git merge-base A B C` is '1'. This is because the equivalent topology with a merge commit 'M' between 'B' and 'C' is:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:108
+#. type: delimited block .
+#: en/git-merge-base.txt:113
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---o\n"
-"\t / \\\n"
-"\t / o---o---o---o---M\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---o\n"
+" / \\\n"
+" / o---o---o---o---M\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:112
+#: en/git-merge-base.txt:118
#, priority:100
msgid "and the result of `git merge-base A M` is '1'. Commit '2' is also a common ancestor between 'A' and 'M', but '1' is a better common ancestor, because '2' is an ancestor of '1'. Hence, '2' is not a merge base."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:115
+#: en/git-merge-base.txt:121
#, priority:100
msgid "The result of `git merge-base --octopus A B C` is '2', because '2' is the best common ancestor of all commits."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:118
+#: en/git-merge-base.txt:124
#, priority:100
msgid "When the history involves criss-cross merges, there can be more than one 'best' common ancestor for two commits. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:124
+#. type: delimited block .
+#: en/git-merge-base.txt:131
#, no-wrap, priority:100
msgid ""
-"\t---1---o---A\n"
-"\t \\ /\n"
-"\t X\n"
-"\t / \\\n"
-"\t---2---o---o---B\n"
+"---1---o---A\n"
+" \\ /\n"
+" X\n"
+" / \\\n"
+"---2---o---o---B\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:128
+#: en/git-merge-base.txt:136
#, priority:100
msgid "both '1' and '2' are merge-bases of A and B. Neither one is better than the other (both are 'best' merge bases). When the `--all` option is not given, it is unspecified which best one is output."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:133
+#: en/git-merge-base.txt:141
#, priority:100
msgid "A common idiom to check \"fast-forward-ness\" between two commits A and B is (or at least used to be) to compute the merge base between A and B, and check if it is the same as A, in which case, A is an ancestor of B. You will see this idiom used often in older scripts."
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:139
+#. type: delimited block .
+#: en/git-merge-base.txt:148
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tA=$(git rev-parse --verify A)\n"
-"\tif test \"$A\" = \"$(git merge-base A B)\"\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"A=$(git rev-parse --verify A)\n"
+"if test \"$A\" = \"$(git merge-base A B)\"\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:141
+#: en/git-merge-base.txt:151
#, priority:100
msgid "In modern git, you can say this in a more direct way:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:146
+#. type: delimited block .
+#: en/git-merge-base.txt:157
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tif git merge-base --is-ancestor A B\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"if git merge-base --is-ancestor A B\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:148
+#: en/git-merge-base.txt:160
#, priority:100
msgid "instead."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:150
+#: en/git-merge-base.txt:162
#, no-wrap, priority:100
msgid "Discussion on fork-point mode"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:156
+#: en/git-merge-base.txt:168
#, priority:100
msgid "After working on the `topic` branch created with `git switch -c topic origin/master`, the history of remote-tracking branch `origin/master` may have been rewound and rebuilt, leading to a history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:164
+#. type: delimited block .
+#: en/git-merge-base.txt:177
#, no-wrap, priority:100
msgid ""
-"\t o---B2\n"
-"\t /\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t \\\n"
-"\t B0\n"
-"\t \\\n"
-"\t D0---D1---D (topic)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\\n"
+"\t B0\n"
+"\t \\\n"
+"\t D0---D1---D (topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:170
+#: en/git-merge-base.txt:184
#, priority:100
msgid "where `origin/master` used to point at commits B0, B1, B2 and now it points at B, and your `topic` branch was started on top of it back when `origin/master` was at B0, and you built three commits, D0, D1, and D, on top of it. Imagine that you now want to rebase the work you did on the topic on top of the updated origin/master."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:176
+#: en/git-merge-base.txt:190
#, priority:100
msgid "In such a case, `git merge-base origin/master topic` would return the parent of B0 in the above picture, but B0^..D is *not* the range of commits you would want to replay on top of B (it includes B0, which is not what you wrote; it is a commit the other side discarded when it moved its tip from B0 to B1)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:184
+#: en/git-merge-base.txt:198
#, priority:100
msgid "`git merge-base --fork-point origin/master topic` is designed to help in such a case. It takes not only B but also B0, B1, and B2 (i.e. old tips of the remote-tracking branches your repository's reflog knows about) into account to see on which commit your topic branch was built and finds B0, allowing you to replay only the commits on your topic, excluding the commits the other side later discarded."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:186
+#: en/git-merge-base.txt:200
#, priority:100
msgid "Hence"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:188
+#: en/git-merge-base.txt:202
#, no-wrap, priority:100
msgid " $ fork_point=$(git merge-base --fork-point origin/master topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:190
+#: en/git-merge-base.txt:204
#, priority:100
msgid "will find B0, and"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:192
+#: en/git-merge-base.txt:206
#, no-wrap, priority:100
msgid " $ git rebase --onto origin/master $fork_point topic\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:195
+#: en/git-merge-base.txt:209
#, priority:100
msgid "will replay D0, D1 and D on top of B to create a new history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:203
+#. type: delimited block .
+#: en/git-merge-base.txt:218
#, no-wrap, priority:100
msgid ""
-"\t\t\t o---B2\n"
-"\t\t\t/\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t\t\\ \\\n"
-"\t\t B0 D0'--D1'--D' (topic - updated)\n"
-"\t\t \\\n"
-"\t\t D0---D1---D (topic - old)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\ \\\n"
+"\t B0 D0'--D1'--D' (topic - updated)\n"
+"\t \\\n"
+"\t D0---D1---D (topic - old)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:210
+#: en/git-merge-base.txt:226
#, priority:100
msgid "A caveat is that older reflog entries in your repository may be expired by `git gc`. If B0 no longer appears in the reflog of the remote-tracking branch `origin/master`, the `--fork-point` mode obviously cannot find it and fails, avoiding to give a random and useless result (such as the parent of B0, like the same command without the `--fork-point` option gives)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:221
+#: en/git-merge-base.txt:237
#, priority:100
msgid "Also, the remote-tracking branch you use the `--fork-point` mode with must be the one your topic forked from its tip. If you forked from an older commit than the tip, this mode would not find the fork point (imagine in the above sample history B0 did not exist, origin/master started at B1, moved to B2 and then B, and you forked your topic at origin/master^ when origin/master was B1; the shape of the history would be the same as above, without B0, and the parent of B1 is what `git merge-base origin/master topic` correctly finds, but the `--fork-point` mode will not, because it is not one of the commits that used to be at the tip of origin/master)."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:224
+#: en/git-merge-base.txt:240
#, no-wrap, priority:100
msgid "See also"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:228
+#: en/git-merge-base.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
msgstr "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
@@ -31422,31 +31705,31 @@ msgstr ""
msgid "Examples:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:62
+#. type: delimited block -
+#: en/git-merge-index.txt:63
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
-" This is MM from the original tree.\t\t\t# original\n"
-" This is modified MM in the branch A.\t\t\t# merge1\n"
-" This is modified MM in the branch B.\t\t\t# merge2\n"
-" This is modified MM in the branch B.\t\t\t# current contents\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
+"This is MM from the original tree.\t\t# original\n"
+"This is modified MM in the branch A.\t\t# merge1\n"
+"This is modified MM in the branch B.\t\t# merge2\n"
+"This is modified MM in the branch B.\t\t# current contents\n"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:71
+#. type: delimited block -
+#: en/git-merge-index.txt:74
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
-" cat: : No such file or directory\n"
-" This is added AA in the branch A.\n"
-" This is added AA in the branch B.\n"
-" This is added AA in the branch B.\n"
-" fatal: merge program failed\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
+"cat: : No such file or directory\n"
+"This is added AA in the branch A.\n"
+"This is added AA in the branch B.\n"
+"This is added AA in the branch B.\n"
+"fatal: merge program failed\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-index.txt:76
+#: en/git-merge-index.txt:80
#, priority:100
msgid "where the latter example shows how 'git merge-index' will stop trying to merge once anything has returned an error (i.e., `cat` returned an error for the AA file, because it didn't exist in the original, and thus 'git merge-index' didn't even try to merge the MM thing)."
msgstr ""
@@ -31744,7 +32027,7 @@ msgstr "�閨�筠畇龜戟筠戟龜筠 棘畇戟棘橘 龜剋龜 戟筠�克棘剋�克龜� 龜��棘�
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n"
-"\t[-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
+"\t[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
"\t[--[no-]allow-unrelated-histories]\n"
"\t[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]\n"
"'git merge' (--continue | --abort | --quit)\n"
@@ -32825,7 +33108,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:281 en/merge-options.txt:108
+#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -33805,7 +34088,7 @@ msgid "Conflicts can occur when applying a commit to p4. When this happens, the
msgstr ""
#. type: Labeled list
-#: en/git-p4.txt:359 en/git-submodule.txt:270
+#: en/git-p4.txt:359 en/git-submodule.txt:271
#, no-wrap, priority:220
msgid "--branch <branch>"
msgstr ""
@@ -34941,7 +35224,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:263 en/rev-list-options.txt:760
+#: en/git-pack-objects.txt:263 en/rev-list-options.txt:776
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -34953,13 +35236,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:266 en/rev-list-options.txt:767
+#: en/git-pack-objects.txt:266 en/rev-list-options.txt:783
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:269 en/rev-list-options.txt:770
+#: en/git-pack-objects.txt:269 en/rev-list-options.txt:786
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -34971,7 +35254,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:276 en/rev-list-options.txt:777
+#: en/git-pack-objects.txt:276 en/rev-list-options.txt:793
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -34983,7 +35266,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:281 en/rev-list-options.txt:785
+#: en/git-pack-objects.txt:281 en/rev-list-options.txt:801
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -35742,13 +36025,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:502
+#: en/git-pull.txt:136 en/git-rebase.txt:524
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:503
+#: en/git-pull.txt:137 en/git-rebase.txt:525
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -37541,8 +37824,8 @@ msgstr "�棘勻�棘�戟棘筠 極�龜劇筠戟筠戟龜筠 克棘劇劇龜�棘勻 戟逵畇 勻筠��
#: en/git-rebase.txt:16
#, no-wrap, priority:100
msgid ""
-"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
-"\t[<upstream> [<branch>]]\n"
+"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>]\n"
+"\t[--onto <newbase> | --keep-base] [<upstream> [<branch>]]\n"
"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
"\t--root [<branch>]\n"
"'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch)\n"
@@ -37861,512 +38144,542 @@ msgstr ""
msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:220
+#, ignore-same, no-wrap, priority:100
+msgid "--keep-base"
+msgstr "--keep-base"
+
#. type: Plain text
-#: en/git-rebase.txt:224
+#: en/git-rebase.txt:225
+#, ignore-ellipsis, priority:100
+msgid "Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running 'git rebase --keep-base <upstream> <branch>' is equivalent to running 'git rebase --onto <upstream>... <upstream>'."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:230
+#, priority:100
+msgid "This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:235
+#, priority:100
+msgid "Although both this option and --fork-point find the merge base between <upstream> and <branch>, this option uses the merge base as the _starting point_ on which new commits will be created, whereas --fork-point uses the merge base to determine the _set of commits_ which will be rebased."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#, priority:100
+msgid "See also INCOMPATIBLE OPTIONS below."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:242
#, priority:100
msgid "Upstream branch to compare against. May be any valid commit, not just an existing branch name. Defaults to the configured upstream for the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:230
+#: en/git-rebase.txt:248
#, priority:100
msgid "Restart the rebasing process after having resolved a merge conflict."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237
+#: en/git-rebase.txt:255
#, priority:100
msgid "Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:242
+#: en/git-rebase.txt:260
#, priority:100
msgid "Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:243 en/git-rebase.txt:538
+#: en/git-rebase.txt:261 en/git-rebase.txt:560
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:246
+#: en/git-rebase.txt:264
#, priority:100
msgid "Keep the commits that do not change anything from its parents in the result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:248 en/git-rebase.txt:255 en/git-rebase.txt:280 en/git-rebase.txt:293 en/git-rebase.txt:302 en/git-rebase.txt:344 en/git-rebase.txt:379 en/git-rebase.txt:386 en/git-rebase.txt:393 en/git-rebase.txt:405 en/git-rebase.txt:445 en/git-rebase.txt:470 en/git-rebase.txt:482 en/git-rebase.txt:501
-#, priority:100
-msgid "See also INCOMPATIBLE OPTIONS below."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rebase.txt:253
+#: en/git-rebase.txt:271
#, priority:100
msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:258
+#: en/git-rebase.txt:276
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:259 en/git-rebase.txt:539
+#: en/git-rebase.txt:277 en/git-rebase.txt:561
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:261
+#: en/git-rebase.txt:279
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:266
+#: en/git-rebase.txt:284
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:272
+#: en/git-rebase.txt:290
#, priority:100
msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:278
+#: en/git-rebase.txt:296
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:286
+#: en/git-rebase.txt:304
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:291
+#: en/git-rebase.txt:309
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:294
+#: en/git-rebase.txt:312
#, fuzzy, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr "--strategy-option"
#. type: Labeled list
-#: en/git-rebase.txt:295
+#: en/git-rebase.txt:313
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:300
+#: en/git-rebase.txt:318
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:317
+#: en/git-rebase.txt:335
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:321
+#: en/git-rebase.txt:339
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:325
+#: en/git-rebase.txt:343
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:329
+#: en/git-rebase.txt:347
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:332
+#: en/git-rebase.txt:350
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:333 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:336
+#: en/git-rebase.txt:354
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:345 en/merge-options.txt:47
+#: en/git-rebase.txt:363 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:346
+#: en/git-rebase.txt:364
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:351
+#: en/git-rebase.txt:369
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:357
+#: en/git-rebase.txt:375
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:359
+#: en/git-rebase.txt:377
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:363
+#: en/git-rebase.txt:381
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:387
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:372
+#: en/git-rebase.txt:390
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:394
+#, priority:100
+msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:399
#, priority:100
msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:384
+#: en/git-rebase.txt:406
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:391
+#: en/git-rebase.txt:413
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:421
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:403
+#: en/git-rebase.txt:425
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:407
+#: en/git-rebase.txt:429
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:415
+#: en/git-rebase.txt:437
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:422
+#: en/git-rebase.txt:444
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:426
+#: en/git-rebase.txt:448
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges`, but in contrast to that option works well in interactive rebases: commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:430
+#: en/git-rebase.txt:452
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:432
+#: en/git-rebase.txt:454
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:434 en/git-rebase.txt:535 en/git-svn.txt:680
+#: en/git-rebase.txt:456 en/git-rebase.txt:557 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:439
+#: en/git-rebase.txt:461
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:443
+#: en/git-rebase.txt:465
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:446
+#: en/git-rebase.txt:468
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:447
+#: en/git-rebase.txt:469
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:474
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:455
+#: en/git-rebase.txt:477
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:457
+#: en/git-rebase.txt:479
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:459
+#: en/git-rebase.txt:481
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:483
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:487
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:490
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:480
+#: en/git-rebase.txt:502
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:505
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:484
+#: en/git-rebase.txt:506
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:495
+#: en/git-rebase.txt:517
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:499
+#: en/git-rebase.txt:521
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:509
+#: en/git-rebase.txt:531
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:510
+#: en/git-rebase.txt:532
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:511
+#: en/git-rebase.txt:533
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:514
+#: en/git-rebase.txt:536
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:516
+#: en/git-rebase.txt:538
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:519
+#: en/git-rebase.txt:541
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:523
+#: en/git-rebase.txt:545
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:527
+#: en/git-rebase.txt:549
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:530
+#: en/git-rebase.txt:552
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:553
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:555
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Plain text
-#: en/git-rebase.txt:534
+#: en/git-rebase.txt:556
#, ignore-same, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:537
+#: en/git-rebase.txt:559
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:540
+#: en/git-rebase.txt:562
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:542
+#: en/git-rebase.txt:564
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:544
+#: en/git-rebase.txt:566
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:567
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:546
+#: en/git-rebase.txt:568
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:547
+#: en/git-rebase.txt:569
#, priority:100
-msgid "--rebase-merges and --strategy"
+msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:548
+#: en/git-rebase.txt:570
#, priority:100
-msgid "--rebase-merges and --strategy-option"
+msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:550
+#: en/git-rebase.txt:572
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:575
#, no-wrap, priority:100
msgid "There are some subtle differences how the backends behave.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:556
+#: en/git-rebase.txt:578
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38374,7 +38687,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:561
+#: en/git-rebase.txt:583
#, no-wrap, priority:100
msgid ""
"The am backend drops any \"empty\" commits, regardless of whether the\n"
@@ -38384,7 +38697,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:588
#, no-wrap, priority:100
msgid ""
"The interactive backend drops commits by default that\n"
@@ -38394,7 +38707,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:591
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38402,7 +38715,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:573
+#: en/git-rebase.txt:595
#, no-wrap, priority:100
msgid ""
"Directory rename heuristics are enabled in the merge and interactive\n"
@@ -38411,145 +38724,145 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:597
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:577
+#: en/git-rebase.txt:599
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:582
+#: en/git-rebase.txt:604
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:587
+#: en/git-rebase.txt:609
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:589
+#: en/git-rebase.txt:611
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:596
+#: en/git-rebase.txt:618
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:598
+#: en/git-rebase.txt:620
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:600
+#: en/git-rebase.txt:622
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:601
+#: en/git-rebase.txt:623
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:602
+#: en/git-rebase.txt:624
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:603
+#: en/git-rebase.txt:625
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:605
+#: en/git-rebase.txt:627
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:607
+#: en/git-rebase.txt:629
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:631
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:610
+#: en/git-rebase.txt:632
#, fuzzy, priority:100
msgid "commit"
msgstr "`commit`"
#. type: Plain text
-#: en/git-rebase.txt:612
+#: en/git-rebase.txt:634
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:614
+#: en/git-rebase.txt:636
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:615
+#: en/git-rebase.txt:637
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:616
+#: en/git-rebase.txt:638
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:644
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:646
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:626
+#: en/git-rebase.txt:648
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:653
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:658
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -38558,73 +38871,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:641
+#: en/git-rebase.txt:663
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:668
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:649
+#: en/git-rebase.txt:671
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:652
+#: en/git-rebase.txt:674
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:655
+#: en/git-rebase.txt:677
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:685
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:667
+#: en/git-rebase.txt:689
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:693
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:696
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:699
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:680
+#: en/git-rebase.txt:702
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:687
+#: en/git-rebase.txt:709
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -38635,25 +38948,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:691
+#: en/git-rebase.txt:713
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:694
+#: en/git-rebase.txt:716
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:701
+#: en/git-rebase.txt:723
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:710
+#: en/git-rebase.txt:732
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -38666,31 +38979,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:715
+#: en/git-rebase.txt:737
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:720
+#: en/git-rebase.txt:742
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:745
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:727
+#: en/git-rebase.txt:749
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:759
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -38704,85 +39017,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:740
+#: en/git-rebase.txt:762
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:746
+#: en/git-rebase.txt:768
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:750
+#: en/git-rebase.txt:772
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:752
+#: en/git-rebase.txt:774
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:756
+#: en/git-rebase.txt:778
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:760
+#: en/git-rebase.txt:782
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:763
+#: en/git-rebase.txt:785
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:765
+#: en/git-rebase.txt:787
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:767
+#: en/git-rebase.txt:789
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:794
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:775
+#: en/git-rebase.txt:797
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:804
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:809
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:816
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38793,13 +39106,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:819
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:826
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38810,13 +39123,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:808
+#: en/git-rebase.txt:830
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:815
+#: en/git-rebase.txt:837
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38827,73 +39140,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:822
+#: en/git-rebase.txt:844
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:824
+#: en/git-rebase.txt:846
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:825
+#: en/git-rebase.txt:847
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:829
+#: en/git-rebase.txt:851
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:836
+#: en/git-rebase.txt:859
#, priority:100
-msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or `filter-branch`."
+msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:839
+#: en/git-rebase.txt:862
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:867
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:848
+#: en/git-rebase.txt:871
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:850
+#: en/git-rebase.txt:873
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:875
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:858
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38904,19 +39217,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:885
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:866
+#: en/git-rebase.txt:889
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:894
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -38926,67 +39239,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:876
+#: en/git-rebase.txt:899
#, priority:100
-msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge-base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
+msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:880
+#: en/git-rebase.txt:903
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:883
+#: en/git-rebase.txt:906
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:886
+#: en/git-rebase.txt:909
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:888
+#: en/git-rebase.txt:911
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:893
+#: en/git-rebase.txt:916
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:895
+#: en/git-rebase.txt:918
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:926
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:907
+#: en/git-rebase.txt:930
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:912
+#: en/git-rebase.txt:935
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:922
+#: en/git-rebase.txt:945
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -39000,25 +39313,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:929
+#: en/git-rebase.txt:952
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:932
+#: en/git-rebase.txt:955
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:935 en/git-rebase.txt:1012
+#: en/git-rebase.txt:958 en/git-rebase.txt:1035
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:941
+#: en/git-rebase.txt:964
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39029,7 +39342,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:946
+#: en/git-rebase.txt:969
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39039,7 +39352,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:950
+#: en/git-rebase.txt:973
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39048,55 +39361,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:954
+#: en/git-rebase.txt:977
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:962
+#: en/git-rebase.txt:985
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:992
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:975
+#: en/git-rebase.txt:998
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:978
+#: en/git-rebase.txt:1001
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1008
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:989
+#: en/git-rebase.txt:1012
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:996
+#: en/git-rebase.txt:1019
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1003
+#: en/git-rebase.txt:1026
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39107,13 +39420,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1009
+#: en/git-rebase.txt:1032
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1015
+#: en/git-rebase.txt:1038
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39121,7 +39434,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1022
+#: en/git-rebase.txt:1045
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39133,7 +39446,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1049
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39142,37 +39455,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1035
+#: en/git-rebase.txt:1058
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1037
+#: en/git-rebase.txt:1060
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1039
+#: en/git-rebase.txt:1062
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1043
+#: en/git-rebase.txt:1066
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1068
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1072
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -39480,117 +39793,118 @@ msgstr ""
msgid "Using this hook, it is easy to generate mails describing the updates to the repository. This example script sends one mail message per ref listing the commits pushed to the repository, and logs the push certificates of signed pushes with good signatures to a logger service:"
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:191
+#. type: delimited block -
+#: en/git-receive-pack.txt:192
#, no-wrap, priority:100
msgid ""
-"\t#!/bin/sh\n"
-"\t# mail out commit update information.\n"
-"\twhile read oval nval ref\n"
-"\tdo\n"
-"\t\tif expr \"$oval\" : '0*$' >/dev/null\n"
-"\t\tthen\n"
-"\t\t\techo \"Created a new ref, with the following commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\"\n"
-"\t\telse\n"
-"\t\t\techo \"New commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
-"\t\tfi |\n"
-"\t\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
-"\tdone\n"
-"\t# log signed push certificate, if any\n"
-"\tif test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"#!/bin/sh\n"
+"# mail out commit update information.\n"
+"while read oval nval ref\n"
+"do\n"
+"\tif expr \"$oval\" : '0*$' >/dev/null\n"
"\tthen\n"
-"\t\t(\n"
-"\t\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
-"\t\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
-"\t\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
-"\tfi\n"
-"\texit 0\n"
+"\t\techo \"Created a new ref, with the following commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\"\n"
+"\telse\n"
+"\t\techo \"New commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
+"\tfi |\n"
+"\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
+"done\n"
+"# log signed push certificate, if any\n"
+"if test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"then\n"
+"\t(\n"
+"\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
+"\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
+"\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
+"fi\n"
+"exit 0\n"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:194
+#: en/git-receive-pack.txt:196
#, priority:100
msgid "The exit code from this hook invocation is ignored, however a non-zero exit code will generate an error message."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:200
+#: en/git-receive-pack.txt:202
#, priority:100
msgid "Note that it is possible for refname to not have sha1-new when this hook runs. This can easily occur if another user modifies the ref after it was updated by 'git-receive-pack', but before the hook was able to evaluate it. It is recommended that hooks rely on sha1-new rather than the current value of refname."
msgstr ""
#. type: Title -
-#: en/git-receive-pack.txt:202
+#: en/git-receive-pack.txt:204
#, no-wrap, priority:100
msgid "POST-UPDATE HOOK"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:207
+#: en/git-receive-pack.txt:209
#, priority:100
msgid "After all other processing, if at least one ref was updated, and if $GIT_DIR/hooks/post-update file exists and is executable, then post-update will be called with the list of refs that have been updated. This can be used to implement any repository wide cleanup tasks."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:211
+#: en/git-receive-pack.txt:213
#, priority:100
msgid "The exit code from this hook invocation is ignored; the only thing left for 'git-receive-pack' to do at that point is to exit itself anyway."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:214
+#: en/git-receive-pack.txt:216
#, priority:100
msgid "This hook can be used, for example, to run `git update-server-info` if the repository is packed and is served via a dumb transport."
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:217
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/git-receive-pack.txt:220
+#, fuzzy, no-wrap, priority:100
+#| msgid "git-update-server-info(1)"
msgid ""
-"\t#!/bin/sh\n"
-"\texec git update-server-info\n"
-msgstr ""
+"#!/bin/sh\n"
+"exec git update-server-info\n"
+msgstr "git-update-server-info(1)"
#. type: Title -
-#: en/git-receive-pack.txt:220
+#: en/git-receive-pack.txt:224
#, no-wrap, priority:100
msgid "QUARANTINE ENVIRONMENT"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:227
+#: en/git-receive-pack.txt:231
#, priority:100
msgid "When `receive-pack` takes in objects, they are placed into a temporary \"quarantine\" directory within the `$GIT_DIR/objects` directory and migrated into the main object store only after the `pre-receive` hook has completed. If the push fails before then, the temporary directory is removed entirely."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:229
+#: en/git-receive-pack.txt:233
#, priority:100
msgid "This has a few user-visible effects and caveats:"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:235
+#: en/git-receive-pack.txt:239
#, priority:100
msgid "Pushes which fail due to problems with the incoming pack, missing objects, or due to the `pre-receive` hook will not leave any on-disk data. This is usually helpful to prevent repeated failed pushes from filling up your disk, but can make debugging more challenging."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:238
+#: en/git-receive-pack.txt:242
#, priority:100
msgid "Any objects created by the `pre-receive` hook will be created in the quarantine directory (and migrated only if it succeeds)."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:244
+#: en/git-receive-pack.txt:248
#, priority:100
msgid "The `pre-receive` hook MUST NOT update any refs to point to quarantined objects. Other programs accessing the repository will not be able to see the objects (and if the pre-receive hook fails, those refs would become corrupted). For safety, any ref updates from within `pre-receive` are automatically rejected."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:249
+#: en/git-receive-pack.txt:253
#, ignore-same, priority:100
msgid "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
msgstr "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
@@ -40918,7 +41232,7 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:131
#, priority:100
-msgid "linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and linkgit:git-rebase[1], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
+msgid "linkgit:git-hash-object[1], linkgit:git-rebase[1], and https://github.com/newren/git-filter-repo[git-filter-repo], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
msgstr ""
#. type: Plain text
@@ -40941,9 +41255,10 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:158
-#, priority:100
-msgid "linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1]"
-msgstr ""
+#, fuzzy, priority:100
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] https://github.com/newren/git-filter-repo[git-filter-repo]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title =
#: en/git-request-pull.txt:2
@@ -41735,7 +42050,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:228 en/git-stash.txt:229
+#: en/git-reset.txt:228 en/git-stash.txt:230
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -42463,102 +42778,49 @@ msgid "git-rev-list - Lists commit objects in reverse chronological order"
msgstr "��勻棘畇 �極龜�克逵 棘閨�筠克�棘勻 克棘劇劇龜�逵 勻 棘閨�逵�戟棘劇 ��棘戟棘剋棘均龜�筠�克棘劇 極棘��畇克筠"
#. type: Plain text
-#: en/git-rev-list.txt:65
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"'git rev-list' [ --max-count=<number> ]\n"
-"\t [ --skip=<number> ]\n"
-"\t [ --max-age=<timestamp> ]\n"
-"\t [ --min-age=<timestamp> ]\n"
-"\t [ --sparse ]\n"
-"\t [ --merges ]\n"
-"\t [ --no-merges ]\n"
-"\t [ --min-parents=<number> ]\n"
-"\t [ --no-min-parents ]\n"
-"\t [ --max-parents=<number> ]\n"
-"\t [ --no-max-parents ]\n"
-"\t [ --first-parent ]\n"
-"\t [ --remove-empty ]\n"
-"\t [ --full-history ]\n"
-"\t [ --not ]\n"
-"\t [ --all ]\n"
-"\t [ --branches[=<pattern>] ]\n"
-"\t [ --tags[=<pattern>] ]\n"
-"\t [ --remotes[=<pattern>] ]\n"
-"\t [ --glob=<glob-pattern> ]\n"
-"\t [ --ignore-missing ]\n"
-"\t [ --stdin ]\n"
-"\t [ --quiet ]\n"
-"\t [ --topo-order ]\n"
-"\t [ --parents ]\n"
-"\t [ --timestamp ]\n"
-"\t [ --left-right ]\n"
-"\t [ --left-only ]\n"
-"\t [ --right-only ]\n"
-"\t [ --cherry-mark ]\n"
-"\t [ --cherry-pick ]\n"
-"\t [ --encoding=<encoding> ]\n"
-"\t [ --(author|committer|grep)=<pattern> ]\n"
-"\t [ --regexp-ignore-case | -i ]\n"
-"\t [ --extended-regexp | -E ]\n"
-"\t [ --fixed-strings | -F ]\n"
-"\t [ --date=<format>]\n"
-"\t [ [ --objects | --objects-edge | --objects-edge-aggressive ]\n"
-"\t [ --unpacked ]\n"
-"\t [ --object-names | --no-object-names ]\n"
-"\t [ --filter=<filter-spec> [ --filter-print-omitted ] ] ]\n"
-"\t [ --missing=<missing-action> ]\n"
-"\t [ --pretty | --header ]\n"
-"\t [ --bisect ]\n"
-"\t [ --bisect-vars ]\n"
-"\t [ --bisect-all ]\n"
-"\t [ --merge ]\n"
-"\t [ --reverse ]\n"
-"\t [ --walk-reflogs ]\n"
-"\t [ --no-walk ] [ --do-walk ]\n"
-"\t [ --count ]\n"
-"\t [ --use-bitmap-index ]\n"
-"\t <commit>... [ \\-- <paths>... ]\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:73
+#: en/git-rev-list.txt:13
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
+msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n"
+msgstr "git difftool [<棘極�龜龜>] [<克棘劇劇龜�> [<克棘劇劇龜�>]] [--] [<極���>��]"
+
+#. type: Plain text
+#: en/git-rev-list.txt:21
#, priority:100
msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:80
+#: en/git-rev-list.txt:28
#, priority:100
msgid "You can think of this as a set operation. Commits given on the command line form a set of commits that are reachable from any of them, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:82
+#: en/git-rev-list.txt:30
#, priority:100
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:85
+#: en/git-rev-list.txt:33
#, no-wrap, priority:100
msgid "\t$ git rev-list foo bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:89
+#: en/git-rev-list.txt:37
#, priority:100
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:93
+#: en/git-rev-list.txt:41
#, priority:100
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:97
+#: en/git-rev-list.txt:45
#, no-wrap, priority:100
msgid ""
"\t$ git rev-list origin..HEAD\n"
@@ -42566,13 +42828,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:102
+#: en/git-rev-list.txt:50
#, ignore-ellipsis, priority:100
msgid "Another special notation is \"'<commit1>'...'<commit2>'\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:106
+#: en/git-rev-list.txt:54
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git rev-list A B --not $(git merge-base --all A B)\n"
@@ -42580,7 +42842,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:113
+#: en/git-rev-list.txt:61
#, priority:100
msgid "'rev-list' is a very essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For this reason, it has a lot of different options that enables it to be used by commands as different as 'git bisect' and 'git repack'."
msgstr ""
@@ -44702,31 +44964,31 @@ msgstr ""
msgid "To use 'git send-email' to send your patches through the GMail SMTP server, edit ~/.gitconfig to specify your account settings:"
msgstr ""
-#. type: Plain text
-#: en/git-send-email.txt:494
+#. type: delimited block -
+#: en/git-send-email.txt:495
#, no-wrap, priority:100
msgid ""
-"\t[sendemail]\n"
-"\t\tsmtpEncryption = tls\n"
-"\t\tsmtpServer = smtp.gmail.com\n"
-"\t\tsmtpUser = yourname@gmail.com\n"
-"\t\tsmtpServerPort = 587\n"
+"[sendemail]\n"
+"\tsmtpEncryption = tls\n"
+"\tsmtpServer = smtp.gmail.com\n"
+"\tsmtpUser = yourname@gmail.com\n"
+"\tsmtpServerPort = 587\n"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:498
+#: en/git-send-email.txt:500
#, priority:100
msgid "If you have multifactor authentication setup on your gmail account, you will need to generate an app-specific password for use with 'git send-email'. Visit https://security.google.com/settings/security/apppasswords to create it."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:501
+#: en/git-send-email.txt:503
#, priority:100
msgid "Once your commits are ready to be sent to the mailing list, run the following commands:"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:505
+#: en/git-send-email.txt:507
#, no-wrap, priority:100
msgid ""
"\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -44735,19 +44997,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:510
+#: en/git-send-email.txt:512
#, priority:100
msgid "The first time you run it, you will be prompted for your credentials. Enter the app-specific or your regular password as appropriate. If you have credential helper configured (see linkgit:git-credential[1]), the password will be saved in the credential store so you won't have to type it the next time."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:518
#, priority:100
msgid "Note: the following core Perl modules that may be installed with your distribution of Perl are required: MIME::Base64, MIME::QuotedPrint, Net::Domain and Net::SMTP. These additional Perl modules are also required: Authen::SASL and Mail::Address."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:521
+#: en/git-send-email.txt:523
#, priority:100
msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
msgstr ""
@@ -46340,25 +46602,25 @@ msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--a
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:92
+#: en/git-stash.txt:93
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs, and any non-option arguments form the message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:93
+#: en/git-stash.txt:94
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:100
+#: en/git-stash.txt:101
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:104
+#: en/git-stash.txt:105
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46366,139 +46628,139 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:108
+#: en/git-stash.txt:109
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:109
+#: en/git-stash.txt:110
#, fuzzy, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr "git show [<棘極�龜龜>] <棘閨�筠克�>��"
#. type: Plain text
-#: en/git-stash.txt:119
+#: en/git-stash.txt:120
#, priority:240
msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:120
+#: en/git-stash.txt:121
#, fuzzy, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr "git stash pop [--index] [-q|--quiet] [<�極���逵戟戟�筠-龜鈞劇筠戟筠戟龜�>]"
#. type: Plain text
-#: en/git-stash.txt:126
+#: en/git-stash.txt:127
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:130
+#: en/git-stash.txt:131
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:135
+#: en/git-stash.txt:136
#, priority:240
msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:138
+#: en/git-stash.txt:139
#, priority:240
msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:139
+#: en/git-stash.txt:140
#, fuzzy, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr "git stash apply [--index] [-q|--quiet] [<�極���逵戟戟�筠-龜鈞劇筠戟筠戟龜�>]"
#. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:145
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:145
+#: en/git-stash.txt:146
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:153
+#: en/git-stash.txt:154
#, priority:240
msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:159
+#: en/git-stash.txt:160
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:160
+#: en/git-stash.txt:161
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:164
+#: en/git-stash.txt:165
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:165
+#: en/git-stash.txt:166
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:171
+#: en/git-stash.txt:172
#, priority:240
msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:172 en/git-update-ref.txt:100
+#: en/git-stash.txt:173 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:179
+#: en/git-stash.txt:180
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:180
+#: en/git-stash.txt:181
#, fuzzy, no-wrap, priority:240
msgid "store"
msgstr "劇龜戟-畇剋龜戟逵"
#. type: Plain text
-#: en/git-stash.txt:186
+#: en/git-stash.txt:187
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:195
+#: en/git-stash.txt:196
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:199
+#: en/git-stash.txt:200
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46507,31 +46769,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:203
+#: en/git-stash.txt:204
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:208
+#: en/git-stash.txt:209
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:214
+#: en/git-stash.txt:215
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:219
+#: en/git-stash.txt:220
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:227
+#: en/git-stash.txt:228
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -46543,13 +46805,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:235
+#: en/git-stash.txt:236
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:246
+#: en/git-stash.txt:247
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46564,13 +46826,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:249
+#: en/git-stash.txt:250
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:257
+#: en/git-stash.txt:258
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46582,19 +46844,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:259
+#: en/git-stash.txt:260
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:264
+#: en/git-stash.txt:265
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:275
+#: en/git-stash.txt:276
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46609,19 +46871,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:277
+#: en/git-stash.txt:278
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:283
+#: en/git-stash.txt:284
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:288
+#: en/git-stash.txt:289
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -46630,7 +46892,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:298
+#: en/git-stash.txt:299
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -46708,61 +46970,61 @@ msgid "In addition to the names of files that have been changed, also show the t
msgstr ""
#. type: Plain text
-#: en/git-status.txt:65
+#: en/git-status.txt:66
#, priority:280
msgid "The mode parameter is used to specify the handling of untracked files. It is optional: it defaults to 'all', and if specified, it must be stuck to the option (e.g. `-uno`, but not `-u no`)."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:69
+#: en/git-status.txt:70
#, no-wrap, priority:280
msgid "'no' - Show no untracked files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:70
+#: en/git-status.txt:71
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:81
+#: en/git-status.txt:82
#, priority:280
msgid "When `-u` option is not used, untracked files and directories are shown (i.e. the same as specifying `normal`), to help you avoid forgetting to add newly created files. Because it takes extra work to find untracked files in the filesystem, this mode may take some time in a large working tree. Consider enabling untracked cache and split index if supported (see `git update-index --untracked-cache` and `git update-index --split-index`), Otherwise you can use `no` to have `git status` return more quickly without showing untracked files."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:99
+#: en/git-status.txt:101
#, priority:280
msgid "Ignore changes to submodules when looking for changes. <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 before 1.7.0). Using \"all\" hides all changes to submodules (and suppresses the output of submodule summaries when the config option `status.submoduleSummary` is set)."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:100
+#: en/git-status.txt:102
#, no-wrap, priority:280
msgid "--ignored[=<mode>]"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:102
+#: en/git-status.txt:104
#, priority:280
msgid "Show ignored files as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:105
+#: en/git-status.txt:108
#, priority:280
msgid "The mode parameter is used to specify the handling of ignored files. It is optional: it defaults to 'traditional'."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:109
+#: en/git-status.txt:112
#, priority:280
msgid "'traditional' - Shows ignored files and directories, unless"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:112
+#: en/git-status.txt:115
#, no-wrap, priority:280
msgid ""
"--untracked-files=all is specified, in which case\n"
@@ -46771,109 +47033,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:113
+#: en/git-status.txt:116
#, no-wrap, priority:280
msgid "'no'\t - Show no ignored files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:114
+#: en/git-status.txt:117
#, no-wrap, priority:280
msgid "'matching' - Shows ignored files and directories matching an\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:115
+#: en/git-status.txt:118
#, no-wrap, priority:280
msgid "ignore pattern.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:121
+#: en/git-status.txt:124
#, priority:280
msgid "When 'matching' mode is specified, paths that explicitly match an ignored pattern are shown. If a directory matches an ignore pattern, then it is shown, but not paths contained in the ignored directory. If a directory does not match an ignore pattern, but all contents are ignored, then the directory is not shown, but all contents are shown."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:125
+#: en/git-status.txt:129
#, priority:280
msgid "Terminate entries with NUL, instead of LF. This implies the `--porcelain=v1` output format if no other format is given."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:132
+#: en/git-status.txt:136
#, priority:280
msgid "Display untracked files in columns. See configuration variable column.status for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:133
+#: en/git-status.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--ahead-behind"
msgstr "--ahead-behind"
#. type: Labeled list
-#: en/git-status.txt:134
+#: en/git-status.txt:138
#, ignore-same, no-wrap, priority:280
msgid "--no-ahead-behind"
msgstr "--no-ahead-behind"
#. type: Plain text
-#: en/git-status.txt:137
+#: en/git-status.txt:141
#, priority:280
msgid "Display or do not display detailed ahead/behind counts for the branch relative to its upstream branch. Defaults to true."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:138
+#: en/git-status.txt:142
#, ignore-same, no-wrap, priority:280
msgid "--renames"
msgstr "--renames"
#. type: Plain text
-#: en/git-status.txt:142
+#: en/git-status.txt:146
#, priority:280
msgid "Turn on/off rename detection regardless of user configuration. See also linkgit:git-diff[1] `--no-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:147
+#: en/git-status.txt:151
#, priority:280
msgid "Turn on rename detection, optionally setting the similarity threshold. See also linkgit:git-diff[1] `--find-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:150
+#: en/git-status.txt:154
#, priority:280
msgid "See the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:158
+#: en/git-status.txt:162
#, priority:280
msgid "The output from this command is designed to be used as a commit template comment. The default, long format, is designed to be human readable, verbose and descriptive. Its contents and format are subject to change at any time."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:163
+#: en/git-status.txt:167
#, priority:280
msgid "The paths mentioned in the output, unlike many other Git commands, are made relative to the current directory if you are working in a subdirectory (this is on purpose, to help cutting and pasting). See the status.relativePaths config option below."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:165
+#: en/git-status.txt:169
#, no-wrap, priority:280
msgid "Short Format"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:169
+#: en/git-status.txt:173
#, priority:280
msgid "In the short-format, the status of each path is shown as one of these forms"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:172
+#: en/git-status.txt:176
#, no-wrap, priority:280
msgid ""
"\tXY PATH\n"
@@ -46881,73 +47143,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:176
+#: en/git-status.txt:180
#, priority:280
msgid "where `ORIG_PATH` is where the renamed/copied contents came from. `ORIG_PATH` is only shown when the entry is renamed or copied. The `XY` is a two-letter status code."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:182
+#: en/git-status.txt:186
#, priority:280
msgid "The fields (including the `->`) are separated from each other by a single space. If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash-escaped."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:188
+#: en/git-status.txt:192
#, priority:280
msgid "For paths with merge conflicts, `X` and `Y` show the modification states of each side of the merge. For paths that do not have merge conflicts, `X` shows the status of the index, and `Y` shows the status of the work tree. For untracked paths, `XY` are `??`. Other status codes can be interpreted as follows:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:190
+#: en/git-status.txt:194
#, priority:280
msgid "' ' = unmodified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:191
+#: en/git-status.txt:195
#, priority:280
msgid "'M' = modified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:192
+#: en/git-status.txt:196
#, priority:280
msgid "'A' = added"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:193
+#: en/git-status.txt:197
#, priority:280
msgid "'D' = deleted"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:194
+#: en/git-status.txt:198
#, priority:280
msgid "'R' = renamed"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:195
+#: en/git-status.txt:199
#, priority:280
msgid "'C' = copied"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:196
+#: en/git-status.txt:200
#, priority:280
msgid "'U' = updated but unmerged"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:199
+#: en/git-status.txt:203
#, priority:280
msgid "Ignored files are not listed, unless `--ignored` option is in effect, in which case `XY` are `!!`."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:226
+#: en/git-status.txt:230
#, no-wrap, priority:280
msgid ""
"X Y Meaning\n"
@@ -46978,7 +47240,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:235
+#: en/git-status.txt:239
#, no-wrap, priority:280
msgid ""
"Submodules have more state and instead report\n"
@@ -46991,91 +47253,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:238
+#: en/git-status.txt:242
#, priority:280
msgid "'m' and '?' are applied recursively. For example if a nested submodule in a submodule contains an untracked file, this is reported as '?' as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:240
+#: en/git-status.txt:244
#, priority:280
msgid "If -b is used the short-format status is preceded by a line"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:242
+#: en/git-status.txt:246
#, no-wrap, priority:280
msgid " ## branchname tracking info\n"
msgstr ""
#. type: Title ~
-#: en/git-status.txt:244
+#: en/git-status.txt:248
#, no-wrap, priority:280
msgid "Porcelain Format Version 1"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:251
+#: en/git-status.txt:255
#, priority:280
msgid "Version 1 porcelain format is similar to the short format, but is guaranteed not to change in a backwards-incompatible way between Git versions or based on user configuration. This makes it ideal for parsing by scripts. The description of the short format above also describes the porcelain format, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:254
+#: en/git-status.txt:258
#, priority:280
msgid "The user's color.status configuration is not respected; color will always be off."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:257
+#: en/git-status.txt:261
#, priority:280
msgid "The user's status.relativePaths configuration is not respected; paths shown will always be relative to the repository root."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:267
+#: en/git-status.txt:271
#, priority:280
msgid "There is also an alternate -z format recommended for machine parsing. In that format, the status field is the same, but some other things change. First, the '\\->' is omitted from rename entries and the field order is reversed (e.g 'from \\-> to' becomes 'to from'). Second, a NUL (ASCII 0) follows each filename, replacing space as a field separator and the terminating newline (but a space still separates the status field from the first filename). Third, filenames containing special characters are not specially formatted; no quoting or backslash-escaping is performed."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:269
+#: en/git-status.txt:273
#, priority:280
msgid "Any submodule changes are reported as modified `M` instead of `m` or single `?`."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:271
+#: en/git-status.txt:275
#, no-wrap, priority:280
msgid "Porcelain Format Version 2"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:276
+#: en/git-status.txt:280
#, priority:280
msgid "Version 2 format adds more detailed information about the state of the worktree and changed items. Version 2 also defines an extensible set of easy to parse optional headers."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:280
+#: en/git-status.txt:284
#, priority:280
msgid "Header lines start with \"#\" and are added in response to specific command line arguments. Parsers should ignore headers they don't recognize."
msgstr ""
#. type: Title ^
-#: en/git-status.txt:282
+#: en/git-status.txt:286
#, no-wrap, priority:280
msgid "Branch Headers"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:286
+#: en/git-status.txt:290
#, priority:280
msgid "If `--branch` is given, a series of header lines are printed with information about the current branch."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:296
+#: en/git-status.txt:300
#, no-wrap, priority:280
msgid ""
"Line Notes\n"
@@ -47089,43 +47351,43 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:299
+#: en/git-status.txt:303
#, no-wrap, priority:280
msgid "Changed Tracked Entries"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:306
+#: en/git-status.txt:310
#, priority:280
msgid "Following the headers, a series of lines are printed for tracked entries. One of three different line formats may be used to describe an entry depending on the type of change. Tracked entries are printed in an undefined order; parsers should allow for a mixture of the 3 line types in any order."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:308
+#: en/git-status.txt:312
#, priority:280
msgid "Ordinary changed entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:310
+#: en/git-status.txt:314
#, no-wrap, priority:280
msgid " 1 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:312
+#: en/git-status.txt:316
#, priority:280
msgid "Renamed or copied entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:314
+#: en/git-status.txt:318
#, no-wrap, priority:280
msgid " 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:345
+#: en/git-status.txt:349
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47160,19 +47422,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:349
+#: en/git-status.txt:353
#, priority:280
msgid "Unmerged entries have the following format; the first character is a \"u\" to distinguish from ordinary changed entries."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:351
+#: en/git-status.txt:355
#, no-wrap, priority:280
msgid " u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:368
+#: en/git-status.txt:372
#, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47193,86 +47455,86 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:371
+#: en/git-status.txt:375
#, fuzzy, no-wrap, priority:280
#| msgid "Other"
msgid "Other Items"
msgstr "���均棘筠"
#. type: Plain text
-#: en/git-status.txt:376
+#: en/git-status.txt:380
#, priority:280
msgid "Following the tracked entries (and if requested), a series of lines will be printed for untracked and then ignored items found in the worktree."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:378
+#: en/git-status.txt:382
#, priority:280
msgid "Untracked items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:380
+#: en/git-status.txt:384
#, no-wrap, priority:280
msgid " ? <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:382
+#: en/git-status.txt:386
#, priority:280
msgid "Ignored items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:384
+#: en/git-status.txt:388
#, no-wrap, priority:280
msgid " ! <path>\n"
msgstr ""
#. type: Title ^
-#: en/git-status.txt:386
+#: en/git-status.txt:390
#, no-wrap, priority:280
msgid "Pathname Format Notes and -z"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:391
+#: en/git-status.txt:395
#, priority:280
msgid "When the `-z` option is given, pathnames are printed as is and without any quoting and lines are terminated with a NUL (ASCII 0x00) byte."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:395
+#: en/git-status.txt:399
#, 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])."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:404
+#: en/git-status.txt:408
#, priority:280
msgid "The command honors `color.status` (or `status.color` -- they mean the same thing and the latter is kept for backward compatibility) and `color.status.<slot>` configuration variables to colorize its output."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:408
+#: en/git-status.txt:412
#, priority:280
msgid "If the config variable `status.relativePaths` is set to false, then all paths shown are relative to the repository root, not to the current directory."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:419
+#: en/git-status.txt:423
#, priority:280
msgid "If `status.submoduleSummary` is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). Please note that the summary output from the status command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings."
msgstr ""
#. type: Title -
-#: en/git-status.txt:421
+#: en/git-status.txt:425
#, no-wrap, priority:280
msgid "BACKGROUND REFRESH"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:432
+#: en/git-status.txt:436
#, priority:280
msgid "By default, `git status` will automatically refresh the index, updating the cached stat information from the working tree and writing out the result. Writing out the updated index is an optimization that isn't strictly necessary (`status` computes the values for itself, but writing them out is just to save subsequent programs from repeating our computation). When `status` is run in the background, the lock held during the write may conflict with other simultaneous processes, causing them to fail. Scripts running `status` in the background should consider using `git --no-optional-locks status` (see linkgit:git[1] for details)."
msgstr ""
@@ -47716,282 +47978,288 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:176
#, no-wrap, priority:220
-msgid "set-branch ((-d|--default)|(-b|--branch <branch>)) [--] <path>"
+msgid "set-branch (-b|--branch) <branch> [--] <path>"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-submodule.txt:177
+#, no-wrap, priority:220
+msgid "set-branch (-d|--default) [--] <path>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:181
+#: en/git-submodule.txt:182
#, priority:220
msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:182
+#: en/git-submodule.txt:183
#, ignore-ellipsis, no-wrap, priority:220
msgid "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:191
+#: en/git-submodule.txt:192
#, priority:220
msgid "Show commit summary between the given commit (defaults to HEAD) and working tree/index. For a submodule in question, a series of commits in the submodule between the given super project commit and the index or working tree (switched by `--cached`) are shown. If the option `--files` is given, show the series of commits in the submodule between the index of the super project and the working tree of the submodule (this option doesn't allow to use the `--cached` option or to provide an explicit commit)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:194
+#: en/git-submodule.txt:195
#, priority:220
msgid "Using the `--submodule=log` option with linkgit:git-diff[1] will provide that information too."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:195
+#: en/git-submodule.txt:196
#, no-wrap, priority:220
msgid "foreach [--recursive] <command>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:216
+#: en/git-submodule.txt:217
#, priority:220
msgid "Evaluates an arbitrary shell command in each checked out submodule. The command has access to the variables $name, $sm_path, $displaypath, $sha1 and $toplevel: $name is the name of the relevant submodule section in `.gitmodules`, $sm_path is the path of the submodule as recorded in the immediate superproject, $displaypath contains the relative path from the current working directory to the submodules root directory, $sha1 is the commit as recorded in the immediate superproject, and $toplevel is the absolute path to the top-level of the immediate superproject. Note that to avoid conflicts with '$PATH' on Windows, the '$path' variable is now a deprecated synonym of '$sm_path' variable. Any submodules defined in the superproject but not checked out are ignored by this command. Unless given `--quiet`, foreach prints the name of each submodule before evaluating the command. If `--recursive` is given, submodules are traversed recursively (i.e. the given shell command is evaluated in nested submodules as well). A non-zero return from the command in any submodule causes the processing to terminate. This can be overridden by adding '|| :' to the end of the command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:219
+#: en/git-submodule.txt:220
#, priority:220
msgid "As an example, the command below will show the path and currently checked out commit for each submodule:"
msgstr ""
#. type: delimited block -
-#: en/git-submodule.txt:222
+#: en/git-submodule.txt:223
#, no-wrap, priority:220
msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:224
+#: en/git-submodule.txt:225
#, ignore-ellipsis, no-wrap, priority:220
msgid "sync [--recursive] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:231
+#: en/git-submodule.txt:232
#, priority:220
msgid "Synchronizes submodules' remote URL configuration setting to the value specified in `.gitmodules`. It will only affect those submodules which already have a URL entry in .git/config (that is the case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:234
+#: en/git-submodule.txt:235
#, priority:220
msgid "`git submodule sync` synchronizes all submodules while `git submodule sync -- A` synchronizes submodule \"A\" only."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:237
+#: en/git-submodule.txt:238
#, priority:220
msgid "If `--recursive` is specified, this command will recurse into the registered submodules, and sync any nested submodules within."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:238
+#: en/git-submodule.txt:239
#, no-wrap, priority:220
msgid "absorbgitdirs"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:245
+#: en/git-submodule.txt:246
#, priority:220
msgid "If a git directory of a submodule is inside the submodule, move the git directory of the submodule into its superprojects `$GIT_DIR/modules` path and then connect the git directory and its working directory by setting the `core.worktree` and adding a .git file pointing to the git directory embedded in the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:249
+#: en/git-submodule.txt:250
#, priority:220
msgid "A repository that was cloned independently and later added as a submodule or old setups have the submodules git directory inside the submodule instead of embedded into the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:251
+#: en/git-submodule.txt:252
#, priority:220
msgid "This command is recursive by default."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:257
+#: en/git-submodule.txt:258
#, priority:220
msgid "Only print error messages."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:264
+#: en/git-submodule.txt:265
#, priority:220
msgid "This option is only valid for add and update commands. Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:268
+#: en/git-submodule.txt:269
#, priority:220
msgid "This option is only valid for the deinit command. Unregister all submodules in the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:269
+#: en/git-submodule.txt:270
#, fuzzy, no-wrap, priority:220
#| msgid "<branch>"
msgid "-b <branch>"
msgstr "<勻筠�克逵>"
#. type: Plain text
-#: en/git-submodule.txt:277
+#: en/git-submodule.txt:278
#, priority:220
msgid "Branch of repository to add as submodule. The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository. If the option is not specified, it defaults to 'master'."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:290
+#: en/git-submodule.txt:291
#, priority:220
msgid "This option is only valid for add, deinit and update commands. When running add, allow adding an otherwise ignored submodule path. When running deinit the submodule working trees will be removed even if they contain local changes. When running update (only effective with the checkout procedure), throw away local changes in submodules when switching to a different commit; and always run a checkout operation in the submodule, even if the commit listed in the index of the containing repository matches the commit checked out in the submodule."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:295
+#: en/git-submodule.txt:296
#, priority:220
msgid "This option is only valid for status and summary commands. These commands typically use the commit found in the submodule HEAD, but with this option, the commit stored in the index is used instead."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:296
+#: en/git-submodule.txt:297
#, ignore-same, no-wrap, priority:220
msgid "--files"
msgstr "--files"
#. type: Plain text
-#: en/git-submodule.txt:300
+#: en/git-submodule.txt:301
#, priority:220
msgid "This option is only valid for the summary command. This command compares the commit in the index with that in the submodule HEAD when this option is used."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:302
+#: en/git-submodule.txt:303
#, ignore-same, no-wrap, priority:220
msgid "--summary-limit"
msgstr "--summary-limit"
#. type: Plain text
-#: en/git-submodule.txt:308
+#: en/git-submodule.txt:309
#, priority:220
msgid "This option is only valid for the summary command. Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:309
+#: en/git-submodule.txt:310
#, ignore-same, no-wrap, priority:220
msgid "--remote"
msgstr "--remote"
#. type: Plain text
-#: en/git-submodule.txt:318
+#: en/git-submodule.txt:319
#, priority:220
msgid "This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:324
+#: en/git-submodule.txt:325
#, priority:220
msgid "This works for any of the supported update procedures (`--checkout`, `--rebase`, etc.). The only change is the source of the target SHA-1. For example, `submodule update --remote --merge` will merge upstream submodule changes into the submodules, while `submodule update --merge` will merge superproject gitlink changes into the submodules."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:329
+#: en/git-submodule.txt:330
#, priority:220
msgid "In order to ensure a current tracking branch state, `update --remote` fetches the submodule's remote repository before calculating the SHA-1. If you don't want to fetch, you should use `submodule update --remote --no-fetch`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:339
+#: en/git-submodule.txt:340
#, priority:220
msgid "Use this option to integrate changes from the upstream subproject with your submodule's current HEAD. Alternatively, you can run `git pull` from the submodule, which is equivalent except for the remote branch name: `update --remote` uses the default upstream repository and `submodule.<name>.branch`, while `git pull` uses the submodule's `branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want to distribute the default upstream branch with the superproject and `branch.<name>.merge` if you want a more native feel while working in the submodule itself."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:341
+#: en/git-submodule.txt:342
#, ignore-same, no-wrap, priority:220
msgid "--no-fetch"
msgstr "--no-fetch"
#. type: Plain text
-#: en/git-submodule.txt:344
+#: en/git-submodule.txt:345
#, priority:220
msgid "This option is only valid for the update command. Don't fetch new objects from the remote site."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:345
+#: en/git-submodule.txt:346
#, ignore-same, no-wrap, priority:220
msgid "--checkout"
msgstr "--checkout"
#. type: Plain text
-#: en/git-submodule.txt:353
+#: en/git-submodule.txt:354
#, priority:220
msgid "This option is only valid for the update command. Checkout the commit recorded in the superproject on a detached HEAD in the submodule. This is the default behavior, the main use of this option is to override `submodule.$name.update` when set to a value other than `checkout`. If the key `submodule.$name.update` is either not explicitly set or set to `checkout`, this option is implicit."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:363
+#: en/git-submodule.txt:364
#, priority:220
msgid "This option is only valid for the update command. Merge the commit recorded in the superproject into the current branch of the submodule. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve the resulting conflicts within the submodule with the usual conflict resolution tools. If the key `submodule.$name.update` is set to `merge`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:364
+#: en/git-submodule.txt:365
#, ignore-same, no-wrap, priority:220
msgid "--rebase"
msgstr "--rebase"
#. type: Plain text
-#: en/git-submodule.txt:372
+#: en/git-submodule.txt:373
#, priority:220
msgid "This option is only valid for the update command. Rebase the current branch onto the commit recorded in the superproject. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve these failures with linkgit:git-rebase[1]. If the key `submodule.$name.update` is set to `rebase`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:373
+#: en/git-submodule.txt:374
#, ignore-same, no-wrap, priority:220
msgid "--init"
msgstr "--init"
#. type: Plain text
-#: en/git-submodule.txt:377
+#: en/git-submodule.txt:378
#, priority:220
msgid "This option is only valid for the update command. Initialize all submodules for which \"git submodule init\" has not been called so far before updating."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:378
+#: en/git-submodule.txt:379
#, ignore-same, no-wrap, priority:220
msgid "--name"
msgstr "--name"
#. type: Plain text
-#: en/git-submodule.txt:382
+#: en/git-submodule.txt:383
#, priority:220
msgid "This option is only valid for the add command. It sets the submodule's name to the given string instead of defaulting to its path. The name must be valid as a directory name and may not end with a '/'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:383
+#: en/git-submodule.txt:384
#, fuzzy, no-wrap, priority:220
msgid "--reference <repository>"
msgstr "���剋逵筠劇�橘 �筠極棘鈞龜�棘�龜橘"
#. type: Plain text
-#: en/git-submodule.txt:387 en/git-submodule.txt:396
+#: en/git-submodule.txt:388 en/git-submodule.txt:397
#, priority:220
msgid "This option is only valid for add and update commands. These commands sometimes need to clone a remote repository. In this case, this option will be passed to the linkgit:git-clone[1] command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:391
+#: en/git-submodule.txt:392
#, no-wrap, priority:220
msgid ""
"*NOTE*: Do *not* use this option unless you have read the note\n"
@@ -48000,61 +48268,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:398
+#: en/git-submodule.txt:399
#, no-wrap, priority:220
msgid "*NOTE*: see the NOTE for the `--reference` option.\n"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:404
+#: en/git-submodule.txt:405
#, priority:220
msgid "This option is only valid for foreach, update, status and sync commands. Traverse submodules recursively. The operation is performed not only in the submodules of the current repo, but also in any nested submodules inside those submodules (and so on)."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:405
+#: en/git-submodule.txt:406
#, ignore-same, no-wrap, priority:220
msgid "--depth"
msgstr "--depth"
#. type: Plain text
-#: en/git-submodule.txt:409
+#: en/git-submodule.txt:410
#, priority:220
msgid "This option is valid for add and update commands. Create a 'shallow' clone with a history truncated to the specified number of revisions. See linkgit:git-clone[1]"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:410
+#: en/git-submodule.txt:411
#, ignore-same, no-wrap, priority:220
msgid "--[no-]recommend-shallow"
msgstr "--[no-]recommend-shallow"
#. type: Plain text
-#: en/git-submodule.txt:415
+#: en/git-submodule.txt:416
#, priority:220
msgid "This option is only valid for the update command. The initial clone of a submodule will use the recommended `submodule.<name>.shallow` as provided by the `.gitmodules` file by default. To ignore the suggestions use `--no-recommend-shallow`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:421
+#: en/git-submodule.txt:422
#, priority:220
msgid "This option is only valid for the update command. Clone new submodules in parallel with as many jobs. Defaults to the `submodule.fetchJobs` option."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:426
+#: en/git-submodule.txt:427
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:434
+#: en/git-submodule.txt:435
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:438
+#: en/git-submodule.txt:439
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -48686,7 +48954,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:889
+#: en/git-svn.txt:346 en/rev-list-options.txt:905
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -49499,7 +49767,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:777
#, priority:100
-msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider linkgit:git-filter-branch[1] instead. filter-branch also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
+msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports, and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider https://github.com/newren/git-filter-repo[git-filter-repo] instead. filter-repo also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
msgstr ""
#. type: Labeled list
@@ -51426,16 +51694,6 @@ msgid ""
"#\n"
msgstr ""
-#. type: delimited block -
-#: en/git.txt:310
-#, 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/git.txt:315
#, no-wrap, priority:100
@@ -55477,98 +55735,104 @@ msgstr ""
msgid "This option determines how the merge message will be cleaned up before commiting. See linkgit:git-commit[1] for more details. In addition, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on to the commit machinery in the case of a merge conflict."
msgstr ""
+#. type: Labeled list
+#: en/merge-options.txt:44
+#, ignore-same, no-wrap, priority:240
+msgid "--ff-only"
+msgstr "--ff-only"
+
#. type: Plain text
-#: en/merge-options.txt:46
+#: en/merge-options.txt:50
#, priority:240
-msgid "When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. This is the default behavior."
+msgid "Specifies how a merge is handled when the merged-in history is already a descendant of the current history. `--ff` is the default unless merging an annotated (and possibly signed) tag that is not stored in its natural place in the `refs/tags/` hierarchy, in which case `--no-ff` is assumed."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:52
+#: en/merge-options.txt:55
#, priority:240
-msgid "Create a merge commit even when the merge resolves as a fast-forward. This is the default behaviour when merging an annotated (and possibly signed) tag that is not stored in its natural place in 'refs/tags/' hierarchy."
+msgid "With `--ff`, when possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit."
msgstr ""
-#. type: Labeled list
-#: en/merge-options.txt:53
-#, ignore-same, no-wrap, priority:240
-msgid "--ff-only"
-msgstr "--ff-only"
+#. type: Plain text
+#: en/merge-options.txt:58
+#, priority:240
+msgid "With `--no-ff`, create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward."
+msgstr ""
#. type: Plain text
-#: en/merge-options.txt:57
+#: en/merge-options.txt:61
#, priority:240
-msgid "Refuse to merge and exit with a non-zero status unless the current `HEAD` is already up to date or the merge can be resolved as a fast-forward."
+msgid "With `--ff-only`, resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:63
+#: en/merge-options.txt:67
#, priority:240
msgid "GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:69
+#: en/merge-options.txt:73
#, priority:240
msgid "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also linkgit:git-fmt-merge-msg[1]."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:72
+#: en/merge-options.txt:76
#, priority:240
msgid "With --no-log do not list one-line descriptions from the actual commits being merged."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:74
+#: en/merge-options.txt:78
#, ignore-same, no-wrap, priority:240
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
-#: en/merge-options.txt:83
+#: en/merge-options.txt:87
#, priority:240
msgid "With --no-signoff do not add a Signed-off-by line."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:89
+#: en/merge-options.txt:93
#, priority:240
msgid "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:92
+#: en/merge-options.txt:96
#, priority:240
msgid "With -n or --no-stat do not show a diffstat at the end of the merge."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:93
+#: en/merge-options.txt:97
#, ignore-same, no-wrap, priority:240
msgid "--squash"
msgstr "--squash"
#. type: Labeled list
-#: en/merge-options.txt:94
+#: en/merge-options.txt:98
#, ignore-same, no-wrap, priority:240
msgid "--no-squash"
msgstr "--no-squash"
#. type: Plain text
-#: en/merge-options.txt:102
+#: en/merge-options.txt:106
#, priority:240
msgid "Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:105
+#: en/merge-options.txt:109
#, priority:240
msgid "With --no-squash perform the merge and commit the result. This option can be used to override --squash."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:107
+#: en/merge-options.txt:111
#, priority:240
msgid "With --squash, --commit is not allowed, and will fail."
msgstr ""
@@ -55576,71 +55840,77 @@ msgstr ""
#. type: Plain text
#: en/merge-options.txt:115
#, priority:240
+msgid "This option bypasses the pre-merge and commit-msg hooks. See also linkgit:githooks[5]."
+msgstr ""
+
+#. type: Plain text
+#: en/merge-options.txt:123
+#, priority:240
msgid "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise)."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:116
+#: en/merge-options.txt:124
#, no-wrap, priority:240
msgid "-X <option>"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:120
+#: en/merge-options.txt:128
#, priority:240
msgid "Pass merge strategy specific option through to the merge strategy."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:121
+#: en/merge-options.txt:129
#, ignore-same, no-wrap, priority:240
msgid "--verify-signatures"
msgstr "--verify-signatures"
#. type: Labeled list
-#: en/merge-options.txt:122
+#: en/merge-options.txt:130
#, ignore-same, no-wrap, priority:240
msgid "--no-verify-signatures"
msgstr "--no-verify-signatures"
#. type: Plain text
-#: en/merge-options.txt:128
+#: en/merge-options.txt:136
#, priority:240
msgid "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:130
+#: en/merge-options.txt:138
#, ignore-same, no-wrap, priority:240
msgid "--no-summary"
msgstr "--no-summary"
#. type: Plain text
-#: en/merge-options.txt:133
+#: en/merge-options.txt:141
#, priority:240
msgid "Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:138
+#: en/merge-options.txt:146
#, priority:240
msgid "Operate quietly. Implies --no-progress."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:149
+#: en/merge-options.txt:157
#, priority:240
msgid "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:152
+#: en/merge-options.txt:160
#, ignore-same, no-wrap, priority:240
msgid "--allow-unrelated-histories"
msgstr "--allow-unrelated-histories"
#. type: Plain text
-#: en/merge-options.txt:158
+#: en/merge-options.txt:166
#, priority:240
msgid "By default, `git merge` command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added."
msgstr ""
@@ -56976,7 +57246,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:215
#, priority:260
-msgid "minutes ago`}; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -59354,263 +59624,281 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:762
#, priority:260
+msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:771
+#, ignore-ellipsis, priority:260
+msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:775
+#, priority:260
+msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:778
+#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:779
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:766
+#: en/rev-list-options.txt:782
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:773
+#: en/rev-list-options.txt:789
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:781
+#: en/rev-list-options.txt:797
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:800
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:791
+#: en/rev-list-options.txt:807
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:793
+#: en/rev-list-options.txt:809
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:801
+#: en/rev-list-options.txt:817
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:802
+#: en/rev-list-options.txt:818
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:804
+#: en/rev-list-options.txt:820
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:822
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:812
+#: en/rev-list-options.txt:828
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:832
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:818
+#: en/rev-list-options.txt:834
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:819
+#: en/rev-list-options.txt:835
#, fuzzy, no-wrap, priority:260
msgid "--date=<format>"
msgstr "--date <�棘�劇逵�>"
#. type: Plain text
-#: en/rev-list-options.txt:826
+#: en/rev-list-options.txt:842
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:847
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:833
+#: en/rev-list-options.txt:849
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:852
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:838
+#: en/rev-list-options.txt:854
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:839
+#: en/rev-list-options.txt:855
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:840
+#: en/rev-list-options.txt:856
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:859
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:846
+#: en/rev-list-options.txt:862
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:864
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:873
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:864
+#: en/rev-list-options.txt:880
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:868
+#: en/rev-list-options.txt:884
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:875
+#: en/rev-list-options.txt:891
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:894
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:880
+#: en/rev-list-options.txt:896
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:882
+#: en/rev-list-options.txt:898
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:884
+#: en/rev-list-options.txt:900
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:887
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:892
+#: en/rev-list-options.txt:908
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:909
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:896
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:898
+#: en/rev-list-options.txt:914
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:902
+#: en/rev-list-options.txt:918
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:907
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:925
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:932
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -59621,19 +59909,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:919
+#: en/rev-list-options.txt:935
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:922
+#: en/rev-list-options.txt:938
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:929
+#: en/rev-list-options.txt:945
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -59645,85 +59933,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:931
+#: en/rev-list-options.txt:947
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:937
+#: en/rev-list-options.txt:953
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:939
+#: en/rev-list-options.txt:955
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:942
+#: en/rev-list-options.txt:958
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:943
+#: en/rev-list-options.txt:959
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:949
+#: en/rev-list-options.txt:965
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:959
+#: en/rev-list-options.txt:975
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:963
+#: en/rev-list-options.txt:979
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:984
#, priority:260
msgid "Listed below are options that control the formatting of diff output. Some of them are specific to linkgit:git-rev-list[1], however other diff options may be given. See linkgit:git-diff-files[1] for more options."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:991
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:981
+#: en/rev-list-options.txt:997
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:1012
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1015
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1018
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.tr.po b/po/documentation.tr.po
index a963de356cc86dd5c331304eadb2cc99c7f859cd..dc18f95cbcf2bd09cba3bd704e6c21448251eecb 100644
--- a/po/documentation.tr.po
+++ b/po/documentation.tr.po
@@ -6,9 +6,9 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2019-08-27 18:53+0200\n"
+"POT-Creation-Date: 2019-12-08 16:35+0100\n"
"PO-Revision-Date: 2019-10-30 13:22+0100\n"
-"Last-Translator: Matthias A횩hauer <mha1993@live.de>\n"
+"Last-Translator: Matthias Ahauer <mha1993@live.de>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: tr\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:319 en/git-fsck.txt:38 en/git-rebase.txt:471
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:321 en/git-fsck.txt:38 en/git-rebase.txt:493
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -88,7 +88,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1000
+#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1016
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -124,7 +124,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:433 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -466,7 +466,7 @@ msgid "Get and set repository or global options."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1505
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1528
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-export[1]"
msgstr "linkgit:git-fast-export[1]"
@@ -478,7 +478,7 @@ msgid "Git data exporter."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:243
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-import[1]"
msgstr "linkgit:git-fast-import[1]"
@@ -2259,95 +2259,95 @@ msgstr ""
msgid "Example"
msgstr ""
-#. type: Plain text
-#: en/config.txt:185
+#. type: delimited block -
+#: en/config.txt:186
#, no-wrap, priority:100
msgid ""
-"\t# Core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"# Core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:190
+#. type: delimited block -
+#: en/config.txt:191
#, no-wrap, priority:100
msgid ""
-"\t# Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"# Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:194
+#. type: delimited block -
+#: en/config.txt:195
#, no-wrap, priority:100
msgid ""
-"\t[branch \"devel\"]\n"
-"\t\tremote = origin\n"
-"\t\tmerge = refs/heads/devel\n"
+"[branch \"devel\"]\n"
+"\tremote = origin\n"
+"\tmerge = refs/heads/devel\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:199
+#. type: delimited block -
+#: en/config.txt:200
#, no-wrap, priority:100
msgid ""
-"\t# Proxy settings\n"
-"\t[core]\n"
-"\t\tgitProxy=\"ssh\" for \"kernel.org\"\n"
-"\t\tgitProxy=default-proxy ; for the rest\n"
+"# Proxy settings\n"
+"[core]\n"
+"\tgitProxy=\"ssh\" for \"kernel.org\"\n"
+"\tgitProxy=default-proxy ; for the rest\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:204
+#. type: delimited block -
+#: en/config.txt:205
#, no-wrap, priority:100
msgid ""
-"\t[include]\n"
-"\t\tpath = /path/to/foo.inc ; include by absolute path\n"
-"\t\tpath = foo.inc ; find \"foo.inc\" relative to the current file\n"
-"\t\tpath = ~/foo.inc ; find \"foo.inc\" in your `$HOME` directory\n"
+"[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: Plain text
-#: en/config.txt:208
+#. type: delimited block -
+#: en/config.txt:209
#, no-wrap, priority:100
msgid ""
-"\t; include if $GIT_DIR is /path/to/foo/.git\n"
-"\t[includeIf \"gitdir:/path/to/foo/.git\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; 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: Plain text
-#: en/config.txt:212
+#. type: delimited block -
+#: en/config.txt:213
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside /path/to/group\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside /path/to/group\n"
+"[includeIf \"gitdir:/path/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:216
+#. type: delimited block -
+#: en/config.txt:217
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside $HOME/to/group\n"
-"\t[includeIf \"gitdir:~/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside $HOME/to/group\n"
+"[includeIf \"gitdir:~/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:222
+#. type: delimited block -
+#: en/config.txt:223
#, no-wrap, priority:100
msgid ""
-"\t; relative paths are always relative to the including\n"
-"\t; file (if the condition is true); their location is not\n"
-"\t; affected by the condition\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = foo.inc\n"
+"; 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:227
+#: en/config.txt:229
#, no-wrap, priority:100
msgid ""
"\t; include only if we are in a worktree where foo-branch is\n"
@@ -2357,43 +2357,43 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/config.txt:229
+#: en/config.txt:231
#, no-wrap, priority:100
msgid "Values"
msgstr ""
#. type: Plain text
-#: en/config.txt:234
+#: 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:235
+#: en/config.txt:237
#, no-wrap, priority:100
msgid "boolean"
msgstr ""
#. type: Plain text
-#: en/config.txt:240
+#: 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:241
+#: en/config.txt:243
#, no-wrap, priority:100
msgid "true"
msgstr ""
#. type: Plain text
-#: en/config.txt:242
+#: en/config.txt:244
#, priority:100
msgid "Boolean true literals are `yes`, `on`, `true`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:244
+#: en/config.txt:246
#, no-wrap, priority:100
msgid ""
"and `1`. Also, a variable defined without `= <value>`\n"
@@ -2401,109 +2401,109 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/config.txt:245
+#: en/config.txt:247
#, no-wrap, priority:100
msgid "false"
msgstr ""
#. type: Plain text
-#: en/config.txt:246
+#: en/config.txt:248
#, priority:100
msgid "Boolean false literals are `no`, `off`, `false`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:247
+#: en/config.txt:249
#, no-wrap, priority:100
msgid "`0` and the empty string.\n"
msgstr ""
#. type: Plain text
-#: en/config.txt:251
+#: 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:252
+#: en/config.txt:254
#, no-wrap, priority:100
msgid "integer"
msgstr ""
#. type: Plain text
-#: en/config.txt:256
+#: 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:257 en/diff-options.txt:356 en/git-for-each-ref.txt:177
+#: 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:261
+#: 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:265
+#: en/config.txt:267
#, 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."
msgstr ""
#. type: Plain text
-#: en/config.txt:270
+#: en/config.txt:272
#, 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:277
+#: en/config.txt:279
#, 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:280
+#: en/config.txt:282
#, 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:289
+#: en/config.txt:291
#, 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:290
+#: en/config.txt:292
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:296
+#: en/config.txt:298
#, 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:299 en/git-imap-send.txt:58
+#: en/config.txt:301 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:304
+#: en/config.txt:306
#, 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:309
+#: en/config.txt:311
#, 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 ""
@@ -3241,53 +3241,53 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
#, no-wrap, priority:260
-msgid "Generating patches with -p"
+msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:10
+#: en/diff-generate-patch.txt:14
#, priority:260
-msgid "When \"git-diff-index\", \"git-diff-tree\", or \"git-diff-files\" are run with a `-p` option, \"git diff\" without the `--raw` option, or \"git log\" with the \"-p\" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
+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:13
+#: 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:15
+#: 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:17
+#: 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:21
+#: 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:25
+#: 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:27
+#: 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:39
+#: en/diff-generate-patch.txt:43
#, no-wrap, priority:260
msgid ""
"old mode <mode>\n"
@@ -3304,43 +3304,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:42
+#: 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:44
+#: 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:51
+#: 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:55
+#: en/diff-generate-patch.txt:59
#, priority:260
-msgid "The index line includes the SHA-1 checksum 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."
+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:59
+#: 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:64
+#: 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:71
+#: en/diff-generate-patch.txt:75
#, no-wrap, priority:260
msgid ""
"diff --git a/a b/b\n"
@@ -3352,25 +3352,25 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/diff-generate-patch.txt:74
+#: en/diff-generate-patch.txt:78
#, no-wrap, priority:260
-msgid "combined diff format"
+msgid "Combined diff format"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:82
+#: 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:84
+#: en/diff-generate-patch.txt:88
#, priority:260
-msgid "A 'combined diff' format looks like this:"
+msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:93
+#: en/diff-generate-patch.txt:97
#, no-wrap, priority:260
msgid ""
"diff --combined describe.c\n"
@@ -3383,7 +3383,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:103
+#: en/diff-generate-patch.txt:107
#, no-wrap, priority:260
msgid ""
"- static void describe(char *arg)\n"
@@ -3398,7 +3398,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:113
+#: en/diff-generate-patch.txt:117
#, no-wrap, priority:260
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
@@ -3413,37 +3413,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:117
+#: en/diff-generate-patch.txt:121
#, priority:260
-msgid "It is preceded with a \"git diff\" header, that looks like this (when `-c` option is used):"
+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:119
+#: en/diff-generate-patch.txt:123
#, no-wrap, priority:260
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:121
+#: en/diff-generate-patch.txt:125
#, priority:260
-msgid "or like this (when `--cc` option is used):"
+msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:123
+#: en/diff-generate-patch.txt:127
#, no-wrap, priority:260
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:126
+#: 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:131
+#: en/diff-generate-patch.txt:135
#, no-wrap, priority:260
msgid ""
"index <hash>,<hash>..<hash>\n"
@@ -3453,91 +3453,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:137
+#: 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:139
+#: 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:141 en/diff-generate-patch.txt:152 en/diff-generate-patch.txt:153 en/diff-generate-patch.txt:154
+#: 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:142 en/diff-generate-patch.txt:155
+#: 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:146
+#: 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:150
+#: 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:159
+#: 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:165
+#: 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 for apply. The change is similar to the change in the extended 'index' header:"
+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:167
+#: 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:170
+#: 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:179
+#: 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:185
+#: 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:191
+#: 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:197
+#: 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:327 en/merge-options.txt:86
+#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3549,7 +3549,7 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:186 en/git-add.txt:111 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/diff-options.txt:23 en/fetch-options.txt:198 en/git-add.txt:111 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
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
@@ -3573,7 +3573,7 @@ msgid "\tThis is the default.\n"
msgstr ""
#. 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:117 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
+#: 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:118 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"
@@ -3992,7 +3992,7 @@ msgid "Synonym for --dirstat=files,param1,param2..."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:129
+#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--summary"
msgstr "--summary"
@@ -4016,7 +4016,7 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:122 en/git-update-index.txt:168
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:168
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4425,7 +4425,7 @@ msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:402 en/git-status.txt:139
+#: en/diff-options.txt:402 en/git-status.txt:143
#, ignore-same, no-wrap, priority:280
msgid "--no-renames"
msgstr "--no-renames"
@@ -4529,7 +4529,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:463
#, priority:280
-msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
+msgid "It affects the way a change that amounts to a total rewrite of a file does not appear as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
msgstr ""
#. type: Plain text
@@ -4545,7 +4545,7 @@ msgid "-M[<n>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:473 en/git-status.txt:143
+#: en/diff-options.txt:473 en/git-status.txt:147
#, no-wrap, priority:280
msgid "--find-renames[=<n>]"
msgstr ""
@@ -4968,7 +4968,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:203 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:52 en/git-clone.txt:120 en/git-commit.txt:314 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:301 en/git-gc.txt:68 en/git-grep.txt:296 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:315 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:255 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:136 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:215 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:316 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:302 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:256 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5022,7 +5022,7 @@ msgid "Allow (or disallow) external text conversion filters to be run when compa
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:85
+#: en/diff-options.txt:722 en/git-status.txt:87
#, no-wrap, priority:280
msgid "--ignore-submodules[=<when>]"
msgstr ""
@@ -5100,7 +5100,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:265 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:266 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5232,7 +5232,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:48 en/git-commit.txt:317 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:50 en/git-commit.txt:319 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5244,13 +5244,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:34 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:195 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:347 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:278 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:279 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:35 en/git-fast-import.txt:37 en/git-filter-branch.txt:196 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:279 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:280 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5282,7 +5282,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:112 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:113 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5360,7 +5360,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:47 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:97 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:326 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:301 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:85
+#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:98 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:302 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5426,187 +5426,211 @@ msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:167
+#: en/fetch-options.txt:164
+#, priority:220
+msgid "Number of parallel children to be used for all forms of fetching."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:169
+#, priority:220
+msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:172
#, priority:220
-msgid "Number of parallel children to be used for fetching submodules. Each will fetch from different submodules, such that fetching many submodules will be faster. By default submodules will be fetched one at a time."
+msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:168 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:173 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:171
+#: en/fetch-options.txt:176
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:172
+#: en/fetch-options.txt:177 en/git-branch.txt:225 en/git-push.txt:349
+#, ignore-same, no-wrap, priority:240
+msgid "--set-upstream"
+msgstr "--set-upstream"
+
+#. type: Plain text
+#: en/fetch-options.txt:183
+#, priority:220
+msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:184
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:188
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177
+#: en/fetch-options.txt:189
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:184
+#: en/fetch-options.txt:196
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:199
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:194
+#: en/fetch-options.txt:206
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:195 en/git-clone.txt:182
+#: en/fetch-options.txt:207 en/git-clone.txt:182
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:212
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:202 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:51 en/git-clone.txt:119 en/git-commit.txt:313 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:300 en/git-grep.txt:295 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:314 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:254 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:135
+#: en/fetch-options.txt:214 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:315 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:301 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:255 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:207
+#: en/fetch-options.txt:219
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:208 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:298 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:318 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:139
+#: en/fetch-options.txt:220 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:300 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:209 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:299 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:319 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:140
+#: en/fetch-options.txt:221 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:301 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:211 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:142
+#: en/fetch-options.txt:223 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:213 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:326 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:258 en/git-switch.txt:144 en/merge-options.txt:143
+#: en/fetch-options.txt:225 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:328 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:259 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:218 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:230 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:219 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:231 en/git-ls-remote.txt:73 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:220 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:232 en/git-clone.txt:135 en/git-ls-remote.txt:74
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-clone.txt:142
+#: en/fetch-options.txt:239 en/git-clone.txt:142
#, priority:300
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:240
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:233
+#: en/fetch-options.txt:245
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:234
+#: en/fetch-options.txt:246
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:240
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:241 en/git-push.txt:398
+#: en/fetch-options.txt:253 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:242 en/git-push.txt:399
+#: en/fetch-options.txt:254 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:244 en/git-push.txt:401
+#: en/fetch-options.txt:256 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:245 en/git-push.txt:402
+#: en/fetch-options.txt:257 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:246 en/git-push.txt:403
+#: en/fetch-options.txt:258 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:247 en/git-push.txt:405
+#: en/fetch-options.txt:259 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5646,7 +5670,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:20 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:67 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
+#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr ""
@@ -5688,13 +5712,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr ""
#. type: Title -
-#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:83 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:85 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:115 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:253 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:86 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:254 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:52 en/git-grep.txt:308 en/git-status.txt:148
+#: en/git-add.txt:52 en/git-grep.txt:325 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
@@ -5706,7 +5730,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:67 en/git-grep.txt:314
+#: en/git-add.txt:67 en/git-grep.txt:331
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -5724,13 +5748,13 @@ msgid "Allow adding otherwise ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:42 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:394 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:43 en/git-rebase.txt:395 en/git-rebase.txt:536 en/git-svn.txt:297
+#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5754,7 +5778,7 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:275 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
@@ -5844,7 +5868,7 @@ msgid "This option is primarily to help users who are used to older versions of
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:146 en/git-format-patch.txt:101 en/git-submodule.txt:340
+#: en/git-add.txt:146 en/git-format-patch.txt:102 en/git-submodule.txt:341
#, no-wrap, priority:300
msgid "-N"
msgstr ""
@@ -5934,7 +5958,7 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:343 en/git-grep.txt:304 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
+#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:345 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr ""
@@ -5946,7 +5970,7 @@ msgid "This option can be used to separate command-line options from the list of
msgstr ""
#. type: Title -
-#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:357 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:153 en/git-fetch.txt:242 en/git-filter-branch.txt:234 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:634 en/git-grep.txt:316 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:206 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:359 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:638 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr ""
@@ -5988,7 +6012,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:221 en/git-rebase.txt:591
+#: en/git-add.txt:221 en/git-rebase.txt:613
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr ""
@@ -6000,7 +6024,7 @@ msgid "When the command enters the interactive mode, it shows the output of the
msgstr ""
#. type: Plain text
-#: en/git-add.txt:230 en/git-clean.txt:83
+#: en/git-add.txt:230 en/git-clean.txt:85
#, priority:300
msgid "The command loop shows the list of subcommands available, and gives a prompt \"What now> \". In general, when the prompt ends with a single '>', you can pick only one of the choices given and type return, like this:"
msgstr ""
@@ -6300,7 +6324,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:135 en/git-commit-tree.txt:118 en/git-commit.txt:487 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:241 en/git-fast-import.txt:1503 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:679 en/git-gc.txt:154 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:112 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:247 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:519 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:292 en/git-status.txt:434 en/git-submodule.txt:436 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
+#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:489 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1526 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:683 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:437 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
@@ -6312,13 +6336,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:139 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:495 en/git-config.txt:492 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:245 en/git-fast-import.txt:1507 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:480 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:683 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:334 en/git-gui.txt:126 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:116 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:230 en/git-merge-file.txt:94 en/git-merge-index.txt:78 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1052 en/git-receive-pack.txt:251 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:123 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:523 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:300 en/git-status.txt:438 en/git-stripspace.txt:93 en/git-submodule.txt:440 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
+#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:497 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1530 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:693 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:687 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:441 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
#, no-wrap, priority:300
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:140 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:496 en/git-config.txt:493 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:246 en/git-fast-import.txt:1508 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:481 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:684 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:335 en/git-gui.txt:127 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:117 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:231 en/git-merge-file.txt:95 en/git-merge-index.txt:79 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1053 en/git-receive-pack.txt:252 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:124 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:524 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:301 en/git-status.txt:439 en/git-stripspace.txt:94 en/git-submodule.txt:441 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
+#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:498 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1531 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:694 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:688 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:442 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6368,7 +6392,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:118 en/git-rebase.txt:387 en/git-revert.txt:98 en/merge-options.txt:73
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:119 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6410,7 +6434,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:969
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:985
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6440,7 +6464,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:267 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:989
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1005
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6532,37 +6556,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:303 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:304 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:307 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:373 en/git-rebase.txt:524
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:374
+#: en/git-am.txt:109 en/git-rebase.txt:396
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:337
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6622,7 +6646,7 @@ msgid "Run interactively."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:380 en/git-rebase.txt:521
+#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6634,7 +6658,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:381 en/git-rebase.txt:522
+#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6646,7 +6670,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:256 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6658,31 +6682,31 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:333 en/git-rebase.txt:308 en/git-revert.txt:91 en/merge-options.txt:58
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:335 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:334 en/git-rebase.txt:309 en/git-revert.txt:92 en/merge-options.txt:59
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:336 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:338 en/git-rebase.txt:313 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:340 en/git-rebase.txt:331 en/git-revert.txt:96
#, priority:280
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:228 en/sequencer.txt:1
+#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:246 en/sequencer.txt:1
#, ignore-same, no-wrap, priority:240
msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:406 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:997
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1013
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6712,7 +6736,7 @@ msgid "When a patch failure occurs, <msg> will be printed to the screen before e
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:231 en/sequencer.txt:15
+#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:249 en/sequencer.txt:15
#, ignore-same, no-wrap, priority:240
msgid "--abort"
msgstr "--abort"
@@ -6724,7 +6748,7 @@ msgid "Restore the original branch and abort the patching operation."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:238 en/sequencer.txt:10
+#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:256 en/sequencer.txt:10
#, ignore-same, no-wrap, priority:240
msgid "--quit"
msgstr "--quit"
@@ -6736,7 +6760,7 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:262
+#: en/git-am.txt:179 en/git-rebase.txt:280
#, ignore-same, no-wrap, priority:100
msgid "--show-current-patch"
msgstr "--show-current-patch"
@@ -6748,7 +6772,7 @@ msgid "Show the patch being applied when \"git am\" is stopped because of confli
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:451 en/git-format-patch.txt:351 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:188 en/git-tag.txt:231
+#: en/git-am.txt:184 en/git-commit.txt:453 en/git-format-patch.txt:355 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
@@ -6832,7 +6856,7 @@ msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the curren
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:471 en/git-gc.txt:147
+#: en/git-am.txt:234 en/git-commit.txt:473 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
@@ -6930,7 +6954,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:322 en/merge-options.txt:84
+#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -6972,7 +6996,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:291
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:292
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7044,7 +7068,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:342
+#: en/git-apply.txt:134 en/git-rebase.txt:360
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7260,7 +7284,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:330 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:398 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:332 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -9182,7 +9206,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:525
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9218,13 +9242,13 @@ msgid "Sorting and filtering branches are case insensitive."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:153 en/git-status.txt:126 en/git-tag.txt:134
+#: en/git-branch.txt:153 en/git-status.txt:130 en/git-tag.txt:134
#, no-wrap, priority:280
msgid "--column[=<options>]"
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:154 en/git-status.txt:127 en/git-tag.txt:135
+#: en/git-branch.txt:154 en/git-status.txt:131 en/git-tag.txt:135
#, ignore-same, no-wrap, priority:280
msgid "--no-column"
msgstr "--no-column"
@@ -9349,12 +9373,6 @@ msgstr "--no-track"
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
-#. type: Labeled list
-#: en/git-branch.txt:225 en/git-push.txt:349
-#, ignore-same, no-wrap, priority:240
-msgid "--set-upstream"
-msgstr "--set-upstream"
-
#. type: Plain text
#: en/git-branch.txt:228
#, priority:240
@@ -9624,7 +9642,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-filter-branch.txt:449 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10244,7 +10262,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:152 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10893,7 +10911,7 @@ msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will al
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:226
+#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
@@ -11090,7 +11108,7 @@ msgid "Only meaningful with `--stdin`; paths are separated with NUL character in
msgstr ""
#. type: Plain text
-#: en/git-checkout-index.txt:73 en/git-commit.txt:345 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
+#: en/git-checkout-index.txt:73 en/git-commit.txt:347 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
#, priority:280
msgid "Do not interpret any more arguments as options."
msgstr ""
@@ -11411,7 +11429,7 @@ msgid "Quiet, suppress feedback messages."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:144
+#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:152
#, ignore-same, no-wrap, priority:240
msgid "--no-progress"
msgstr "--no-progress"
@@ -11597,7 +11615,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:241 en/git-rebase.txt:268 en/git-rebase.txt:529 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:354 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
+#: en/git-checkout.txt:241 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:355 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11717,7 +11735,7 @@ msgid "In the default overlay mode, `git checkout` never removes files from the
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:312 en/git-rebase.txt:225 en/git-switch.txt:36
+#: en/git-checkout.txt:312 en/git-rebase.txt:243 en/git-switch.txt:36
#, no-wrap, priority:240
msgid "<branch>"
msgstr ""
@@ -12423,7 +12441,7 @@ msgid "This option determines how the commit message will be cleaned up before b
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:65 en/git-clean.txt:61
+#: en/git-cherry-pick.txt:65 en/git-clean.txt:63
#, ignore-same, no-wrap, priority:100
msgid "-x"
msgstr "-x"
@@ -12507,7 +12525,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:249 en/git-rebase.txt:532
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:267 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12531,7 +12549,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:282 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:109
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12549,7 +12567,7 @@ msgid "-X<option>"
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:125
#, no-wrap, priority:240
msgid "--strategy-option=<option>"
msgstr ""
@@ -12745,7 +12763,7 @@ msgid "Show the commit subjects next to the SHA1s."
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:32 en/git-rebase.txt:220
+#: en/git-cherry.txt:32 en/git-rebase.txt:238
#, no-wrap, priority:100
msgid "<upstream>"
msgstr ""
@@ -12763,7 +12781,7 @@ msgid "<head>"
msgstr ""
#. type: Plain text
-#: en/git-cherry.txt:38 en/git-rebase.txt:227
+#: en/git-cherry.txt:38 en/git-rebase.txt:245
#, priority:100
msgid "Working branch; defaults to HEAD."
msgstr ""
@@ -12976,85 +12994,85 @@ msgid "If any optional `<path>...` arguments are given, only those paths are aff
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:33
+#: en/git-clean.txt:35
#, priority:100
-msgid "Remove untracked directories in addition to untracked files. If an untracked directory is managed by a different Git repository, it is not removed by default. Use -f option twice if you really want to remove such a directory."
+msgid "Normally, when no <path> is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. If any paths are specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under `--force`) will be removed."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:41
+#: en/git-clean.txt:43
#, priority:100
-msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f, -n or -i. Git will refuse to delete directories with .git sub directory or file unless a second -f is given."
+msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f or -i. Git will refuse to modify untracked nested git repositories (directories with a .git subdirectory) unless a second -f is given."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:46
+#: en/git-clean.txt:48
#, priority:100
msgid "Show what would be done and clean files interactively. See ``Interactive mode'' for details."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:50
+#: en/git-clean.txt:52
#, priority:100
msgid "Don't actually remove anything, just show what would be done."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:55
+#: en/git-clean.txt:57
#, priority:100
msgid "Be quiet, only report errors, but not the files that are successfully removed."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:56
+#: en/git-clean.txt:58
#, no-wrap, priority:100
msgid "-e <pattern>"
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:57 en/git-ls-files.txt:85 en/git-name-rev.txt:33
+#: en/git-clean.txt:59 en/git-ls-files.txt:85 en/git-name-rev.txt:33
#, no-wrap, priority:100
msgid "--exclude=<pattern>"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:60
+#: en/git-clean.txt:62
#, priority:100
msgid "Use the given exclude pattern in addition to the standard ignore rules (see linkgit:gitignore[5])."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:68
+#: en/git-clean.txt:70
#, priority:100
msgid "Don't use the standard ignore rules (see linkgit:gitignore[5]), but still use the ignore rules given with `-e` options from the command line. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git restore' or 'git reset') to create a pristine working directory to test a clean build."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:69
+#: en/git-clean.txt:71
#, no-wrap, priority:100
msgid "-X"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:72
+#: en/git-clean.txt:74
#, priority:100
msgid "Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files."
msgstr ""
#. type: Title -
-#: en/git-clean.txt:74
+#: en/git-clean.txt:76
#, no-wrap, priority:100
msgid "Interactive mode"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:78
+#: en/git-clean.txt:80
#, priority:100
msgid "When the command enters the interactive mode, it shows the files and directories to be cleaned, and goes into its interactive command loop."
msgstr ""
#. type: delimited block -
-#: en/git-clean.txt:89
+#: en/git-clean.txt:91
#, no-wrap, priority:100
msgid ""
" *** Commands ***\n"
@@ -13064,91 +13082,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:92
+#: en/git-clean.txt:94
#, priority:100
msgid "You also could say `c` or `clean` above as long as the choice is unique."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:94
+#: en/git-clean.txt:96
#, priority:100
msgid "The main command loop has 6 subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:95
+#: en/git-clean.txt:97
#, no-wrap, priority:100
msgid "clean"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:98
+#: en/git-clean.txt:100
#, priority:100
msgid "Start cleaning files and directories, and then quit."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:99
+#: en/git-clean.txt:101
#, no-wrap, priority:100
msgid "filter by pattern"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:107
+#: en/git-clean.txt:109
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Input ignore patterns>>\" prompt. You can input space-separated patterns to exclude files and directories from deletion. E.g. \"*.c *.h\" will excludes files end with \".c\" and \".h\" from deletion. When you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:108
+#: en/git-clean.txt:110
#, no-wrap, priority:100
msgid "select by numbers"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:119
+#: en/git-clean.txt:121
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Select items to delete>>\" prompt. When the prompt ends with double '>>' like this, you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything. Also when you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:120
+#: en/git-clean.txt:122
#, no-wrap, priority:100
msgid "ask each"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:125
+#: en/git-clean.txt:127
#, priority:100
msgid "This will start to clean, and you must confirm one by one in order to delete items. Please note that this action is not as efficient as the above two actions."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:126
+#: en/git-clean.txt:128
#, no-wrap, priority:100
msgid "quit"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:129
+#: en/git-clean.txt:131
#, priority:100
msgid "This lets you quit without do cleaning."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:130
+#: en/git-clean.txt:132
#, no-wrap, priority:100
msgid "help"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:133
+#: en/git-clean.txt:135
#, priority:100
msgid "Show brief usage of interactive git-clean."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:137 en/git-status.txt:436
+#: en/git-clean.txt:139 en/git-status.txt:440
#, ignore-same, priority:280
msgid "linkgit:gitignore[5]"
msgstr "linkgit:gitignore[5]"
@@ -13287,7 +13305,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:108 en/git-submodule.txt:392
+#: en/git-clone.txt:108 en/git-submodule.txt:393
#, ignore-same, no-wrap, priority:300
msgid "--dissociate"
msgstr "--dissociate"
@@ -13517,7 +13535,7 @@ msgstr "--[no-]remote-submodules"
#. type: Plain text
#: en/git-clone.txt:269
#, priority:300
-msgid "All submodules which are cloned will use the status of the submodule�셲 remote-tracking branch to update the submodule, rather than the superproject�셲 recorded SHA-1. Equivalent to passing `--remote` to `git submodule update`."
+msgid "All submodules which are cloned will use the status of the submodules remote-tracking branch to update the submodule, rather than the superprojects recorded SHA-1. Equivalent to passing `--remote` to `git submodule update`."
msgstr ""
#. type: Labeled list
@@ -13533,13 +13551,13 @@ msgid "Instead of placing the cloned repository where it is supposed to be, plac
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:277 en/git-submodule.txt:416
+#: en/git-clone.txt:277 en/git-submodule.txt:417
#, no-wrap, priority:300
msgid "-j <n>"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:278 en/git-submodule.txt:417
+#: en/git-clone.txt:278 en/git-submodule.txt:418
#, no-wrap, priority:300
msgid "--jobs <n>"
msgstr ""
@@ -13897,7 +13915,7 @@ msgid "Read the commit log message from the given file. Use `-` to read from the
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:68 en/git-commit.txt:339
+#: en/git-commit-tree.txt:68 en/git-commit.txt:341
#, ignore-same, no-wrap, priority:280
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
@@ -13981,7 +13999,7 @@ msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:477 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:428 en/git-svn.txt:1156
+#: en/git-commit-tree.txt:114 en/git-commit.txt:479 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:429 en/git-svn.txt:1156
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
@@ -14287,13 +14305,13 @@ msgid "When editing the commit message, start the editor with the contents in th
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:173 en/merge-options.txt:81
+#: en/git-commit.txt:173 en/merge-options.txt:85
#, priority:280
msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:175 en/git-rebase.txt:330
+#: en/git-commit.txt:175 en/git-rebase.txt:348 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14500,115 +14518,115 @@ msgid "Show untracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:288
+#: en/git-commit.txt:289
#, priority:280
msgid "The mode parameter is optional (defaults to 'all'), and is used to specify the handling of untracked files; when -u is not used, the default is 'normal', i.e. show untracked files and directories."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:290 en/git-status.txt:67 en/git-status.txt:107
+#: en/git-commit.txt:291 en/git-status.txt:68 en/git-status.txt:110
#, priority:280
msgid "The possible options are:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:292
+#: en/git-commit.txt:293
#, no-wrap, priority:280
msgid "'no' - Show no untracked files\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:293
+#: en/git-commit.txt:294
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:294 en/git-status.txt:71
+#: en/git-commit.txt:295 en/git-status.txt:72
#, no-wrap, priority:280
msgid "'all' - Also shows individual files in untracked directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:297 en/git-status.txt:84
+#: en/git-commit.txt:298 en/git-status.txt:85
#, priority:280
msgid "The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:308
+#: en/git-commit.txt:310
#, priority:280
msgid "Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template to help the user describe the commit by reminding what changes the commit has. Note that this diff output doesn't have its lines prefixed with '#'. This diff will not be a part of the commit message. See the `commit.verbose` configuration variable in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:312
+#: en/git-commit.txt:314
#, priority:280
msgid "If specified twice, show in addition the unified diff between what would be committed and the worktree files, i.e. the unstaged changes to tracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:316
+#: en/git-commit.txt:318
#, priority:280
msgid "Suppress commit summary message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:321
+#: en/git-commit.txt:323
#, priority:280
msgid "Do not create a commit, but show a list of paths that are to be committed, paths with local changes that will be left uncommitted and paths that are untracked."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:322
+#: en/git-commit.txt:324
#, ignore-same, no-wrap, priority:280
msgid "--status"
msgstr "--status"
#. type: Plain text
-#: en/git-commit.txt:327
+#: en/git-commit.txt:329
#, priority:280
msgid "Include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the commit message. Defaults to on, but can be used to override configuration variable commit.status."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:328
+#: en/git-commit.txt:330
#, ignore-same, no-wrap, priority:280
msgid "--no-status"
msgstr "--no-status"
#. type: Plain text
-#: en/git-commit.txt:332
+#: en/git-commit.txt:334
#, priority:280
msgid "Do not include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the default commit message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:342
+#: en/git-commit.txt:344
#, priority:280
msgid "Countermand `commit.gpgSign` configuration variable that is set to force each and every commit to be signed."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:346 en/git-rm.txt:29
+#: en/git-commit.txt:348 en/git-rm.txt:29
#, ignore-ellipsis, no-wrap, priority:280
msgid "<file>..."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:352
+#: en/git-commit.txt:354
#, priority:280
msgid "When files are given on the command line, the command commits the contents of the named files, without recording the changes already staged. The contents of these files are also staged for the next commit on top of what have been staged before."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:369
+#: en/git-commit.txt:371
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:375
+#: en/git-commit.txt:377
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14618,13 +14636,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:383
+#: en/git-commit.txt:385
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:388
+#: en/git-commit.txt:390
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14633,19 +14651,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:393
+#: en/git-commit.txt:395
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:398
+#: en/git-commit.txt:400
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:404
+#: en/git-commit.txt:406
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14655,31 +14673,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:411
+#: en/git-commit.txt:413
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:414 en/git-commit.txt:440
+#: en/git-commit.txt:416 en/git-commit.txt:442
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:418
+#: en/git-commit.txt:420
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:426
+#: en/git-commit.txt:428
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:432
+#: en/git-commit.txt:434
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14689,55 +14707,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:437
+#: en/git-commit.txt:439
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:448
+#: en/git-commit.txt:450
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:460
+#: en/git-commit.txt:462
#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:464
+#: en/git-commit.txt:466
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:469
+#: en/git-commit.txt:471
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:475
+#: en/git-commit.txt:477
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:479
+#: en/git-commit.txt:481
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:485
+#: en/git-commit.txt:487
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:493
+#: en/git-commit.txt:495
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -15405,211 +15423,211 @@ msgstr ""
msgid "Given a .git/config like this:"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:347
+#. type: delimited block -
+#: en/git-config.txt:348
#, no-wrap, priority:100
msgid ""
-"\t#\n"
-"\t# This is the config file, and\n"
-"\t# a '#' or ';' character indicates\n"
-"\t# a comment\n"
-"\t#\n"
+"#\n"
+"# This is the config file, and\n"
+"# a '#' or ';' character indicates\n"
+"# a comment\n"
+"#\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:352
+#. type: delimited block -
+#: en/git-config.txt:353 en/git.txt:310
#, no-wrap, priority:100
msgid ""
-"\t; core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"; core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:357
+#. type: delimited block -
+#: en/git-config.txt:358
#, no-wrap, priority:100
msgid ""
-"\t; Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"; Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:362
+#. type: delimited block -
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
-"\t; Proxy settings\n"
-"\t[core]\n"
-"\t\tgitproxy=proxy-command for kernel.org\n"
-"\t\tgitproxy=default-proxy ; for all the rest\n"
+"; Proxy settings\n"
+"[core]\n"
+"\tgitproxy=proxy-command for kernel.org\n"
+"\tgitproxy=default-proxy ; for all the rest\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:369
+#. type: delimited block -
+#: en/git-config.txt:370
#, no-wrap, priority:100
msgid ""
-"\t; HTTP\n"
-"\t[http]\n"
-"\t\tsslVerify\n"
-"\t[http \"https://weak.example.com\"]\n"
-"\t\tsslVerify = false\n"
-"\t\tcookieFile = /tmp/cookie.txt\n"
+"; HTTP\n"
+"[http]\n"
+"\tsslVerify\n"
+"[http \"https://weak.example.com\"]\n"
+"\tsslVerify = false\n"
+"\tcookieFile = /tmp/cookie.txt\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:371
+#: en/git-config.txt:373
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:374
+#: en/git-config.txt:376
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:379
+#: en/git-config.txt:381
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:382
+#: en/git-config.txt:384
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:385
+#: en/git-config.txt:387
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:389
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:390
+#: en/git-config.txt:392
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:394
+#: en/git-config.txt:396
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:398
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:399
+#: en/git-config.txt:401
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:402 en/git-gui.txt:120 en/git-merge-index.txt:64
+#: en/git-config.txt:404 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:407
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:410
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:413
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:414
+#: en/git-config.txt:416
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:417
+#: en/git-config.txt:419
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:421
+#: en/git-config.txt:423
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:424
+#: en/git-config.txt:426
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:428
+#: en/git-config.txt:430
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:431
+#: en/git-config.txt:433
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:434
+#: en/git-config.txt:436
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:437
+#: en/git-config.txt:439
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:440
+#: en/git-config.txt:442
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:443
+#: en/git-config.txt:445
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:447
+#: en/git-config.txt:449
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:453
+#: en/git-config.txt:455
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15619,13 +15637,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:457
+#: en/git-config.txt:459
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:466
+#: en/git-config.txt:468
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15638,19 +15656,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:471 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1029 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
+#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:476
+#: en/git-config.txt:478
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:482
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15658,13 +15676,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:483
+#: en/git-config.txt:485
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:488
+#: en/git-config.txt:490
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -17027,7 +17045,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
msgstr ""
#. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:234
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
#, no-wrap, priority:100
msgid "LIMITATIONS"
msgstr ""
@@ -18532,7 +18550,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:976
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:992
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19084,7 +19102,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:422
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:423
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -19180,13 +19198,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:982
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:998
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:988
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1004
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -19541,9 +19559,9 @@ msgid "This program dumps the given revisions in a form suitable to be piped int
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:22
+#: en/git-fast-export.txt:23
#, priority:100
-msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a kind of an interactive 'git filter-branch'."
+msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
@@ -19630,146 +19648,158 @@ msgstr ""
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
+#. type: Labeled list
+#: en/git-fast-export.txt:79
+#, ignore-same, no-wrap, priority:100
+msgid "--mark-tags"
+msgstr "--mark-tags"
+
+#. type: Plain text
+#: en/git-fast-export.txt:87
+#, priority:100
+msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
+msgstr ""
+
#. type: Plain text
-#: en/git-fast-export.txt:83
+#: en/git-fast-export.txt:92
#, priority:100
-msgid "Any commits that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
+msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:84
+#: en/git-fast-export.txt:93
#, ignore-same, no-wrap, priority:100
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
-#: en/git-fast-export.txt:89
+#: en/git-fast-export.txt:98
#, priority:100
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:90
+#: en/git-fast-export.txt:99
#, ignore-same, no-wrap, priority:100
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
-#: en/git-fast-export.txt:93
+#: en/git-fast-export.txt:102
#, priority:100
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:94
+#: en/git-fast-export.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
-#: en/git-fast-export.txt:101
+#: en/git-fast-export.txt:110
#, priority:100
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
+#: en/git-fast-export.txt:111 en/git-ls-tree.txt:72
#, ignore-same, no-wrap, priority:100
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
-#: en/git-fast-export.txt:107
+#: en/git-fast-export.txt:116
#, priority:100
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:108
+#: en/git-fast-export.txt:117
#, ignore-same, no-wrap, priority:100
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
-#: en/git-fast-export.txt:112
+#: en/git-fast-export.txt:121
#, priority:100
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:113
+#: en/git-fast-export.txt:122
#, ignore-same, no-wrap, priority:100
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
-#: en/git-fast-export.txt:124
+#: en/git-fast-export.txt:133
#, priority:100
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:125
+#: en/git-fast-export.txt:134
#, ignore-same, no-wrap, priority:100
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
-#: en/git-fast-export.txt:131
+#: en/git-fast-export.txt:140
#, priority:100
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:132
+#: en/git-fast-export.txt:141
#, no-wrap, priority:100
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:138
+#: en/git-fast-export.txt:147
#, priority:100
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be reencoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:139
+#: en/git-fast-export.txt:148
#, ignore-same, no-wrap, priority:100
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
-#: en/git-fast-export.txt:142
+#: en/git-fast-export.txt:151
#, priority:100
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:143
+#: en/git-fast-export.txt:152
#, ignore-ellipsis, no-wrap, priority:100
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:160
#, priority:100
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:157
+#: en/git-fast-export.txt:166
#, no-wrap, priority:100
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:162
+#: en/git-fast-export.txt:171
#, priority:100
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:167
+#: en/git-fast-export.txt:176
#, no-wrap, priority:100
msgid ""
"$ git fast-export master~5..master |\n"
@@ -19778,55 +19808,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:180
#, priority:100
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:175
+#: en/git-fast-export.txt:184
#, priority:100
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
-#: en/git-fast-export.txt:178
+#: en/git-fast-export.txt:187
#, no-wrap, priority:100
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:186
+#: en/git-fast-export.txt:195
#, priority:100
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:198
+#: en/git-fast-export.txt:207
#, priority:100
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:201
+#: en/git-fast-export.txt:210
#, priority:100
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:204
+#: en/git-fast-export.txt:213
#, no-wrap, priority:100
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:209
+#: en/git-fast-export.txt:218
#, priority:100
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:215
+#: en/git-fast-export.txt:224
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git init anon-repo\n"
@@ -19836,25 +19866,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:222
+#: en/git-fast-export.txt:231
#, priority:100
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:225
+#: en/git-fast-export.txt:234
#, no-wrap, priority:100
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:240
#, priority:100
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:239
+#: en/git-fast-export.txt:248
#, priority:100
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
@@ -20088,7 +20118,7 @@ msgid "See linkgit:git-config[1]"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:144 en/git-p4.txt:507
+#: en/git-fast-import.txt:144 en/git-filter-branch.txt:463 en/git-p4.txt:507
#, no-wrap, priority:100
msgid "PERFORMANCE"
msgstr ""
@@ -20322,7 +20352,7 @@ msgid "fast-import accepts several commands to update the current repository and
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:319 en/git-fast-import.txt:381
+#: en/git-fast-import.txt:319 en/git-fast-import.txt:388
#, ignore-same, no-wrap, priority:100
msgid "`commit`"
msgstr "`commit`"
@@ -20334,7 +20364,7 @@ msgid "Creates a new branch or updates an existing branch by creating a new comm
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:324 en/git-fast-import.txt:771
+#: en/git-fast-import.txt:324 en/git-fast-import.txt:778
#, ignore-same, no-wrap, priority:100
msgid "`tag`"
msgstr "`tag`"
@@ -20346,7 +20376,7 @@ msgid "Creates an annotated tag object from an existing commit or branch. Light
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:330 en/git-fast-import.txt:815
+#: en/git-fast-import.txt:330 en/git-fast-import.txt:823
#, ignore-same, no-wrap, priority:100
msgid "`reset`"
msgstr "`reset`"
@@ -20358,7 +20388,7 @@ msgid "Reset an existing branch (or a new branch) to a specific revision. This
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:335 en/git-fast-import.txt:844
+#: en/git-fast-import.txt:335 en/git-fast-import.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`blob`"
msgstr "`blob`"
@@ -20370,109 +20400,121 @@ msgid "Convert raw file data into a blob, for future use in a `commit` command.
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:340 en/git-fast-import.txt:917
+#: en/git-fast-import.txt:340 en/git-fast-import.txt:925
+#, ignore-same, no-wrap, priority:100
+msgid "`alias`"
+msgstr "`alias`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:346
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
+msgstr ""
+
+#. type: Title ~
+#: en/git-fast-import.txt:347 en/git-fast-import.txt:940
#, ignore-same, no-wrap, priority:100
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
-#: en/git-fast-import.txt:345
+#: en/git-fast-import.txt:352
#, priority:100
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:346 en/git-fast-import.txt:945
+#: en/git-fast-import.txt:353 en/git-fast-import.txt:968
#, ignore-same, no-wrap, priority:100
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
-#: en/git-fast-import.txt:350
+#: en/git-fast-import.txt:357
#, priority:100
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:351 en/git-fast-import.txt:1152
+#: en/git-fast-import.txt:358 en/git-fast-import.txt:1175
#, ignore-same, no-wrap, priority:100
msgid "`done`"
msgstr "`done`"
#. type: Plain text
-#: en/git-fast-import.txt:355
+#: en/git-fast-import.txt:362
#, priority:100
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:356 en/git-fast-import.txt:970
+#: en/git-fast-import.txt:363 en/git-fast-import.txt:993
#, ignore-same, no-wrap, priority:100
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
-#: en/git-fast-import.txt:360
+#: en/git-fast-import.txt:367
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:361 en/git-fast-import.txt:985
+#: en/git-fast-import.txt:368 en/git-fast-import.txt:1008
#, ignore-same, no-wrap, priority:100
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
-#: en/git-fast-import.txt:365
+#: en/git-fast-import.txt:372
#, priority:100
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:366 en/git-fast-import.txt:1016
+#: en/git-fast-import.txt:373 en/git-fast-import.txt:1039
#, ignore-same, no-wrap, priority:100
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
-#: en/git-fast-import.txt:370
+#: en/git-fast-import.txt:377
#, priority:100
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:371 en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:378 en/git-fast-import.txt:1092
#, ignore-same, no-wrap, priority:100
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
#, priority:100
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:1124
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:1147
#, ignore-same, no-wrap, priority:100
msgid "`option`"
msgstr "`option`"
#. type: Plain text
-#: en/git-fast-import.txt:379
+#: en/git-fast-import.txt:386
#, priority:100
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:384
+#: en/git-fast-import.txt:391
#, priority:100
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
#, no-wrap, priority:100
msgid ""
"\t'commit' SP <ref> LF\n"
@@ -20483,247 +20525,247 @@ msgid ""
"\t('encoding' SP <encoding>)?\n"
"\tdata\n"
"\t('from' SP <commit-ish> LF)?\n"
-"\t('merge' SP <commit-ish> LF)?\n"
+"\t('merge' SP <commit-ish> LF)*\n"
"\t(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*\n"
"\tLF?\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:405
+#: en/git-fast-import.txt:412
#, priority:100
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:411
+#: en/git-fast-import.txt:418
#, priority:100
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:417
+#: en/git-fast-import.txt:424
#, priority:100
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:425
+#: en/git-fast-import.txt:432
#, priority:100
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:432
+#: en/git-fast-import.txt:439
#, priority:100
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:434
+#: en/git-fast-import.txt:441
#, ignore-same, no-wrap, priority:100
msgid "`author`"
msgstr "`author`"
#. type: Plain text
-#: en/git-fast-import.txt:440
+#: en/git-fast-import.txt:447
#, priority:100
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:442
+#: en/git-fast-import.txt:449
#, ignore-same, no-wrap, priority:100
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
-#: en/git-fast-import.txt:445
+#: en/git-fast-import.txt:452
#, priority:100
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
#, priority:100
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:458
+#: en/git-fast-import.txt:465
#, priority:100
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:460
+#: en/git-fast-import.txt:467
#, ignore-same, no-wrap, priority:100
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
-#: en/git-fast-import.txt:464
+#: en/git-fast-import.txt:471
#, priority:100
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:466
+#: en/git-fast-import.txt:473
#, ignore-same, no-wrap, priority:100
msgid "`from`"
msgstr "`from`"
#. type: Plain text
-#: en/git-fast-import.txt:472
+#: en/git-fast-import.txt:479
#, priority:100
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
#, priority:100
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:485
+#: en/git-fast-import.txt:492
#, priority:100
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
#, priority:100
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:491
+#: en/git-fast-import.txt:498
#, priority:100
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:493
+#: en/git-fast-import.txt:500
#, priority:100
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:499
+#: en/git-fast-import.txt:506
#, priority:100
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:501
+#: en/git-fast-import.txt:508
#, priority:100
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:503
+#: en/git-fast-import.txt:510
#, priority:100
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
#, priority:100
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:509
+#: en/git-fast-import.txt:516
#, priority:100
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:512
+#: en/git-fast-import.txt:519
#, priority:100
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
#, no-wrap, priority:100
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:521
+#: en/git-fast-import.txt:528
#, priority:100
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:523
+#: en/git-fast-import.txt:530
#, ignore-same, no-wrap, priority:100
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
-#: en/git-fast-import.txt:531
+#: en/git-fast-import.txt:538
#, priority:100
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:534
+#: en/git-fast-import.txt:541
#, priority:100
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:536
+#: en/git-fast-import.txt:543
#, ignore-same, no-wrap, priority:100
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:540
+#: en/git-fast-import.txt:547
#, priority:100
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:541 en/git-fast-import.txt:708
+#: en/git-fast-import.txt:548 en/git-fast-import.txt:715
#, no-wrap, priority:100
msgid "External data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:544
+#: en/git-fast-import.txt:551
#, priority:100
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:547
+#: en/git-fast-import.txt:554
#, no-wrap, priority:100
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
#, priority:100
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:555 en/git-fast-import.txt:721
+#: en/git-fast-import.txt:562 en/git-fast-import.txt:728
#, no-wrap, priority:100
msgid "Inline data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:559
+#: en/git-fast-import.txt:566
#, priority:100
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
#, no-wrap, priority:100
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -20731,259 +20773,259 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:566 en/git-fast-import.txt:732
+#: en/git-fast-import.txt:573 en/git-fast-import.txt:739
#, priority:100
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:569
+#: en/git-fast-import.txt:576
#, priority:100
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
#, priority:100
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:574
+#: en/git-fast-import.txt:581
#, priority:100
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:575
+#: en/git-fast-import.txt:582
#, priority:100
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
#, priority:100
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:580
+#: en/git-fast-import.txt:587
#, priority:100
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:583
+#: en/git-fast-import.txt:590
#, priority:100
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:587
+#: en/git-fast-import.txt:594
#, priority:100
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:594
+#: en/git-fast-import.txt:601
#, priority:100
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
#, priority:100
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:598
+#: en/git-fast-import.txt:605
#, priority:100
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:599
+#: en/git-fast-import.txt:606
#, priority:100
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:600
+#: en/git-fast-import.txt:607
#, priority:100
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:602
+#: en/git-fast-import.txt:609
#, priority:100
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:604
+#: en/git-fast-import.txt:611
#, priority:100
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:606
+#: en/git-fast-import.txt:613
#, priority:100
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:608
+#: en/git-fast-import.txt:615
#, ignore-same, no-wrap, priority:100
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
-#: en/git-fast-import.txt:614
+#: en/git-fast-import.txt:621
#, priority:100
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
#, no-wrap, priority:100
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
#, priority:100
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:624
+#: en/git-fast-import.txt:631
#, ignore-same, no-wrap, priority:100
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
#, priority:100
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:632
+#: en/git-fast-import.txt:639
#, no-wrap, priority:100
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:638 en/git-fast-import.txt:658
+#: en/git-fast-import.txt:645 en/git-fast-import.txt:665
#, priority:100
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:643
+#: en/git-fast-import.txt:650
#, priority:100
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:645
+#: en/git-fast-import.txt:652
#, ignore-same, no-wrap, priority:100
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
-#: en/git-fast-import.txt:649
+#: en/git-fast-import.txt:656
#, priority:100
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:652
+#: en/git-fast-import.txt:659
#, no-wrap, priority:100
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:663
+#: en/git-fast-import.txt:670
#, priority:100
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:672
+#: en/git-fast-import.txt:679
#, priority:100
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
-#: en/git-fast-import.txt:679
+#: en/git-fast-import.txt:686
#, priority:100
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:682
+#: en/git-fast-import.txt:689
#, no-wrap, priority:100
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:688
+#: en/git-fast-import.txt:695
#, priority:100
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:696
+#: en/git-fast-import.txt:703
#, priority:100
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:698
+#: en/git-fast-import.txt:705
#, ignore-same, no-wrap, priority:100
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:707
+#: en/git-fast-import.txt:714
#, priority:100
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:712
+#: en/git-fast-import.txt:719
#, priority:100
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:715
+#: en/git-fast-import.txt:722
#, no-wrap, priority:100
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:720
+#: en/git-fast-import.txt:727
#, priority:100
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:725
+#: en/git-fast-import.txt:732
#, priority:100
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:729
+#: en/git-fast-import.txt:736
#, no-wrap, priority:100
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -20991,76 +21033,77 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:735
+#: en/git-fast-import.txt:742
#, priority:100
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:737
+#: en/git-fast-import.txt:744
#, ignore-same, no-wrap, priority:100
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
-#: en/git-fast-import.txt:743
+#: en/git-fast-import.txt:750
#, priority:100
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:746
+#: en/git-fast-import.txt:753
#, no-wrap, priority:100
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:752
+#: en/git-fast-import.txt:759
#, priority:100
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:756
+#: en/git-fast-import.txt:763
#, priority:100
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:758
+#: en/git-fast-import.txt:765
#, ignore-same, no-wrap, priority:100
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
-#: en/git-fast-import.txt:763
+#: en/git-fast-import.txt:770
#, priority:100
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:766
+#: en/git-fast-import.txt:773
#, no-wrap, priority:100
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:769
+#: en/git-fast-import.txt:776
#, priority:100
msgid "where `<object-identifer>` is any string not containing LF."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:774
+#: en/git-fast-import.txt:781
#, priority:100
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:781
+#: en/git-fast-import.txt:789
#, no-wrap, priority:100
msgid ""
"\t'tag' SP <name> LF\n"
+"\tmark?\n"
"\t'from' SP <commit-ish> LF\n"
"\toriginal-oid?\n"
"\t'tagger' (SP <name>)? SP LT <email> GT SP <when> LF\n"
@@ -21068,55 +21111,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:784
+#: en/git-fast-import.txt:792
#, priority:100
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:789
+#: en/git-fast-import.txt:797
#, priority:100
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:793
+#: en/git-fast-import.txt:801
#, priority:100
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:796
+#: en/git-fast-import.txt:804
#, priority:100
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:799
+#: en/git-fast-import.txt:807
#, priority:100
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:813
#, priority:100
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:813
+#: en/git-fast-import.txt:821
#, priority:100
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:820
+#: en/git-fast-import.txt:828
#, priority:100
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:825
+#: en/git-fast-import.txt:833
#, no-wrap, priority:100
msgid ""
"\t'reset' SP <ref> LF\n"
@@ -21125,25 +21168,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:829
+#: en/git-fast-import.txt:837
#, priority:100
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:831 en/git-fast-import.txt:943
+#: en/git-fast-import.txt:839 en/git-fast-import.txt:966
#, priority:100
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:834
+#: en/git-fast-import.txt:842
#, priority:100
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:838
+#: en/git-fast-import.txt:846
#, no-wrap, priority:100
msgid ""
"\treset refs/tags/938\n"
@@ -21151,19 +21194,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:850
#, priority:100
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:849
+#: en/git-fast-import.txt:857
#, priority:100
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:855
+#: en/git-fast-import.txt:863
#, no-wrap, priority:100
msgid ""
"\t'blob' LF\n"
@@ -21173,43 +21216,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:861
+#: en/git-fast-import.txt:869
#, priority:100
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:871
#, ignore-same, no-wrap, priority:100
msgid "`data`"
msgstr "`data`"
#. type: Plain text
-#: en/git-fast-import.txt:870
+#: en/git-fast-import.txt:878
#, priority:100
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:875
+#: en/git-fast-import.txt:883
#, priority:100
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:876
+#: en/git-fast-import.txt:884
#, no-wrap, priority:100
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:878
+#: en/git-fast-import.txt:886
#, priority:100
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:882
+#: en/git-fast-import.txt:890
#, no-wrap, priority:100
msgid ""
"\t'data' SP <count> LF\n"
@@ -21217,31 +21260,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:888
+#: en/git-fast-import.txt:896
#, priority:100
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:893
+#: en/git-fast-import.txt:901
#, priority:100
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:894
+#: en/git-fast-import.txt:902
#, no-wrap, priority:100
msgid "Delimited format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:899
+#: en/git-fast-import.txt:907
#, priority:100
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:905
+#: en/git-fast-import.txt:913
#, no-wrap, priority:100
msgid ""
"\t'data' SP '<<' <delim> LF\n"
@@ -21251,25 +21294,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:921
#, priority:100
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:915
+#: en/git-fast-import.txt:923
#, priority:100
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:920
+#: en/git-fast-import.txt:928
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object."
+msgstr ""
+
+#. type: delimited block .
+#: en/git-fast-import.txt:934
+#, no-wrap, priority:100
+msgid ""
+"\t'alias' LF\n"
+"\tmark\n"
+"\t'to' SP <commit-ish> LF\n"
+"\tLF?\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:937
+#, priority:100
+msgid "For a detailed description of `<commit-ish>` see above under `from`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:943
#, priority:100
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:924
+#: en/git-fast-import.txt:947
#, no-wrap, priority:100
msgid ""
"\t'checkpoint' LF\n"
@@ -21277,31 +21342,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:930
+#: en/git-fast-import.txt:953
#, priority:100
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:935
+#: en/git-fast-import.txt:958
#, priority:100
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:941
+#: en/git-fast-import.txt:964
#, priority:100
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:950
+#: en/git-fast-import.txt:973
#, priority:100
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:954
+#: en/git-fast-import.txt:977
#, no-wrap, priority:100
msgid ""
"\t'progress' SP <any> LF\n"
@@ -21309,67 +21374,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:960
+#: en/git-fast-import.txt:983
#, priority:100
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:986
#, no-wrap, priority:100
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:968
+#: en/git-fast-import.txt:991
#, priority:100
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:976
+#: en/git-fast-import.txt:999
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:979
+#: en/git-fast-import.txt:1002
#, no-wrap, priority:100
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:983 en/git-fast-import.txt:1014 en/git-fast-import.txt:1067
+#: en/git-fast-import.txt:1006 en/git-fast-import.txt:1037 en/git-fast-import.txt:1090
#, priority:100
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:991
+#: en/git-fast-import.txt:1014
#, priority:100
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:994
+#: en/git-fast-import.txt:1017
#, no-wrap, priority:100
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1022
#, priority:100
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:1024
#, priority:100
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1005
+#: en/git-fast-import.txt:1028
#, no-wrap, priority:100
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21377,283 +21442,283 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1011
+#: en/git-fast-import.txt:1034
#, priority:100
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1022
+#: en/git-fast-import.txt:1045
#, priority:100
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1025
+#: en/git-fast-import.txt:1048
#, priority:100
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1049
#, no-wrap, priority:100
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1030
+#: en/git-fast-import.txt:1053
#, priority:100
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1033
+#: en/git-fast-import.txt:1056
#, no-wrap, priority:100
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1035
+#: en/git-fast-import.txt:1058
#, no-wrap, priority:100
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1041
+#: en/git-fast-import.txt:1064
#, priority:100
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1044
+#: en/git-fast-import.txt:1067
#, no-wrap, priority:100
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1047
+#: en/git-fast-import.txt:1070
#, priority:100
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1072
#, priority:100
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1075
#, no-wrap, priority:100
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1080
#, priority:100
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1060
+#: en/git-fast-import.txt:1083
#, priority:100
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1086
#, no-wrap, priority:100
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1072
+#: en/git-fast-import.txt:1095
#, priority:100
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1075
+#: en/git-fast-import.txt:1098
#, no-wrap, priority:100
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1078
+#: en/git-fast-import.txt:1101
#, priority:100
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1079 en/git-fast-import.txt:1146
+#: en/git-fast-import.txt:1102 en/git-fast-import.txt:1169
#, no-wrap, priority:100
msgid "date-format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1080 en/git-fast-import.txt:1148
+#: en/git-fast-import.txt:1103 en/git-fast-import.txt:1171
#, no-wrap, priority:100
msgid "export-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1081
+#: en/git-fast-import.txt:1104
#, no-wrap, priority:100
msgid "relative-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1082
+#: en/git-fast-import.txt:1105
#, no-wrap, priority:100
msgid "no-relative-marks"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1083 en/git-fast-import.txt:1150
+#: en/git-fast-import.txt:1106 en/git-fast-import.txt:1173
#, no-wrap, priority:100
msgid "force"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1087
+#: en/git-fast-import.txt:1110
#, priority:100
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1088 en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1111 en/git-fast-import.txt:1170
#, no-wrap, priority:100
msgid "import-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1089
+#: en/git-fast-import.txt:1112
#, no-wrap, priority:100
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1097
+#: en/git-fast-import.txt:1120
#, priority:100
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1098
+#: en/git-fast-import.txt:1121
#, no-wrap, priority:100
msgid "get-mark"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1122
#, no-wrap, priority:100
msgid "cat-blob"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1100
+#: en/git-fast-import.txt:1123
#, no-wrap, priority:100
msgid "ls"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1108
+#: en/git-fast-import.txt:1131
#, priority:100
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1109
+#: en/git-fast-import.txt:1132
#, no-wrap, priority:100
msgid "notes"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1114
+#: en/git-fast-import.txt:1137
#, priority:100
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1138
#, no-wrap, priority:100
msgid "done"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1122
+#: en/git-fast-import.txt:1145
#, priority:100
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1129
+#: en/git-fast-import.txt:1152
#, priority:100
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1132
+#: en/git-fast-import.txt:1155
#, no-wrap, priority:100
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1137
+#: en/git-fast-import.txt:1160
#, priority:100
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1141
+#: en/git-fast-import.txt:1164
#, priority:100
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1144
+#: en/git-fast-import.txt:1167
#, priority:100
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1149
+#: en/git-fast-import.txt:1172
#, priority:100
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1178
#, priority:100
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1159
+#: en/git-fast-import.txt:1182
#, priority:100
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1161
+#: en/git-fast-import.txt:1184
#, no-wrap, priority:100
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1168
+#: en/git-fast-import.txt:1191
#, priority:100
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1175
+#: en/git-fast-import.txt:1198
#, priority:100
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1203
#, no-wrap, priority:100
msgid ""
"\tmkfifo fast-import-output\n"
@@ -21662,49 +21727,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1184
+#: en/git-fast-import.txt:1207
#, priority:100
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1188
+#: en/git-fast-import.txt:1211
#, priority:100
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1213
#, no-wrap, priority:100
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1196
+#: en/git-fast-import.txt:1219
#, priority:100
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1203
+#: en/git-fast-import.txt:1226
#, priority:100
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1211
+#: en/git-fast-import.txt:1234
#, priority:100
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1236
#, priority:100
msgid "An example crash:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1229
+#: en/git-fast-import.txt:1252
#, no-wrap, priority:100
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
@@ -21724,7 +21789,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1256
#, no-wrap, priority:100
msgid ""
"\t$ git fast-import <in\n"
@@ -21733,7 +21798,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1239
+#: en/git-fast-import.txt:1262
#, no-wrap, priority:100
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
@@ -21744,13 +21809,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1241
+#: en/git-fast-import.txt:1264
#, no-wrap, priority:100
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1251
+#: en/git-fast-import.txt:1274
#, no-wrap, priority:100
msgid ""
"\tMost Recent Commands Before Crash\n"
@@ -21765,13 +21830,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1252
+#: en/git-fast-import.txt:1275
#, no-wrap, priority:100
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1255
+#: en/git-fast-import.txt:1278
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
@@ -21779,25 +21844,25 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1256
+#: en/git-fast-import.txt:1279
#, no-wrap, priority:100
msgid "active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1259
+#: en/git-fast-import.txt:1282
#, priority:100
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1260
+#: en/git-fast-import.txt:1283
#, priority:100
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1264
+#: en/git-fast-import.txt:1287
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
@@ -21806,7 +21871,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1270
+#: en/git-fast-import.txt:1293
#, no-wrap, priority:100
msgid ""
"status : active loaded dirty\n"
@@ -21818,307 +21883,307 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1274
+#: en/git-fast-import.txt:1297
#, priority:100
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1277
+#: en/git-fast-import.txt:1300
#, no-wrap, priority:100
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1280
+#: en/git-fast-import.txt:1303
#, priority:100
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1282
+#: en/git-fast-import.txt:1305
#, no-wrap, priority:100
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1290
+#: en/git-fast-import.txt:1313
#, priority:100
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1294
+#: en/git-fast-import.txt:1317
#, priority:100
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1296
+#: en/git-fast-import.txt:1319
#, no-wrap, priority:100
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1301
+#: en/git-fast-import.txt:1324
#, priority:100
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1305
+#: en/git-fast-import.txt:1328
#, priority:100
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1307
+#: en/git-fast-import.txt:1330
#, no-wrap, priority:100
msgid "Handling Renames"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1312
+#: en/git-fast-import.txt:1335
#, priority:100
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1337
#, no-wrap, priority:100
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1341
#, priority:100
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1325
+#: en/git-fast-import.txt:1348
#, priority:100
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1331
+#: en/git-fast-import.txt:1354
#, priority:100
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1337
+#: en/git-fast-import.txt:1360
#, priority:100
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1363
#, priority:100
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1342
+#: en/git-fast-import.txt:1365
#, no-wrap, priority:100
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1346
+#: en/git-fast-import.txt:1369
#, priority:100
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1353
+#: en/git-fast-import.txt:1376
#, priority:100
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1358
+#: en/git-fast-import.txt:1381
#, priority:100
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1360
+#: en/git-fast-import.txt:1383
#, no-wrap, priority:100
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1367
+#: en/git-fast-import.txt:1390
#, priority:100
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1369
+#: en/git-fast-import.txt:1392
#, no-wrap, priority:100
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1399
#, priority:100
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1379
+#: en/git-fast-import.txt:1402
#, no-wrap, priority:100
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1385
+#: en/git-fast-import.txt:1408
#, priority:100
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1393
+#: en/git-fast-import.txt:1416
#, priority:100
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1423
#, priority:100
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1407
+#: en/git-fast-import.txt:1430
#, priority:100
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1415
+#: en/git-fast-import.txt:1438
#, priority:100
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1417
+#: en/git-fast-import.txt:1440
#, no-wrap, priority:100
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1423
+#: en/git-fast-import.txt:1446
#, priority:100
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1448
#, no-wrap, priority:100
msgid "per object"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1432
+#: en/git-fast-import.txt:1455
#, priority:100
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1438
+#: en/git-fast-import.txt:1461
#, priority:100
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1440
+#: en/git-fast-import.txt:1463
#, no-wrap, priority:100
msgid "per mark"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1446
+#: en/git-fast-import.txt:1469
#, priority:100
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1448
+#: en/git-fast-import.txt:1471
#, no-wrap, priority:100
msgid "per branch"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1474
#, priority:100
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1457
+#: en/git-fast-import.txt:1480
#, priority:100
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1464
+#: en/git-fast-import.txt:1487
#, priority:100
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1468
+#: en/git-fast-import.txt:1491
#, priority:100
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1496
#, priority:100
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1498
#, no-wrap, priority:100
msgid "per active tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1480
+#: en/git-fast-import.txt:1503
#, priority:100
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1482
+#: en/git-fast-import.txt:1505
#, no-wrap, priority:100
msgid "per active file entry"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1488
+#: en/git-fast-import.txt:1511
#, priority:100
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1493
+#: en/git-fast-import.txt:1516
#, priority:100
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1495
+#: en/git-fast-import.txt:1518
#, no-wrap, priority:100
msgid "SIGNALS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1501
+#: en/git-fast-import.txt:1524
#, priority:100
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -22679,7 +22744,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1041
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -22795,20 +22860,32 @@ msgid ""
"\t[--state-branch <branch>] [--] [<rev-list options>...]\n"
msgstr ""
+#. type: Title -
+#: en/git-filter-branch.txt:20
+#, no-wrap, priority:100
+msgid "WARNING"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:31
+#, priority:100
+msgid "'git filter-branch' has a plethora of pitfalls that can produce non-obvious manglings of the intended history rewrite (and can leave you with little time to investigate such problems since it has such abysmal performance). These safety and performance issues cannot be backward compatibly fixed and as such, its use is not recommended. Please use an alternative history filtering tool such as https://github.com/newren/git-filter-repo/[git filter-repo]. If you still need to use 'git filter-branch', please carefully read <<SAFETY>> (and <<PERFORMANCE>>) to learn about the land mines of filter-branch, and then vigilantly avoid as many of the hazards listed there as reasonably possible."
+msgstr ""
+
#. type: Plain text
-#: en/git-filter-branch.txt:27
+#: en/git-filter-branch.txt:40
#, priority:100
msgid "Lets you rewrite Git revision history by rewriting the branches mentioned in the <rev-list options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge information) will be preserved."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:34
+#: en/git-filter-branch.txt:47
#, priority:100
msgid "The command will only rewrite the _positive_ refs mentioned in the command line (e.g. if you pass 'a..b', only 'b' will be rewritten). If you specify no filters, the commits will be recommitted without any changes, which would normally have no effect. Nevertheless, this may be useful in the future for compensating for some Git bugs or such, therefore such a usage is permitted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:39
+#: en/git-filter-branch.txt:52
#, no-wrap, priority:100
msgid ""
"*NOTE*: This command honors `.git/info/grafts` file and refs in\n"
@@ -22818,7 +22895,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:48
+#: en/git-filter-branch.txt:61
#, no-wrap, priority:100
msgid ""
"*WARNING*! The rewritten history will have different object names for all\n"
@@ -22832,337 +22909,337 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:52
+#: en/git-filter-branch.txt:65
#, priority:100
msgid "Always verify that the rewritten version is correct: The original refs, if different from the rewritten ones, will be stored in the namespace 'refs/original/'."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:56
+#: en/git-filter-branch.txt:69
#, priority:100
msgid "Note that since this operation is very I/O expensive, it might be a good idea to redirect the temporary directory off-disk with the `-d` option, e.g. on tmpfs. Reportedly the speedup is very noticeable."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:59
+#: en/git-filter-branch.txt:72
#, no-wrap, priority:100
msgid "Filters"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:71
+#: en/git-filter-branch.txt:84
#, priority:100
msgid "The filters are applied in the order as listed below. The <command> argument is always evaluated in the shell context using the 'eval' command (with the notable exception of the commit filter, for technical reasons). Prior to that, the `$GIT_COMMIT` environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, and GIT_COMMITTER_DATE are taken from the current commit and exported to the environment, in order to affect the author and committer identities of the replacement commit created by linkgit:git-commit-tree[1] after the filters have run."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:74
+#: en/git-filter-branch.txt:87
#, priority:100
msgid "If any evaluation of <command> returns a non-zero exit status, the whole operation will be aborted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:80
+#: en/git-filter-branch.txt:93
#, priority:100
msgid "A 'map' function is available that takes an \"original sha1 id\" argument and outputs a \"rewritten sha1 id\" if the commit has been already rewritten, and \"original sha1 id\" otherwise; the 'map' function can return several ids on separate lines if your commit filter emitted multiple commits."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:85
+#: en/git-filter-branch.txt:98
#, no-wrap, priority:100
msgid "--setup <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:91
+#: en/git-filter-branch.txt:104
#, priority:100
msgid "This is not a real filter executed for each commit but a one time setup just before the loop. Therefore no commit-specific variables are defined yet. Functions or variables defined here can be used or modified in the following filter steps except the commit filter, for technical reasons."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:92
+#: en/git-filter-branch.txt:105
#, no-wrap, priority:100
msgid "--subdirectory-filter <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:96
+#: en/git-filter-branch.txt:109
#, priority:100
msgid "Only look at the history which touches the given subdirectory. The result will contain that directory (and only that) as its project root. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:97
+#: en/git-filter-branch.txt:110
#, no-wrap, priority:100
msgid "--env-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:102
+#: en/git-filter-branch.txt:115
#, priority:100
msgid "This filter may be used if you only need to modify the environment in which the commit will be performed. Specifically, you might want to rewrite the author/committer name/email/time environment variables (see linkgit:git-commit-tree[1] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:103
+#: en/git-filter-branch.txt:116
#, no-wrap, priority:100
msgid "--tree-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:110
+#: en/git-filter-branch.txt:123
#, priority:100
msgid "This is the filter for rewriting the tree and its contents. The argument is evaluated in shell with the working directory set to the root of the checked out tree. The new tree is then used as-is (new files are auto-added, disappeared files are auto-removed - neither .gitignore files nor any other ignore rules *HAVE ANY EFFECT*!)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:111
+#: en/git-filter-branch.txt:124
#, no-wrap, priority:100
msgid "--index-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:117
+#: en/git-filter-branch.txt:130
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the index. It is similar to the tree filter but does not check out the tree, which makes it much faster. Frequently used with `git rm --cached --ignore-unmatch ...`, see EXAMPLES below. For hairy cases, see linkgit:git-update-index[1]."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:118
+#: en/git-filter-branch.txt:131
#, no-wrap, priority:100
msgid "--parent-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:125
+#: en/git-filter-branch.txt:138
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the commit's parent list. It will receive the parent string on stdin and shall output the new parent string on stdout. The parent string is in the format described in linkgit:git-commit-tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and \"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:126
+#: en/git-filter-branch.txt:139
#, no-wrap, priority:100
msgid "--msg-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:131
+#: en/git-filter-branch.txt:144
#, priority:100
msgid "This is the filter for rewriting the commit messages. The argument is evaluated in the shell with the original commit message on standard input; its standard output is used as the new commit message."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:132
+#: en/git-filter-branch.txt:145
#, no-wrap, priority:100
msgid "--commit-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:138
+#: en/git-filter-branch.txt:151
#, ignore-ellipsis, priority:100
msgid "This is the filter for performing the commit. If this filter is specified, it will be called instead of the 'git commit-tree' command, with arguments of the form \"<TREE_ID> [(-p <PARENT_COMMIT_ID>)...]\" and the log message on stdin. The commit id is expected on stdout."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:142
+#: en/git-filter-branch.txt:155
#, priority:100
msgid "As a special extension, the commit filter may emit multiple commit ids; in that case, the rewritten children of the original commit will have all of them as parents."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:147
+#: en/git-filter-branch.txt:160
#, priority:100
msgid "You can use the 'map' convenience function in this filter, and other convenience functions, too. For example, calling 'skip_commit \"$@\"' will leave out the current commit (but not its changes! If you want that, use 'git rebase' instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:151
+#: en/git-filter-branch.txt:164
#, priority:100
msgid "You can also use the `git_commit_non_empty_tree \"$@\"` instead of `git commit-tree \"$@\"` if you don't wish to keep commits with a single parent and that makes no change to the tree."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:152
+#: en/git-filter-branch.txt:165
#, no-wrap, priority:100
msgid "--tag-name-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:158
+#: en/git-filter-branch.txt:171
#, priority:100
msgid "This is the filter for rewriting tag names. When passed, it will be called for every tag ref that points to a rewritten object (or to a tag object which points to a rewritten object). The original tag name is passed via standard input, and the new tag name is expected on standard output."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:163
+#: en/git-filter-branch.txt:176
#, priority:100
msgid "The original tags are not deleted, but can be overwritten; use \"--tag-name-filter cat\" to simply update the tags. In this case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:174
+#: en/git-filter-branch.txt:187
#, priority:100
msgid "Nearly proper rewriting of tag objects is supported. If the tag has a message attached, a new tag object will be created with the same message, author, and timestamp. If the tag has a signature attached, the signature will be stripped. It is by definition impossible to preserve signatures. The reason this is \"nearly\" proper, is because ideally if the tag did not change (points to the same object, has the same name, etc.) it should retain any signature. That is not the case, signatures will always be removed, buyer beware. There is also no support for changing the author or timestamp (or the tag message for that matter). Tags which point to other tags will be rewritten to point to the underlying commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:175
+#: en/git-filter-branch.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--prune-empty"
msgstr "--prune-empty"
#. type: Plain text
-#: en/git-filter-branch.txt:182
+#: en/git-filter-branch.txt:195
#, priority:100
msgid "Some filters will generate empty commits that leave the tree untouched. This option instructs git-filter-branch to remove such commits if they have exactly one or zero non-pruned parents; merge commits will therefore remain intact. This option cannot be used together with `--commit-filter`, though the same effect can be achieved by using the provided `git_commit_non_empty_tree` function in a commit filter."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:183
+#: en/git-filter-branch.txt:196
#, no-wrap, priority:100
msgid "--original <namespace>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:186
+#: en/git-filter-branch.txt:199
#, priority:100
msgid "Use this option to set the namespace where the original commits will be stored. The default value is 'refs/original'."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:187
+#: en/git-filter-branch.txt:200
#, no-wrap, priority:100
msgid "-d <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:194
+#: en/git-filter-branch.txt:207
#, priority:100
msgid "Use this option to set the path to the temporary directory used for rewriting. When applying a tree filter, the command needs to temporarily check out the tree to some directory, which may consume considerable space in case of large projects. By default it does this in the `.git-rewrite/` directory but you can override that choice by this parameter."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:200
+#: en/git-filter-branch.txt:213
#, priority:100
msgid "'git filter-branch' refuses to start with an existing temporary directory or when there are already refs starting with 'refs/original/', unless forced."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:201
+#: en/git-filter-branch.txt:214
#, no-wrap, priority:100
msgid "--state-branch <branch>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:206
+#: en/git-filter-branch.txt:219
#, priority:100
msgid "This option will cause the mapping from old to new objects to be loaded from named branch upon startup and saved as a new commit to that branch upon exit, enabling incremental of large trees. If '<branch>' does not exist it will be created."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:207
+#: en/git-filter-branch.txt:220
#, ignore-ellipsis, no-wrap, priority:100
msgid "<rev-list options>..."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:212
+#: en/git-filter-branch.txt:225
#, priority:100
msgid "Arguments for 'git rev-list'. All positive refs included by these options are rewritten. You may also specify options such as `--all`, but you must use `--` to separate them from the 'git filter-branch' options. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:216
+#: en/git-filter-branch.txt:229
#, no-wrap, priority:100
msgid "Remap to ancestor"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:223
+#: en/git-filter-branch.txt:236
#, priority:100
msgid "By using linkgit:git-rev-list[1] arguments, e.g., path limiters, you can limit the set of revisions which get rewritten. However, positive refs on the command line are distinguished: we don't let them be excluded by such limiters. For this purpose, they are instead rewritten to point at the nearest ancestor that was not excluded."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:231
+#: en/git-filter-branch.txt:244
#, priority:100
msgid "On success, the exit status is `0`. If the filter can't find any commits to rewrite, the exit status is `2`. On any other error, the exit status may be any other non-zero value."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:238
+#: en/git-filter-branch.txt:251
#, priority:100
msgid "Suppose you want to remove a file (containing confidential information or copyright violation) from all commits:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:241
+#: en/git-filter-branch.txt:254
#, no-wrap, priority:100
msgid "git filter-branch --tree-filter 'rm filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:246
+#: en/git-filter-branch.txt:259
#, priority:100
msgid "However, if the file is absent from the tree of some commit, a simple `rm filename` will fail for that tree and commit. Thus you may instead want to use `rm -f filename` as the script."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:252
+#: en/git-filter-branch.txt:265
#, priority:100
msgid "Using `--index-filter` with 'git rm' yields a significantly faster version. Like with using `rm filename`, `git rm --cached filename` will fail if the file is absent from the tree of a commit. If you want to \"completely forget\" a file, it does not matter when it entered history, so we also add `--ignore-unmatch`:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:255
+#: en/git-filter-branch.txt:268
#, no-wrap, priority:100
msgid "git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:258
+#: en/git-filter-branch.txt:271
#, priority:100
msgid "Now, you will get the rewritten history saved in HEAD."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:261
+#: en/git-filter-branch.txt:274
#, priority:100
msgid "To rewrite the repository to look as if `foodir/` had been its project root, and discard all other history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:264
+#: en/git-filter-branch.txt:277
#, no-wrap, priority:100
msgid "git filter-branch --subdirectory-filter foodir -- --all\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:269
+#: en/git-filter-branch.txt:282
#, priority:100
msgid "Thus you can, e.g., turn a library subdirectory into a repository of its own. Note the `--` that separates 'filter-branch' options from revision options, and the `--all` to rewrite all branches and tags."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:273
+#: en/git-filter-branch.txt:286
#, priority:100
msgid "To set a commit (which typically is at the tip of another history) to be the parent of the current initial commit, in order to paste the other history behind the current history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:276
+#: en/git-filter-branch.txt:289
#, no-wrap, priority:100
msgid "git filter-branch --parent-filter 'sed \"s/^\\$/-p <graft-id>/\"' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:282
+#: en/git-filter-branch.txt:295
#, priority:100
msgid "(if the parent string is empty - which happens when we are dealing with the initial commit - add graftcommit as a parent). Note that this assumes history with a single root (that is, no merge without common ancestors happened). If this is not the case, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:286
+#: en/git-filter-branch.txt:299
#, no-wrap, priority:100
msgid ""
"git filter-branch --parent-filter \\\n"
@@ -23170,13 +23247,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:289
+#: en/git-filter-branch.txt:302
#, priority:100
msgid "or even simpler:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:293
+#: en/git-filter-branch.txt:306
#, no-wrap, priority:100
msgid ""
"git replace --graft $commit-id $graft-id\n"
@@ -23184,13 +23261,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:296
+#: en/git-filter-branch.txt:309
#, priority:100
msgid "To remove commits authored by \"Darl McBribe\" from the history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:305
+#: en/git-filter-branch.txt:318
#, no-wrap, priority:100
msgid ""
"git filter-branch --commit-filter '\n"
@@ -23203,13 +23280,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:308
+#: en/git-filter-branch.txt:321
#, priority:100
msgid "The function 'skip_commit' is defined as follows:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:320
+#: en/git-filter-branch.txt:333
#, no-wrap, priority:100
msgid ""
"skip_commit()\n"
@@ -23225,13 +23302,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:327
+#: en/git-filter-branch.txt:340
#, priority:100
msgid "The shift magic first throws away the tree id and then the -p parameters. Note that this handles merges properly! In case Darl committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 as their parents instead of the merge commit."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:332
+#: en/git-filter-branch.txt:345
#, no-wrap, priority:100
msgid ""
"*NOTE* the changes introduced by the commits, and which are not reverted\n"
@@ -23241,13 +23318,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:336
+#: en/git-filter-branch.txt:349
#, priority:100
msgid "You can rewrite the commit log messages using `--msg-filter`. For example, 'git svn-id' strings in a repository created by 'git svn' can be removed this way:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:341
+#: en/git-filter-branch.txt:354
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23256,13 +23333,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:345
+#: en/git-filter-branch.txt:358
#, priority:100
msgid "If you need to add 'Acked-by' lines to, say, the last 10 commits (none of which is a merge), use this command:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:351
+#: en/git-filter-branch.txt:364
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23272,13 +23349,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:357
+#: en/git-filter-branch.txt:370
#, priority:100
msgid "The `--env-filter` option can be used to modify committer and/or author identity. For example, if you found out that your commits have the wrong identity due to a misconfigured user.email, you can make a correction, before publishing the project, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:369
+#: en/git-filter-branch.txt:382
#, no-wrap, priority:100
msgid ""
"git filter-branch --env-filter '\n"
@@ -23294,19 +23371,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:375
+#: en/git-filter-branch.txt:388
#, priority:100
msgid "To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will point to the top-most revision that a 'git rev-list' of this range will print."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:377
+#: en/git-filter-branch.txt:390
#, priority:100
msgid "Consider this history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:382
+#: en/git-filter-branch.txt:395
#, no-wrap, priority:100
msgid ""
" D--E--F--G--H\n"
@@ -23315,25 +23392,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:385
+#: en/git-filter-branch.txt:398
#, priority:100
msgid "To rewrite only commits D,E,F,G,H, but leave A, B and C alone, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:388
+#: en/git-filter-branch.txt:401
#, ignore-ellipsis, no-wrap, priority:100
msgid "git filter-branch ... C..H\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:391
+#: en/git-filter-branch.txt:404
#, priority:100
msgid "To rewrite commits E,F,G,H, use one of these:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:395
+#: en/git-filter-branch.txt:408
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"git filter-branch ... C..H --not D\n"
@@ -23341,13 +23418,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:398
+#: en/git-filter-branch.txt:411
#, priority:100
msgid "To move the whole tree into a subdirectory, or remove it from there:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:405
+#: en/git-filter-branch.txt:418
#, no-wrap, priority:100
msgid ""
"git filter-branch --index-filter \\\n"
@@ -23358,87 +23435,279 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-filter-branch.txt:410
+#: en/git-filter-branch.txt:423
#, no-wrap, priority:100
msgid "CHECKLIST FOR SHRINKING A REPOSITORY"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:418
+#: en/git-filter-branch.txt:431
#, priority:100
msgid "git-filter-branch can be used to get rid of a subset of files, usually with some combination of `--index-filter` and `--subdirectory-filter`. People expect the resulting repository to be smaller than the original, but you need a few more steps to actually make it smaller, because Git tries hard not to lose your objects until you tell it to. First make sure that:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:422
+#: en/git-filter-branch.txt:435
#, priority:100
msgid "You really removed all variants of a filename, if a blob was moved over its lifetime. `git log --name-only --follow --all -- filename` can help you find renames."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:425
+#: en/git-filter-branch.txt:438
#, priority:100
msgid "You really filtered all refs: use `--tag-name-filter cat -- --all` when calling git-filter-branch."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:428
+#: en/git-filter-branch.txt:441
#, priority:100
msgid "Then there are two ways to get a smaller repository. A safer way is to clone, that keeps your original intact."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:432
+#: en/git-filter-branch.txt:445
#, priority:100
msgid "Clone it with `git clone file:///path/to/repo`. The clone will not have the removed objects. See linkgit:git-clone[1]. (Note that cloning with a plain path just hardlinks everything!)"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:437
+#: en/git-filter-branch.txt:450
#, priority:100
msgid "If you really don't want to clone it, for whatever reasons, check the following points instead (in this order). This is a very destructive approach, so *make a backup* or go back to cloning it. You have been warned."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:441
+#: en/git-filter-branch.txt:454
#, priority:100
msgid "Remove the original refs backed up by git-filter-branch: say `git for-each-ref --format=\"%(refname)\" refs/original/ | xargs -n 1 git update-ref -d`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:443
+#: en/git-filter-branch.txt:456
#, priority:100
msgid "Expire all reflogs with `git reflog expire --expire=now --all`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:447
+#: en/git-filter-branch.txt:460
#, priority:100
msgid "Garbage collect all unreferenced objects with `git gc --prune=now` (or if your git-gc is not new enough to support arguments to `--prune`, use `git repack -ad; git prune` instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:459
+#: en/git-filter-branch.txt:467
#, priority:100
-msgid "git-filter-branch allows you to make complex shell-scripted rewrites of your Git history, but you probably don't need this flexibility if you're simply _removing unwanted data_ like large files or passwords. For those operations you may want to consider http://rtyley.github.io/bfg-repo-cleaner/[The BFG Repo-Cleaner], a JVM-based alternative to git-filter-branch, typically at least 10-50x faster for those use-cases, and with quite different characteristics:"
+msgid "The performance of git-filter-branch is glacially slow; its design makes it impossible for a backward-compatible implementation to ever be fast:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:467
+#: en/git-filter-branch.txt:473
#, priority:100
-msgid "Any particular version of a file is cleaned exactly _once_. The BFG, unlike git-filter-branch, does not give you the opportunity to handle a file differently based on where or when it was committed within your history. This constraint gives the core performance benefit of The BFG, and is well-suited to the task of cleansing bad data - you don't care _where_ the bad data is, you just want it _gone_."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:473
+#: en/git-filter-branch.txt:476
+#, priority:100
+msgid "If you try and cheat and try to make git-filter-branch only work on files modified in a commit, then two things happen"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:482
+#, priority:100
+msgid "you run into problems with deletions whenever the user is simply trying to rename files (because attempting to delete files that don't exist looks like a no-op; it takes some chicanery to remap deletes across file renames when the renames happen via arbitrary user-provided shell)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:488
+#, priority:100
+msgid "even if you succeed at the map-deletes-for-renames chicanery, you still technically violate backward compatibility because users are allowed to filter files in ways that depend upon topology of commits instead of filtering solely based on file contents or names (though this has not been observed in the wild)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:494
+#, priority:100
+msgid "Even if you don't need to edit files but only want to e.g. rename or remove some and thus can avoid checking out each file (i.e. you can use --index-filter), you still are passing shell snippets for your filters. This means that for every commit, you have to have a prepared git repo where those filters can be run. That's a significant setup."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:505
+#, priority:100
+msgid "Further, several additional files are created or updated per commit by git-filter-branch. Some of these are for supporting the convenience functions provided by git-filter-branch (such as map()), while others are for keeping track of internal state (but could have also been accessed by user filters; one of git-filter-branch's regression tests does so). This essentially amounts to using the filesystem as an IPC mechanism between git-filter-branch and the user-provided filters. Disks tend to be a slow IPC mechanism, and writing these files also effectively represents a forced synchronization point between separate processes that we hit with every commit."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:511
+#, priority:100
+msgid "The user-provided shell commands will likely involve a pipeline of commands, resulting in the creation of many processes per commit. Creating and running another process takes a widely varying amount of time between operating systems, but on any platform it is very slow relative to invoking a function."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:517
+#, priority:100
+msgid "git-filter-branch itself is written in shell, which is kind of slow. This is the one performance issue that could be backward-compatibly fixed, but compared to the above problems that are intrinsic to the design of git-filter-branch, the language of the tool itself is a relatively minor issue."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:528
+#, priority:100
+msgid "Side note: Unfortunately, people tend to fixate on the written-in-shell aspect and periodically ask if git-filter-branch could be rewritten in another language to fix the performance issues. Not only does that ignore the bigger intrinsic problems with the design, it'd help less than you'd expect: if git-filter-branch itself were not shell, then the convenience functions (map(), skip_commit(), etc) and the `--setup` argument could no longer be executed once at the beginning of the program but would instead need to be prepended to every user filter (and thus re-executed with every commit)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:539
+#, priority:100
+msgid "The https://github.com/newren/git-filter-repo/[git filter-repo] tool is an alternative to git-filter-branch which does not suffer from these performance problems or the safety problems (mentioned below). For those with existing tooling which relies upon git-filter-branch, 'git repo-filter' also provides https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], a drop-in git-filter-branch replacement (with a few caveats). While filter-lamely suffers from all the same safety issues as git-filter-branch, it at least ameloriates the performance issues a little."
+msgstr ""
+
+#. type: Title -
+#: en/git-filter-branch.txt:542
+#, no-wrap, priority:100
+msgid "SAFETY"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:547
+#, priority:100
+msgid "git-filter-branch is riddled with gotchas resulting in various ways to easily corrupt repos or end up with a mess worse than what you started with:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:560
+#, priority:100
+msgid "Someone can have a set of \"working and tested filters\" which they document or provide to a coworker, who then runs them on a different OS where the same commands are not working/tested (some examples in the git-filter-branch manpage are also affected by this). BSD vs. GNU userland differences can really bite. If lucky, error messages are spewed. But just as likely, the commands either don't do the filtering requested, or silently corrupt by making some unwanted change. The unwanted change may only affect a few commits, so it's not necessarily obvious either. (The fact that problems won't necessarily be obvious means they are likely to go unnoticed until the rewritten history is in use for quite a while, at which point it's really hard to justify another flag-day for another rewrite.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:570
+#, priority:100
+msgid "Filenames with spaces are often mishandled by shell snippets since they cause problems for shell pipelines. Not everyone is familiar with find -print0, xargs -0, git-ls-files -z, etc. Even people who are familiar with these may assume such flags are not relevant because someone else renamed any such files in their repo back before the person doing the filtering joined the project. And often, even those familiar with handling arguments with spaces may not do so just because they aren't in the mindset of thinking about everything that could possibly go wrong."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:580
+#, priority:100
+msgid "Non-ascii filenames can be silently removed despite being in a desired directory. Keeping only wanted paths is often done using pipelines like `git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`. ls-files will only quote filenames if needed, so folks may not notice that one of the files didn't match the regex (at least not until it's much too late). Yes, someone who knows about core.quotePath can avoid this (unless they have other special characters like \\t, \\n, or \"), and people who use ls-files -z with something other than grep can avoid this, but that doesn't mean they will."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:586
+#, priority:100
+msgid "Similarly, when moving files around, one can find that filenames with non-ascii or special characters end up in a different directory, one that includes a double quote character. (This is technically the same issue as above with quoting, but perhaps an interesting different way that it can and has manifested as a problem.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:594
+#, priority:100
+msgid "It's far too easy to accidentally mix up old and new history. It's still possible with any tool, but git-filter-branch almost invites it. If lucky, the only downside is users getting frustrated that they don't know how to shrink their repo and remove the old stuff. If unlucky, they merge old and new history and end up with multiple \"copies\" of each commit, some of which have unwanted or sensitive files and others which don't. This comes about in multiple different ways:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:597
+#, priority:100
+msgid "the default to only doing a partial history rewrite ('--all' is not the default and few examples show it)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:599
+#, priority:100
+msgid "the fact that there's no automatic post-run cleanup"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:602
+#, priority:100
+msgid "the fact that --tag-name-filter (when used to rename tags) doesn't remove the old tags but just adds new ones with the new name"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:611
+#, priority:100
+msgid "the fact that little educational information is provided to inform users of the ramifications of a rewrite and how to avoid mixing old and new history. For example, this man page discusses how users need to understand that they need to rebase their changes for all their branches on top of new history (or delete and reclone), but that's only one of multiple concerns to consider. See the \"DISCUSSION\" section of the git filter-repo manual page for more details."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:614
+#, priority:100
+msgid "Annotated tags can be accidentally converted to lightweight tags, due to either of two issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:619
+#, priority:100
+msgid "Someone can do a history rewrite, realize they messed up, restore from the backups in refs/original/, and then redo their git-filter-branch command. (The backup in refs/original/ is not a real backup; it dereferences tags first.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:624
+#, priority:100
+msgid "Running git-filter-branch with either --tags or --all in your <rev-list options>. In order to retain annotated tags as annotated, you must use --tag-name-filter (and must not have restored from refs/original/ in a previously botched rewrite)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:629
#, priority:100
-msgid "By default The BFG takes full advantage of multi-core machines, cleansing commit file-trees in parallel. git-filter-branch cleans commits sequentially (i.e. in a single-threaded manner), though it _is_ possible to write filters that include their own parallelism, in the scripts executed against each commit."
+msgid "Any commit messages that specify an encoding will become corrupted by the rewrite; git-filter-branch ignores the encoding, takes the original bytes, and feeds it to commit-tree without telling it the proper encoding. (This happens whether or not --msg-filter is used.)"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:478
+#: en/git-filter-branch.txt:633
#, priority:100
-msgid "The http://rtyley.github.io/bfg-repo-cleaner/#examples[command options] are much more restrictive than git-filter branch, and dedicated just to the tasks of removing unwanted data- e.g: `--strip-blobs-bigger-than 1M`."
+msgid "Commit messages (even if they are all UTF-8) by default become corrupted due to not being updated -- any references to other commit hashes in commit messages will now refer to no-longer-extant commits."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:644
+#, priority:100
+msgid "There are no facilities for helping users find what unwanted crud they should delete, which means they are much more likely to have incomplete or partial cleanups that sometimes result in confusion and people wasting time trying to understand. (For example, folks tend to just look for big files to delete instead of big directories or extensions, and once they do so, then sometime later folks using the new repository who are going through history will notice a build artifact directory that has some files but not others, or a cache of dependencies (node_modules or similar) which couldn't have ever been functional since it's missing some files.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:647
+#, priority:100
+msgid "If --prune-empty isn't specified, then the filtering process can create hoards of confusing empty commits"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:651
+#, priority:100
+msgid "If --prune-empty is specified, then intentionally placed empty commits from before the filtering operation are also pruned instead of just pruning commits that became empty due to filtering rules."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:654
+#, ignore-ellipsis, priority:100
+msgid "If --prune empty is specified, sometimes empty commits are missed and left around anyway (a somewhat rare bug, but it happens...)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:658
+#, priority:100
+msgid "A minor issue, but users who have a goal to update all names and emails in a repository may be led to --env-filter which will only update authors and committers, missing taggers."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:664
+#, priority:100
+msgid "If the user provides a --tag-name-filter that maps multiple tags to the same name, no warning or error is provided; git-filter-branch simply overwrites each tag in some undocumented pre-defined order resulting in only one tag at the end. (A git-filter-branch regression test requires this surprising behavior.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:667
+#, priority:100
+msgid "Also, the poor performance of git-filter-branch often leads to safety issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:683
+#, priority:100
+msgid "Coming up with the correct shell snippet to do the filtering you want is sometimes difficult unless you're just doing a trivial modification such as deleting a couple files. Unfortunately, people often learn if the snippet is right or wrong by trying it out, but the rightness or wrongness can vary depending on special circumstances (spaces in filenames, non-ascii filenames, funny author names or emails, invalid timezones, presence of grafts or replace objects, etc.), meaning they may have to wait a long time, hit an error, then restart. The performance of git-filter-branch is so bad that this cycle is painful, reducing the time available to carefully re-check (to say nothing about what it does to the patience of the person doing the rewrite even if they do technically have more time available). This problem is extra compounded because errors from broken filters may not be shown for a long time and/or get lost in a sea of output. Even worse, broken filters often just result in silent incorrect rewrites."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:691
+#, priority:100
+msgid "To top it all off, even when users finally find working commands, they naturally want to share them. But they may be unaware that their repo didn't have some special cases that someone else's does. So, when someone else with a different repository runs the same commands, they get hit by the problems above. Or, the user just runs commands that really were vetted for special cases, but they run it on a different OS where it doesn't work, as noted above."
msgstr ""
#. type: Title =
@@ -23474,7 +23743,7 @@ msgid "This command is intended mostly for internal use by scripts automatically
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:64
+#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:68
#, no-wrap, priority:240
msgid "--log[=<n>]"
msgstr ""
@@ -23486,7 +23755,7 @@ msgid "In addition to branch names, populate the log message with one-line descr
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:65
+#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:69
#, ignore-same, no-wrap, priority:240
msgid "--no-log"
msgstr "--no-log"
@@ -24156,9 +24425,9 @@ msgid ""
"\t\t [--signature-file=<file>]\n"
"\t\t [-n | --numbered | -N | --no-numbered]\n"
"\t\t [--start-number <n>] [--numbered-files]\n"
-"\t\t [--in-reply-to=Message-Id] [--suffix=.<sfx>]\n"
+"\t\t [--in-reply-to=<message id>] [--suffix=.<sfx>]\n"
"\t\t [--ignore-if-in-upstream]\n"
-"\t\t [--rfc] [--subject-prefix=Subject-Prefix]\n"
+"\t\t [--rfc] [--subject-prefix=<subject prefix>]\n"
"\t\t [(--reroll-count|-v) <n>]\n"
"\t\t [--to=<email>] [--cc=<email>]\n"
"\t\t [--[no-]cover-letter] [--quiet]\n"
@@ -24207,523 +24476,524 @@ msgid "By default, each output file is numbered sequentially from 1, and uses th
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:70
+#: en/git-format-patch.txt:71
#, priority:100
-msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`."
+msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`. All directory components will be created."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:74
+#: en/git-format-patch.txt:75
#, priority:100
msgid "By default, the subject of a single patch is \"[PATCH] \" followed by the concatenation of lines from the commit message up to the first blank line (see the DISCUSSION section of linkgit:git-commit[1])."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:78
+#: en/git-format-patch.txt:79
#, priority:100
msgid "When multiple patches are output, the subject prefix will instead be \"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. To omit patch numbers from the subject, use `-N`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:83
+#: en/git-format-patch.txt:84
#, priority:100
msgid "If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a `Message-Id` header to reference."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:89
+#: en/git-format-patch.txt:90
#, no-wrap, priority:100
msgid "-<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:91
+#: en/git-format-patch.txt:92
#, priority:100
msgid "Prepare patches from the topmost <n> commits."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:92
+#: en/git-format-patch.txt:93
#, no-wrap, priority:100
msgid "-o <dir>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:93
+#: en/git-format-patch.txt:94
#, no-wrap, priority:100
msgid "--output-directory <dir>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:96
+#: en/git-format-patch.txt:97
#, priority:100
msgid "Use <dir> to store the resulting files, instead of the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:98 en/git-shortlog.txt:30
+#: en/git-format-patch.txt:99 en/git-shortlog.txt:30
#, ignore-same, no-wrap, priority:260
msgid "--numbered"
msgstr "--numbered"
#. type: Plain text
-#: en/git-format-patch.txt:100
+#: en/git-format-patch.txt:101
#, priority:100
msgid "Name output in '[PATCH n/m]' format, even with a single patch."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:102
+#: en/git-format-patch.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-numbered"
msgstr "--no-numbered"
#. type: Plain text
-#: en/git-format-patch.txt:104
+#: en/git-format-patch.txt:105
#, priority:100
msgid "Name output in '[PATCH]' format."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:105
+#: en/git-format-patch.txt:106
#, no-wrap, priority:100
msgid "--start-number <n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:107
+#: en/git-format-patch.txt:108
#, priority:100
msgid "Start numbering the patches at <n> instead of 1."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:108
+#: en/git-format-patch.txt:109
#, ignore-same, no-wrap, priority:100
msgid "--numbered-files"
msgstr "--numbered-files"
#. type: Plain text
-#: en/git-format-patch.txt:111
+#: en/git-format-patch.txt:112
#, priority:100
msgid "Output file names will be a simple number sequence without the default first line of the commit appended."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:113
+#: en/git-format-patch.txt:114
#, ignore-same, no-wrap, priority:100
msgid "--keep-subject"
msgstr "--keep-subject"
#. type: Plain text
-#: en/git-format-patch.txt:116
+#: en/git-format-patch.txt:117
#, priority:100
msgid "Do not strip/add '[PATCH]' from the first line of the commit log message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:122
+#: en/git-format-patch.txt:123
#, priority:100
msgid "Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:123 en/git-pack-objects.txt:59
+#: en/git-format-patch.txt:124 en/git-pack-objects.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--stdout"
msgstr "--stdout"
#. type: Plain text
-#: en/git-format-patch.txt:126
+#: en/git-format-patch.txt:127
#, priority:100
msgid "Print all commits to the standard output in mbox format, instead of creating a file for each one."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:127
+#: en/git-format-patch.txt:128
#, no-wrap, priority:100
msgid "--attach[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:131
+#: en/git-format-patch.txt:132
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: attachment`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:132
+#: en/git-format-patch.txt:133
#, ignore-same, no-wrap, priority:100
msgid "--no-attach"
msgstr "--no-attach"
#. type: Plain text
-#: en/git-format-patch.txt:135
+#: en/git-format-patch.txt:136
#, priority:100
msgid "Disable the creation of an attachment, overriding the configuration setting."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:136
+#: en/git-format-patch.txt:137
#, no-wrap, priority:100
msgid "--inline[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:140
+#: en/git-format-patch.txt:141
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: inline`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:141
+#: en/git-format-patch.txt:142
#, no-wrap, priority:100
msgid "--thread[=<style>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:142
+#: en/git-format-patch.txt:143
#, ignore-same, no-wrap, priority:100
msgid "--no-thread"
msgstr "--no-thread"
#. type: Plain text
-#: en/git-format-patch.txt:147
+#: en/git-format-patch.txt:148
#, priority:100
msgid "Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the first. Also controls generation of the `Message-Id` header to reference."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:153
+#: en/git-format-patch.txt:154
#, priority:100
msgid "The optional <style> argument can be either `shallow` or `deep`. 'shallow' threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order. 'deep' threading makes every mail a reply to the previous one."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:157
+#: en/git-format-patch.txt:158
#, priority:100
msgid "The default is `--no-thread`, unless the `format.thread` configuration is set. If `--thread` is specified without a style, it defaults to the style specified by `format.thread` if any, or else `shallow`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:161
+#: en/git-format-patch.txt:162
#, priority:100
msgid "Beware that the default for 'git send-email' is to thread emails itself. If you want `git format-patch` to take care of threading, you will want to ensure that threading is disabled for `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:162
-#, no-wrap, priority:100
-msgid "--in-reply-to=Message-Id"
-msgstr ""
+#: en/git-format-patch.txt:163
+#, fuzzy, no-wrap, priority:100
+#| msgid "--no-message-id"
+msgid "--in-reply-to=<message id>"
+msgstr "--no-message-id"
#. type: Plain text
-#: en/git-format-patch.txt:166
+#: en/git-format-patch.txt:167
#, priority:100
-msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given Message-Id, which avoids breaking threads to provide a new patch series."
+msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given <message id>, which avoids breaking threads to provide a new patch series."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:167
+#: en/git-format-patch.txt:168
#, ignore-same, no-wrap, priority:100
msgid "--ignore-if-in-upstream"
msgstr "--ignore-if-in-upstream"
#. type: Plain text
-#: en/git-format-patch.txt:173
+#: en/git-format-patch.txt:174
#, priority:100
msgid "Do not include a patch that matches a commit in <until>..<since>. This will examine all patches reachable from <since> but not from <until> and compare them with the patches being generated, and any patch that matches is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:174
+#: en/git-format-patch.txt:175
#, no-wrap, priority:100
-msgid "--subject-prefix=<Subject-Prefix>"
+msgid "--subject-prefix=<subject prefix>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:179
+#: en/git-format-patch.txt:180
#, priority:100
-msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<Subject-Prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
+msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<subject prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:180
+#: en/git-format-patch.txt:181
#, ignore-same, no-wrap, priority:100
msgid "--rfc"
msgstr "--rfc"
#. type: Plain text
-#: en/git-format-patch.txt:184
+#: en/git-format-patch.txt:185
#, priority:100
msgid "Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For Comments\"; use this when sending an experimental patch for discussion rather than application."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:185
+#: en/git-format-patch.txt:186
#, no-wrap, priority:100
msgid "-v <n>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:186
+#: en/git-format-patch.txt:187
#, no-wrap, priority:100
msgid "--reroll-count=<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:193
+#: en/git-format-patch.txt:194
#, priority:100
msgid "Mark the series as the <n>-th iteration of the topic. The output filenames have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default, but configurable via the `--subject-prefix` option) has ` v<n>` appended to it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:194
+#: en/git-format-patch.txt:195
#, no-wrap, priority:100
msgid "--to=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:199
+#: en/git-format-patch.txt:200
#, priority:100
msgid "Add a `To:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-to` discards all `To:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:200
+#: en/git-format-patch.txt:201
#, no-wrap, priority:100
msgid "--cc=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:205
+#: en/git-format-patch.txt:206
#, priority:100
msgid "Add a `Cc:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-cc` discards all `Cc:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:206
+#: en/git-format-patch.txt:207
#, ignore-same, no-wrap, priority:100
msgid "--from"
msgstr "--from"
#. type: Labeled list
-#: en/git-format-patch.txt:207
+#: en/git-format-patch.txt:208
#, no-wrap, priority:100
msgid "--from=<ident>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:213
+#: en/git-format-patch.txt:214
#, priority:100
msgid "Use `ident` in the `From:` header of each commit email. If the author ident of the commit is not textually identical to the provided `ident`, place a `From:` header in the body of the message with the original author. If no `ident` is given, use the committer ident."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:220
+#: en/git-format-patch.txt:221
#, priority:100
msgid "Note that this option is only useful if you are actually sending the emails and want to identify yourself as the sender, but retain the original author (and `git am` will correctly pick up the in-body header). Note also that `git send-email` already handles this transformation for you, and this option should not be used if you are feeding the result to `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:221
+#: en/git-format-patch.txt:222
#, no-wrap, priority:100
msgid "--add-header=<header>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:228
+#: en/git-format-patch.txt:229
#, priority:100
msgid "Add an arbitrary header to the email headers. This is in addition to any configured headers, and may be used multiple times. For example, `--add-header=\"Organization: git-foo\"`. The negated form `--no-add-header` discards *all* (`To:`, `Cc:`, and custom) headers added so far from config or command line."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:229
+#: en/git-format-patch.txt:230
#, ignore-same, no-wrap, priority:100
msgid "--[no-]cover-letter"
msgstr "--[no-]cover-letter"
#. type: Plain text
-#: en/git-format-patch.txt:233
+#: en/git-format-patch.txt:234
#, priority:100
msgid "In addition to the patches, generate a cover letter file containing the branch description, shortlog and the overall diffstat. You can fill in a description in the file before sending it out."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:234
+#: en/git-format-patch.txt:235
#, no-wrap, priority:100
msgid "--interdiff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:242
+#: en/git-format-patch.txt:243
#, priority:100
msgid "As a reviewer aid, insert an interdiff into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` is a single revision naming the tip of the previous series which shares a common base with the series being formatted (for example `git format-patch --cover-letter --interdiff=feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:243
+#: en/git-format-patch.txt:244
#, no-wrap, priority:100
msgid "--range-diff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:254
+#: en/git-format-patch.txt:255
#, priority:100
msgid "As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1]) into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` can be a single revision naming the tip of the previous series if it shares a common base with the series being formatted (for example `git format-patch --cover-letter --range-diff=feature/v1 -3 feature/v2`), or a revision range if the two versions of the series are disjoint (for example `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:259
+#: en/git-format-patch.txt:260
#, priority:100
msgid "Note that diff options passed to the command affect how the primary product of `format-patch` is generated, and they are not passed to the underlying `range-diff` machinery used to generate the cover-letter material (this may change in the future)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:260
+#: en/git-format-patch.txt:261
#, no-wrap, priority:100
msgid "--creation-factor=<percent>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:265
+#: en/git-format-patch.txt:266
#, priority:100
msgid "Used with `--range-diff`, tweak the heuristic which matches up commits between the previous and current series of patches by adjusting the creation/deletion cost fudge factor. See linkgit:git-range-diff[1]) for details."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:266
+#: en/git-format-patch.txt:267
#, no-wrap, priority:100
msgid "--notes[=<ref>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:267 en/pretty-options.txt:81
+#: en/git-format-patch.txt:268 en/pretty-options.txt:81
#, ignore-same, no-wrap, priority:260
msgid "--no-notes"
msgstr "--no-notes"
#. type: Plain text
-#: en/git-format-patch.txt:270
+#: en/git-format-patch.txt:271
#, priority:100
msgid "Append the notes (see linkgit:git-notes[1]) for the commit after the three-dash line."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:278
+#: en/git-format-patch.txt:279
#, priority:100
msgid "The expected use case of this is to write supporting explanation for the commit that does not belong to the commit log message proper, and include it with the patch submission. While one can simply write these explanations after `format-patch` has run but before sending, keeping them as Git notes allows them to be maintained between versions of the patch series (but see the discussion of the `notes.rewrite` configuration options in linkgit:git-notes[1] to use this workflow)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:281
+#: en/git-format-patch.txt:282
#, priority:100
msgid "The default is `--no-notes`, unless the `format.notes` configuration is set."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:282
+#: en/git-format-patch.txt:283
#, no-wrap, priority:100
msgid "--[no-]signature=<signature>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:287
+#: en/git-format-patch.txt:288
#, priority:100
msgid "Add a signature to each message produced. Per RFC 3676 the signature is separated from the body by a line with '-- ' on it. If the signature option is omitted the signature defaults to the Git version number."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:288
+#: en/git-format-patch.txt:289
#, no-wrap, priority:100
msgid "--signature-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:290
+#: en/git-format-patch.txt:291
#, priority:100
msgid "Works just like --signature except the signature is read from a file."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:291
+#: en/git-format-patch.txt:292
#, no-wrap, priority:100
msgid "--suffix=.<sfx>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:296
+#: en/git-format-patch.txt:297
#, priority:100
msgid "Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is `--suffix=.txt`. Leaving this empty will remove the `.patch` suffix."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:299
+#: en/git-format-patch.txt:300
#, priority:100
msgid "Note that the leading character does not have to be a dot; for example, you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:303
+#: en/git-format-patch.txt:304
#, priority:100
msgid "Do not print the names of the generated files to standard output."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:304
+#: en/git-format-patch.txt:305
#, ignore-same, no-wrap, priority:100
msgid "--no-binary"
msgstr "--no-binary"
#. type: Plain text
-#: en/git-format-patch.txt:309
+#: en/git-format-patch.txt:310
#, priority:100
msgid "Do not output contents of changes in binary files, instead display a notice that those files changed. Patches generated using this option cannot be applied properly, but they are still useful for code review."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:310
+#: en/git-format-patch.txt:311
#, ignore-same, no-wrap, priority:100
msgid "--zero-commit"
msgstr "--zero-commit"
#. type: Plain text
-#: en/git-format-patch.txt:313
+#: en/git-format-patch.txt:314
#, priority:100
msgid "Output an all-zero hash in each patch's From header instead of the hash of the commit."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:314
+#: en/git-format-patch.txt:315
#, no-wrap, priority:100
msgid "--base=<commit>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:318
+#: en/git-format-patch.txt:320
#, priority:100
-msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details."
+msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details. If <commit> is \"auto\", a base commit is automatically chosen."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:325
+#: en/git-format-patch.txt:327
#, priority:100
msgid "Treat the revision argument as a <revision range>, even if it is just a single commit (that would normally be treated as a <since>). Note that root commits included in the specified range are always formatted as creation patches, independently of this flag."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:328
+#: en/git-format-patch.txt:330
#, priority:100
msgid "Show progress reports on stderr as patches are generated."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:335
+#: en/git-format-patch.txt:338
#, priority:100
-msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To\" or \"Cc:\" headers, configure attachments, and sign off patches with configuration variables."
+msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To:\" or \"Cc:\" headers, configure attachments, change the patch output directory, and sign off patches with configuration variables."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:347
+#: en/git-format-patch.txt:351
#, no-wrap, priority:100
msgid ""
"[format]\n"
@@ -24735,17 +25005,18 @@ msgid ""
"\tcc = <email>\n"
"\tattach [ = mime-boundary-string ]\n"
"\tsignOff = true\n"
-"\tcoverletter = auto\n"
+"\toutputDirectory = <directory>\n"
+"\tcoverLetter = auto\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:356
+#: en/git-format-patch.txt:360
#, priority:100
msgid "The patch produced by 'git format-patch' is in UNIX mailbox format, with a fixed \"magic\" time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:366
+#: en/git-format-patch.txt:370
#, no-wrap, priority:100
msgid ""
"From 8f72bad1baf19a53459661343e21d6491c3908d3 Mon Sep 17 00:00:00 2001\n"
@@ -24759,7 +25030,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:369
+#: en/git-format-patch.txt:373
#, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -24767,7 +25038,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:372
+#: en/git-format-patch.txt:376
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"Do the same for ia64 so we can have sleek & trim looking\n"
@@ -24775,19 +25046,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:380
+#: en/git-format-patch.txt:384
#, ignore-ellipsis, priority:100
msgid "Typically it will be placed in a MUA's drafts folder, edited to add timely commentary that should not go in the changelog after the three dashes, and then sent as a message whose body, in our example, starts with \"arch/arm config files were...\". On the receiving end, readers can save interesting patches in a UNIX mailbox and apply them with linkgit:git-am[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:386
+#: en/git-format-patch.txt:390
#, priority:100
msgid "When a patch is part of an ongoing discussion, the patch generated by 'git format-patch' can be tweaked to take advantage of the 'git am --scissors' feature. After your response to the discussion comes a line that consists solely of \"`-- >8 --`\" (scissors and perforation), followed by the patch with unnecessary header fields removed:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:390
+#: en/git-format-patch.txt:394
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"...\n"
@@ -24795,21 +25066,21 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:392
+#: en/git-format-patch.txt:396
#, no-wrap, priority:100
msgid "Makes sense to me. How about this patch?\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:395
+#: en/git-format-patch.txt:399
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-Knig diet\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:398
+#: en/git-format-patch.txt:402
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -24817,61 +25088,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:406
+#: en/git-format-patch.txt:410
#, priority:100
msgid "When sending a patch this way, most often you are sending your own patch, so in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit `From:` and `Date:` lines from the patch file. The patch title is likely to be different from the subject of the discussion the patch is in response to, so it is likely that you would want to keep the Subject: line, like the example above."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:408
+#: en/git-format-patch.txt:412
#, no-wrap, priority:100
msgid "Checking for patch corruption"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:411
+#: en/git-format-patch.txt:415
#, priority:100
msgid "Many mailers if not set up properly will corrupt whitespace. Here are two common types of corruption:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:413
+#: en/git-format-patch.txt:417
#, priority:100
msgid "Empty context lines that do not have _any_ whitespace."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:416
+#: en/git-format-patch.txt:420
#, priority:100
msgid "Non-empty context lines that have one extra whitespace at the beginning."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:418
+#: en/git-format-patch.txt:422
#, priority:100
msgid "One way to test if your MUA is set up correctly is:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:422
+#: en/git-format-patch.txt:426
#, priority:100
msgid "Send the patch to yourself, exactly the way you would, except with To: and Cc: lines that do not contain the list and maintainer address."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:425
+#: en/git-format-patch.txt:429
#, priority:100
msgid "Save that patch to a file in UNIX mailbox format. Call it a.patch, say."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:427
+#: en/git-format-patch.txt:431
#, priority:100
msgid "Apply it:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:432
+#: en/git-format-patch.txt:436
#, no-wrap, priority:100
msgid ""
"$ git fetch <project> master:test-apply\n"
@@ -24881,175 +25152,175 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:434
+#: en/git-format-patch.txt:438
#, priority:100
msgid "If it does not apply correctly, there can be various reasons."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:439
+#: en/git-format-patch.txt:443
#, priority:100
msgid "The patch itself does not apply cleanly. That is _bad_ but does not have much to do with your MUA. You might want to rebase the patch with linkgit:git-rebase[1] before regenerating it in this case."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:444
+#: en/git-format-patch.txt:448
#, priority:100
msgid "The MUA corrupted your patch; \"am\" would complain that the patch does not apply. Look in the .git/rebase-apply/ subdirectory and see what 'patch' file contains and check for the common corruption patterns mentioned above."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:452
+#: en/git-format-patch.txt:456
#, priority:100
msgid "While at it, check the 'info' and 'final-commit' files as well. If what is in 'final-commit' is not exactly what you would want to see in the commit log message, it is very likely that the receiver would end up hand editing the log message when applying your patch. Things like \"Hi, this is my first patch.\\n\" in the patch e-mail should come after the three-dash line that signals the end of the commit message."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:454
+#: en/git-format-patch.txt:458
#, no-wrap, priority:100
msgid "MUA-SPECIFIC HINTS"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:457
+#: en/git-format-patch.txt:461
#, priority:100
msgid "Here are some hints on how to successfully submit patches inline using various mailers."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:459
+#: en/git-format-patch.txt:463
#, no-wrap, priority:100
msgid "GMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:465
+#: en/git-format-patch.txt:469
#, priority:100
msgid "GMail does not have any way to turn off line wrapping in the web interface, so it will mangle any emails that you send. You can however use \"git send-email\" and send your patches through the GMail SMTP server, or use any IMAP email client to connect to the google IMAP server and forward the emails through that."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:468
+#: en/git-format-patch.txt:472
#, priority:100
msgid "For hints on using 'git send-email' to send your patches through the GMail SMTP server, see the EXAMPLE section of linkgit:git-send-email[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:471
+#: en/git-format-patch.txt:475
#, priority:100
msgid "For hints on submission using the IMAP interface, see the EXAMPLE section of linkgit:git-imap-send[1]."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:473
+#: en/git-format-patch.txt:477
#, no-wrap, priority:100
msgid "Thunderbird"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:477
+#: en/git-format-patch.txt:481
#, priority:100
msgid "By default, Thunderbird will both wrap emails as well as flag them as being 'format=flowed', both of which will make the resulting email unusable by Git."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:481
+#: en/git-format-patch.txt:485
#, priority:100
msgid "There are three different approaches: use an add-on to turn off line wraps, configure Thunderbird to not mangle patches, or use an external editor to keep Thunderbird from mangling the patches."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:483
+#: en/git-format-patch.txt:487
#, no-wrap, priority:100
msgid "Approach #1 (add-on)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:491
+#: en/git-format-patch.txt:495
#, priority:100
msgid "Install the Toggle Word Wrap add-on that is available from https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you can tick off. Now you can compose the message as you otherwise do (cut + paste, 'git format-patch' | 'git imap-send', etc), but you have to insert line breaks manually in any text that you type."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:493
+#: en/git-format-patch.txt:497
#, no-wrap, priority:100
msgid "Approach #2 (configuration)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:495
+#: en/git-format-patch.txt:499
#, priority:100
msgid "Three steps:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:499
+#: en/git-format-patch.txt:503
#, ignore-ellipsis, priority:100
msgid "Configure your mail server composition as plain text: Edit...Account Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:501
+#: en/git-format-patch.txt:505
#, priority:100
msgid "Configure your general composition window to not wrap."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:504
+#: en/git-format-patch.txt:508
#, priority:100
msgid "In Thunderbird 2: Edit..Preferences..Composition, wrap plain text messages at 0"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:510
+#: en/git-format-patch.txt:514
#, priority:100
msgid "In Thunderbird 3: Edit..Preferences..Advanced..Config Editor. Search for \"mail.wrap_long_lines\". Toggle it to make sure it is set to `false`. Also, search for \"mailnews.wraplength\" and set the value to 0."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:515
+#: en/git-format-patch.txt:519
#, priority:100
msgid "Disable the use of format=flowed: Edit..Preferences..Advanced..Config Editor. Search for \"mailnews.send_plaintext_flowed\". Toggle it to make sure it is set to `false`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:519
+#: en/git-format-patch.txt:523
#, priority:100
msgid "After that is done, you should be able to compose email as you otherwise would (cut + paste, 'git format-patch' | 'git imap-send', etc), and the patches will not be mangled."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:521
+#: en/git-format-patch.txt:525
#, no-wrap, priority:100
msgid "Approach #3 (external editor)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:526
+#: en/git-format-patch.txt:530
#, priority:100
msgid "The following Thunderbird extensions are needed: AboutConfig from http://aboutconfig.mozdev.org/ and External Editor from http://globs.org/articles.php?lng=en&pg=8"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:528
+#: en/git-format-patch.txt:532
#, priority:100
msgid "Prepare the patch as a text file using your method of choice."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:533
+#: en/git-format-patch.txt:537
#, priority:100
msgid "Before opening a compose window, use Edit->Account Settings to uncheck the \"Compose messages in HTML format\" setting in the \"Composition & Addressing\" panel of the account to be used to send the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:537
+#: en/git-format-patch.txt:541
#, priority:100
msgid "In the main Thunderbird window, 'before' you open the compose window for the patch, use Tools->about:config to set the following to the indicated values:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:541
+#: en/git-format-patch.txt:545
#, no-wrap, priority:100
msgid ""
"\tmailnews.send_plaintext_flowed => false\n"
@@ -25057,25 +25328,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:544
+#: en/git-format-patch.txt:548
#, priority:100
msgid "Open a compose window and click the external editor icon."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:547
+#: en/git-format-patch.txt:551
#, priority:100
msgid "In the external editor window, read in the patch file and exit the editor normally."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:550
+#: en/git-format-patch.txt:554
#, priority:100
msgid "Side note: it may be possible to do step 2 with about:config and the following settings but no one's tried yet."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:555
+#: en/git-format-patch.txt:559
#, no-wrap, priority:100
msgid ""
"\tmail.html_compose => false\n"
@@ -25084,91 +25355,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:560
+#: en/git-format-patch.txt:564
#, priority:100
msgid "There is a script in contrib/thunderbird-patch-inline which can help you include patches with Thunderbird in an easy way. To use it, do the steps above and then use the script as the external editor."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:562
+#: en/git-format-patch.txt:566
#, no-wrap, priority:100
msgid "KMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:564
+#: en/git-format-patch.txt:568
#, priority:100
msgid "This should help you to submit patches inline using KMail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:566
+#: en/git-format-patch.txt:570
#, priority:100
msgid "Prepare the patch as a text file."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:568
+#: en/git-format-patch.txt:572
#, priority:100
msgid "Click on New Mail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:571
+#: en/git-format-patch.txt:575
#, priority:100
msgid "Go under \"Options\" in the Composer window and be sure that \"Word wrap\" is not set."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:573
+#: en/git-format-patch.txt:577
#, ignore-ellipsis, priority:100
msgid "Use Message -> Insert file... and insert the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:576
+#: en/git-format-patch.txt:580
#, priority:100
msgid "Back in the compose window: add whatever other text you wish to the message, complete the addressing and subject fields, and press send."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:578
+#: en/git-format-patch.txt:582
#, no-wrap, priority:100
msgid "BASE TREE INFORMATION"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:587
+#: en/git-format-patch.txt:591
#, priority:100
msgid "The base tree information block is used for maintainers or third party testers to know the exact state the patch series applies to. It consists of the 'base commit', which is a well-known commit that is part of the stable part of the project history everybody else works off of, and zero or more 'prerequisite patches', which are well-known patches in flight that is not yet part of the 'base commit' that need to be applied on top of 'base commit' in topological order before the patches can be applied."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:593
+#: en/git-format-patch.txt:597
#, priority:100
msgid "The 'base commit' is shown as \"base-commit: \" followed by the 40-hex of the commit object name. A 'prerequisite patch' is shown as \"prerequisite-patch-id: \" followed by the 40-hex 'patch id', which can be obtained by passing the patch through the `git patch-id --stable` command."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:597
+#: en/git-format-patch.txt:601
#, priority:100
msgid "Imagine that on top of the public commit P, you applied well-known patches X, Y and Z from somebody else, and then built your three-patch series A, B, C, the history would be like:"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:600
+#: en/git-format-patch.txt:604
#, no-wrap, priority:100
msgid "---P---X---Y---Z---A---B---C\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:607
+#: en/git-format-patch.txt:611
#, priority:100
msgid "With `git format-patch --base=P -3 C` (or variants thereof, e.g. with `--cover-letter` or using `Z..C` instead of `-3 C` to specify the range), the base tree information block is shown at the end of the first message the command outputs (either the first patch, or the cover letter), like this:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:613
+#: en/git-format-patch.txt:617
#, no-wrap, priority:100
msgid ""
"base-commit: P\n"
@@ -25178,13 +25449,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:616
+#: en/git-format-patch.txt:620
#, priority:100
msgid "For non-linear topology, such as"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:621
+#: en/git-format-patch.txt:625
#, no-wrap, priority:100
msgid ""
"---P---X---A---M---C\n"
@@ -25193,91 +25464,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:626
+#: en/git-format-patch.txt:630
#, priority:100
msgid "You can also use `git format-patch --base=P -3 C` to generate patches for A, B and C, and the identifiers for P, X, Y, Z are appended at the end of the first message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:632
+#: en/git-format-patch.txt:636
#, priority:100
msgid "If set `--base=auto` in cmdline, it will track base commit automatically, the base commit will be the merge base of tip commit of the remote-tracking branch and revision-range specified in cmdline. For a local branch, you need to track a remote branch by `git branch --set-upstream-to` before using this option."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:638
+#: en/git-format-patch.txt:642
#, priority:100
msgid "Extract commits between revisions R1 and R2, and apply them on top of the current branch using 'git am' to cherry-pick them:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:641
+#: en/git-format-patch.txt:645
#, no-wrap, priority:100
msgid "$ git format-patch -k --stdout R1..R2 | git am -3 -k\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:645
+#: en/git-format-patch.txt:649
#, priority:100
msgid "Extract all commits which are in the current branch but not in the origin branch:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:648
+#: en/git-format-patch.txt:652
#, no-wrap, priority:100
msgid "$ git format-patch origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:651
+#: en/git-format-patch.txt:655
#, priority:100
msgid "For each commit a separate file is created in the current directory."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:654
+#: en/git-format-patch.txt:658
#, priority:100
msgid "Extract all commits that lead to 'origin' since the inception of the project:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:657
+#: en/git-format-patch.txt:661
#, no-wrap, priority:100
msgid "$ git format-patch --root origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:660
+#: en/git-format-patch.txt:664
#, priority:100
msgid "The same as the previous one:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:663
+#: en/git-format-patch.txt:667
#, no-wrap, priority:100
msgid "$ git format-patch -M -B origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:670
+#: en/git-format-patch.txt:674
#, priority:100
msgid "Additionally, it detects and handles renames and complete rewrites intelligently to produce a renaming patch. A renaming patch reduces the amount of text output, and generally makes it easier to review. Note that non-Git \"patch\" programs won't understand renaming patches, so use it only when you know the recipient uses Git to apply your patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:673
+#: en/git-format-patch.txt:677
#, priority:100
msgid "Extract three topmost commits from the current branch and format them as e-mailable patches:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:676
+#: en/git-format-patch.txt:680
#, no-wrap, priority:100
msgid "$ git format-patch -3\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:681
+#: en/git-format-patch.txt:685
#, ignore-same, priority:100
msgid "linkgit:git-am[1], linkgit:git-send-email[1]"
msgstr "linkgit:git-am[1], linkgit:git-send-email[1]"
@@ -25773,43 +26044,43 @@ msgid "The below documentation is the same as what's found in linkgit:git-config
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:127
+#: en/git-gc.txt:126
#, priority:100
-msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, refs saved by 'git filter-branch' in refs/original/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
+msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, notes saved by 'git notes' under refs/notes/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:134
+#: en/git-gc.txt:133
#, priority:100
msgid "On the other hand, when 'git gc' runs concurrently with another process, there is a risk of it deleting an object that the other process is using but hasn't created a reference to. This may just cause the other process to fail or may corrupt the repository if the other process later adds a reference to the deleted object. Git has two features that significantly mitigate this problem:"
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:137
+#: en/git-gc.txt:136
#, priority:100
msgid "Any object with modification time newer than the `--prune` date is kept, along with everything reachable from it."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:141
+#: en/git-gc.txt:140
#, priority:100
msgid "Most operations that add an object to the database update the modification time of the object if it is already present so that #1 applies."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:145
+#: en/git-gc.txt:144
#, priority:100
msgid "However, these features fall short of a complete solution, so users who run commands concurrently have to live with some risk of corruption (which seems to be low in practice)."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:151
+#: en/git-gc.txt:150
#, priority:100
msgid "The 'git gc --auto' command will run the 'pre-auto-gc' hook. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:159
+#: en/git-gc.txt:158
#, ignore-same, priority:100
msgid "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
msgstr "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
@@ -26075,7 +26346,7 @@ msgid "For each <pathspec> given on command line, descend at most <depth> levels
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:399
+#: en/git-grep.txt:128 en/git-submodule.txt:400
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
@@ -26291,7 +26562,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:951
+#: en/git-grep.txt:217 en/rev-list-options.txt:967
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -26441,127 +26712,151 @@ msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:280
+#: en/git-grep.txt:277
+#, priority:100
+msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:282
+#, priority:100
+msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:287
+#, priority:100
+msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:291
+#, priority:100
+msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:297
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:281
+#: en/git-grep.txt:298
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:282
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:283 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:284
+#: en/git-grep.txt:301
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:289
+#: en/git-grep.txt:306
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:290 en/rev-list-options.txt:65
+#: en/git-grep.txt:307 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:294
+#: en/git-grep.txt:311
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:299
+#: en/git-grep.txt:316
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:300
+#: en/git-grep.txt:317
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:303
+#: en/git-grep.txt:320
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:307
+#: en/git-grep.txt:324
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:328
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:318
+#: en/git-grep.txt:335
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:321
+#: en/git-grep.txt:338
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:322
+#: en/git-grep.txt:339
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:325
+#: en/git-grep.txt:342
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:326
+#: en/git-grep.txt:343
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:329
+#: en/git-grep.txt:346
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:330
+#: en/git-grep.txt:347
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:332
+#: en/git-grep.txt:349
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
@@ -26779,25 +27074,13 @@ msgstr ""
#. type: Plain text
#: en/git-gui.txt:116
#, priority:100
-msgid "A 'git gui' development repository can be obtained from:"
+msgid "The official repository of the 'git gui' project can be found at:"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:118
#, no-wrap, priority:100
-msgid " git clone git://repo.or.cz/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:122
-#, no-wrap, priority:100
-msgid " git clone http://repo.or.cz/r/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:124
-#, priority:100
-msgid "or browsed online at http://repo.or.cz/w/git-gui.git/[]."
+msgid " https://github.com/prati0100/git-gui.git/\n"
msgstr ""
#. type: Title =
@@ -30409,29 +30692,29 @@ msgstr ""
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
-#. type: Plain text
-#: en/git-ls-remote.txt:110
+#. type: delimited block -
+#: en/git-ls-remote.txt:111
#, no-wrap, priority:100
msgid ""
-"\t$ git ls-remote --tags ./.\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"\t$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
-"\t5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"\tc781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
-"\t$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
-"\t$ git ls-remote --tags korg v\\*\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"$ git ls-remote --tags ./.\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
+"$ git ls-remote --tags korg v\\*\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:114
+#: en/git-ls-remote.txt:116
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -30939,7 +31222,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:358
+#: en/git-merge-base.txt:60 en/git-rebase.txt:376
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -30968,235 +31251,235 @@ msgstr ""
msgid "For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:86
+#. type: delimited block .
+#: en/git-merge-base.txt:87
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---B\n"
-"\t /\n"
-"\t---o---1---o---o---o---A\n"
+"\t o---o---o---B\n"
+"\t/\n"
+"---o---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:88
+#: en/git-merge-base.txt:90
#, priority:100
msgid "the merge base between 'A' and 'B' is '1'."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:92
+#: en/git-merge-base.txt:94
#, priority:100
msgid "Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the merge base between 'A' and a hypothetical commit 'M', which is a merge between 'B' and 'C'. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:98
+#. type: delimited block .
+#: en/git-merge-base.txt:101
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---C\n"
-"\t /\n"
-"\t / o---o---o---B\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---C\n"
+" /\n"
+" / o---o---o---B\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:101
+#: en/git-merge-base.txt:105
#, priority:100
msgid "the result of `git merge-base A B C` is '1'. This is because the equivalent topology with a merge commit 'M' between 'B' and 'C' is:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:108
+#. type: delimited block .
+#: en/git-merge-base.txt:113
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---o\n"
-"\t / \\\n"
-"\t / o---o---o---o---M\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---o\n"
+" / \\\n"
+" / o---o---o---o---M\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:112
+#: en/git-merge-base.txt:118
#, priority:100
msgid "and the result of `git merge-base A M` is '1'. Commit '2' is also a common ancestor between 'A' and 'M', but '1' is a better common ancestor, because '2' is an ancestor of '1'. Hence, '2' is not a merge base."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:115
+#: en/git-merge-base.txt:121
#, priority:100
msgid "The result of `git merge-base --octopus A B C` is '2', because '2' is the best common ancestor of all commits."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:118
+#: en/git-merge-base.txt:124
#, priority:100
msgid "When the history involves criss-cross merges, there can be more than one 'best' common ancestor for two commits. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:124
+#. type: delimited block .
+#: en/git-merge-base.txt:131
#, no-wrap, priority:100
msgid ""
-"\t---1---o---A\n"
-"\t \\ /\n"
-"\t X\n"
-"\t / \\\n"
-"\t---2---o---o---B\n"
+"---1---o---A\n"
+" \\ /\n"
+" X\n"
+" / \\\n"
+"---2---o---o---B\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:128
+#: en/git-merge-base.txt:136
#, priority:100
msgid "both '1' and '2' are merge-bases of A and B. Neither one is better than the other (both are 'best' merge bases). When the `--all` option is not given, it is unspecified which best one is output."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:133
+#: en/git-merge-base.txt:141
#, priority:100
msgid "A common idiom to check \"fast-forward-ness\" between two commits A and B is (or at least used to be) to compute the merge base between A and B, and check if it is the same as A, in which case, A is an ancestor of B. You will see this idiom used often in older scripts."
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:139
+#. type: delimited block .
+#: en/git-merge-base.txt:148
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tA=$(git rev-parse --verify A)\n"
-"\tif test \"$A\" = \"$(git merge-base A B)\"\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"A=$(git rev-parse --verify A)\n"
+"if test \"$A\" = \"$(git merge-base A B)\"\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:141
+#: en/git-merge-base.txt:151
#, priority:100
msgid "In modern git, you can say this in a more direct way:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:146
+#. type: delimited block .
+#: en/git-merge-base.txt:157
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tif git merge-base --is-ancestor A B\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"if git merge-base --is-ancestor A B\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:148
+#: en/git-merge-base.txt:160
#, priority:100
msgid "instead."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:150
+#: en/git-merge-base.txt:162
#, no-wrap, priority:100
msgid "Discussion on fork-point mode"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:156
+#: en/git-merge-base.txt:168
#, priority:100
msgid "After working on the `topic` branch created with `git switch -c topic origin/master`, the history of remote-tracking branch `origin/master` may have been rewound and rebuilt, leading to a history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:164
+#. type: delimited block .
+#: en/git-merge-base.txt:177
#, no-wrap, priority:100
msgid ""
-"\t o---B2\n"
-"\t /\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t \\\n"
-"\t B0\n"
-"\t \\\n"
-"\t D0---D1---D (topic)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\\n"
+"\t B0\n"
+"\t \\\n"
+"\t D0---D1---D (topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:170
+#: en/git-merge-base.txt:184
#, priority:100
msgid "where `origin/master` used to point at commits B0, B1, B2 and now it points at B, and your `topic` branch was started on top of it back when `origin/master` was at B0, and you built three commits, D0, D1, and D, on top of it. Imagine that you now want to rebase the work you did on the topic on top of the updated origin/master."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:176
+#: en/git-merge-base.txt:190
#, priority:100
msgid "In such a case, `git merge-base origin/master topic` would return the parent of B0 in the above picture, but B0^..D is *not* the range of commits you would want to replay on top of B (it includes B0, which is not what you wrote; it is a commit the other side discarded when it moved its tip from B0 to B1)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:184
+#: en/git-merge-base.txt:198
#, priority:100
msgid "`git merge-base --fork-point origin/master topic` is designed to help in such a case. It takes not only B but also B0, B1, and B2 (i.e. old tips of the remote-tracking branches your repository's reflog knows about) into account to see on which commit your topic branch was built and finds B0, allowing you to replay only the commits on your topic, excluding the commits the other side later discarded."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:186
+#: en/git-merge-base.txt:200
#, priority:100
msgid "Hence"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:188
+#: en/git-merge-base.txt:202
#, no-wrap, priority:100
msgid " $ fork_point=$(git merge-base --fork-point origin/master topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:190
+#: en/git-merge-base.txt:204
#, priority:100
msgid "will find B0, and"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:192
+#: en/git-merge-base.txt:206
#, no-wrap, priority:100
msgid " $ git rebase --onto origin/master $fork_point topic\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:195
+#: en/git-merge-base.txt:209
#, priority:100
msgid "will replay D0, D1 and D on top of B to create a new history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:203
+#. type: delimited block .
+#: en/git-merge-base.txt:218
#, no-wrap, priority:100
msgid ""
-"\t\t\t o---B2\n"
-"\t\t\t/\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t\t\\ \\\n"
-"\t\t B0 D0'--D1'--D' (topic - updated)\n"
-"\t\t \\\n"
-"\t\t D0---D1---D (topic - old)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\ \\\n"
+"\t B0 D0'--D1'--D' (topic - updated)\n"
+"\t \\\n"
+"\t D0---D1---D (topic - old)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:210
+#: en/git-merge-base.txt:226
#, priority:100
msgid "A caveat is that older reflog entries in your repository may be expired by `git gc`. If B0 no longer appears in the reflog of the remote-tracking branch `origin/master`, the `--fork-point` mode obviously cannot find it and fails, avoiding to give a random and useless result (such as the parent of B0, like the same command without the `--fork-point` option gives)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:221
+#: en/git-merge-base.txt:237
#, priority:100
msgid "Also, the remote-tracking branch you use the `--fork-point` mode with must be the one your topic forked from its tip. If you forked from an older commit than the tip, this mode would not find the fork point (imagine in the above sample history B0 did not exist, origin/master started at B1, moved to B2 and then B, and you forked your topic at origin/master^ when origin/master was B1; the shape of the history would be the same as above, without B0, and the parent of B1 is what `git merge-base origin/master topic` correctly finds, but the `--fork-point` mode will not, because it is not one of the commits that used to be at the tip of origin/master)."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:224
+#: en/git-merge-base.txt:240
#, no-wrap, priority:100
msgid "See also"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:228
+#: en/git-merge-base.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
msgstr "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
@@ -31407,31 +31690,31 @@ msgstr ""
msgid "Examples:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:62
+#. type: delimited block -
+#: en/git-merge-index.txt:63
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
-" This is MM from the original tree.\t\t\t# original\n"
-" This is modified MM in the branch A.\t\t\t# merge1\n"
-" This is modified MM in the branch B.\t\t\t# merge2\n"
-" This is modified MM in the branch B.\t\t\t# current contents\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
+"This is MM from the original tree.\t\t# original\n"
+"This is modified MM in the branch A.\t\t# merge1\n"
+"This is modified MM in the branch B.\t\t# merge2\n"
+"This is modified MM in the branch B.\t\t# current contents\n"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:71
+#. type: delimited block -
+#: en/git-merge-index.txt:74
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
-" cat: : No such file or directory\n"
-" This is added AA in the branch A.\n"
-" This is added AA in the branch B.\n"
-" This is added AA in the branch B.\n"
-" fatal: merge program failed\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
+"cat: : No such file or directory\n"
+"This is added AA in the branch A.\n"
+"This is added AA in the branch B.\n"
+"This is added AA in the branch B.\n"
+"fatal: merge program failed\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-index.txt:76
+#: en/git-merge-index.txt:80
#, priority:100
msgid "where the latter example shows how 'git merge-index' will stop trying to merge once anything has returned an error (i.e., `cat` returned an error for the AA file, because it didn't exist in the original, and thus 'git merge-index' didn't even try to merge the MM thing)."
msgstr ""
@@ -31729,7 +32012,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n"
-"\t[-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
+"\t[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
"\t[--[no-]allow-unrelated-histories]\n"
"\t[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]\n"
"'git merge' (--continue | --abort | --quit)\n"
@@ -32810,7 +33093,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:281 en/merge-options.txt:108
+#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -33790,7 +34073,7 @@ msgid "Conflicts can occur when applying a commit to p4. When this happens, the
msgstr ""
#. type: Labeled list
-#: en/git-p4.txt:359 en/git-submodule.txt:270
+#: en/git-p4.txt:359 en/git-submodule.txt:271
#, no-wrap, priority:220
msgid "--branch <branch>"
msgstr ""
@@ -34926,7 +35209,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:263 en/rev-list-options.txt:760
+#: en/git-pack-objects.txt:263 en/rev-list-options.txt:776
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -34938,13 +35221,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:266 en/rev-list-options.txt:767
+#: en/git-pack-objects.txt:266 en/rev-list-options.txt:783
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:269 en/rev-list-options.txt:770
+#: en/git-pack-objects.txt:269 en/rev-list-options.txt:786
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -34956,7 +35239,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:276 en/rev-list-options.txt:777
+#: en/git-pack-objects.txt:276 en/rev-list-options.txt:793
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -34968,7 +35251,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:281 en/rev-list-options.txt:785
+#: en/git-pack-objects.txt:281 en/rev-list-options.txt:801
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -35727,13 +36010,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:502
+#: en/git-pull.txt:136 en/git-rebase.txt:524
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:503
+#: en/git-pull.txt:137 en/git-rebase.txt:525
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -37526,8 +37809,8 @@ msgstr ""
#: en/git-rebase.txt:16
#, no-wrap, priority:100
msgid ""
-"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
-"\t[<upstream> [<branch>]]\n"
+"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>]\n"
+"\t[--onto <newbase> | --keep-base] [<upstream> [<branch>]]\n"
"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
"\t--root [<branch>]\n"
"'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch)\n"
@@ -37846,512 +38129,542 @@ msgstr ""
msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:220
+#, ignore-same, no-wrap, priority:100
+msgid "--keep-base"
+msgstr "--keep-base"
+
#. type: Plain text
-#: en/git-rebase.txt:224
+#: en/git-rebase.txt:225
+#, ignore-ellipsis, priority:100
+msgid "Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running 'git rebase --keep-base <upstream> <branch>' is equivalent to running 'git rebase --onto <upstream>... <upstream>'."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:230
+#, priority:100
+msgid "This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:235
+#, priority:100
+msgid "Although both this option and --fork-point find the merge base between <upstream> and <branch>, this option uses the merge base as the _starting point_ on which new commits will be created, whereas --fork-point uses the merge base to determine the _set of commits_ which will be rebased."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#, priority:100
+msgid "See also INCOMPATIBLE OPTIONS below."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:242
#, priority:100
msgid "Upstream branch to compare against. May be any valid commit, not just an existing branch name. Defaults to the configured upstream for the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:230
+#: en/git-rebase.txt:248
#, priority:100
msgid "Restart the rebasing process after having resolved a merge conflict."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237
+#: en/git-rebase.txt:255
#, priority:100
msgid "Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:242
+#: en/git-rebase.txt:260
#, priority:100
msgid "Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:243 en/git-rebase.txt:538
+#: en/git-rebase.txt:261 en/git-rebase.txt:560
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:246
+#: en/git-rebase.txt:264
#, priority:100
msgid "Keep the commits that do not change anything from its parents in the result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:248 en/git-rebase.txt:255 en/git-rebase.txt:280 en/git-rebase.txt:293 en/git-rebase.txt:302 en/git-rebase.txt:344 en/git-rebase.txt:379 en/git-rebase.txt:386 en/git-rebase.txt:393 en/git-rebase.txt:405 en/git-rebase.txt:445 en/git-rebase.txt:470 en/git-rebase.txt:482 en/git-rebase.txt:501
-#, priority:100
-msgid "See also INCOMPATIBLE OPTIONS below."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rebase.txt:253
+#: en/git-rebase.txt:271
#, priority:100
msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:258
+#: en/git-rebase.txt:276
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:259 en/git-rebase.txt:539
+#: en/git-rebase.txt:277 en/git-rebase.txt:561
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:261
+#: en/git-rebase.txt:279
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:266
+#: en/git-rebase.txt:284
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:272
+#: en/git-rebase.txt:290
#, priority:100
msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:278
+#: en/git-rebase.txt:296
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:286
+#: en/git-rebase.txt:304
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:291
+#: en/git-rebase.txt:309
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:294
+#: en/git-rebase.txt:312
#, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:295
+#: en/git-rebase.txt:313
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:300
+#: en/git-rebase.txt:318
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:317
+#: en/git-rebase.txt:335
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:321
+#: en/git-rebase.txt:339
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:325
+#: en/git-rebase.txt:343
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:329
+#: en/git-rebase.txt:347
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:332
+#: en/git-rebase.txt:350
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:333 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:336
+#: en/git-rebase.txt:354
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:345 en/merge-options.txt:47
+#: en/git-rebase.txt:363 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:346
+#: en/git-rebase.txt:364
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:351
+#: en/git-rebase.txt:369
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:357
+#: en/git-rebase.txt:375
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:359
+#: en/git-rebase.txt:377
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:363
+#: en/git-rebase.txt:381
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:387
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:372
+#: en/git-rebase.txt:390
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:394
+#, priority:100
+msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:399
#, priority:100
msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:384
+#: en/git-rebase.txt:406
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:391
+#: en/git-rebase.txt:413
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:421
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:403
+#: en/git-rebase.txt:425
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:407
+#: en/git-rebase.txt:429
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:415
+#: en/git-rebase.txt:437
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:422
+#: en/git-rebase.txt:444
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:426
+#: en/git-rebase.txt:448
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges`, but in contrast to that option works well in interactive rebases: commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:430
+#: en/git-rebase.txt:452
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:432
+#: en/git-rebase.txt:454
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:434 en/git-rebase.txt:535 en/git-svn.txt:680
+#: en/git-rebase.txt:456 en/git-rebase.txt:557 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:439
+#: en/git-rebase.txt:461
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:443
+#: en/git-rebase.txt:465
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:446
+#: en/git-rebase.txt:468
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:447
+#: en/git-rebase.txt:469
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:474
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:455
+#: en/git-rebase.txt:477
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:457
+#: en/git-rebase.txt:479
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:459
+#: en/git-rebase.txt:481
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:483
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:487
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:490
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:480
+#: en/git-rebase.txt:502
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:505
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:484
+#: en/git-rebase.txt:506
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:495
+#: en/git-rebase.txt:517
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:499
+#: en/git-rebase.txt:521
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:509
+#: en/git-rebase.txt:531
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:510
+#: en/git-rebase.txt:532
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:511
+#: en/git-rebase.txt:533
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:514
+#: en/git-rebase.txt:536
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:516
+#: en/git-rebase.txt:538
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:519
+#: en/git-rebase.txt:541
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:523
+#: en/git-rebase.txt:545
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:527
+#: en/git-rebase.txt:549
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:530
+#: en/git-rebase.txt:552
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:553
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:555
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Plain text
-#: en/git-rebase.txt:534
+#: en/git-rebase.txt:556
#, ignore-same, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:537
+#: en/git-rebase.txt:559
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:540
+#: en/git-rebase.txt:562
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:542
+#: en/git-rebase.txt:564
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:544
+#: en/git-rebase.txt:566
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:567
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:546
+#: en/git-rebase.txt:568
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:547
+#: en/git-rebase.txt:569
#, priority:100
-msgid "--rebase-merges and --strategy"
+msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:548
+#: en/git-rebase.txt:570
#, priority:100
-msgid "--rebase-merges and --strategy-option"
+msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:550
+#: en/git-rebase.txt:572
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:575
#, no-wrap, priority:100
msgid "There are some subtle differences how the backends behave.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:556
+#: en/git-rebase.txt:578
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38359,7 +38672,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:561
+#: en/git-rebase.txt:583
#, no-wrap, priority:100
msgid ""
"The am backend drops any \"empty\" commits, regardless of whether the\n"
@@ -38369,7 +38682,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:588
#, no-wrap, priority:100
msgid ""
"The interactive backend drops commits by default that\n"
@@ -38379,7 +38692,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:591
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38387,7 +38700,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:573
+#: en/git-rebase.txt:595
#, no-wrap, priority:100
msgid ""
"Directory rename heuristics are enabled in the merge and interactive\n"
@@ -38396,145 +38709,145 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:597
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:577
+#: en/git-rebase.txt:599
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:582
+#: en/git-rebase.txt:604
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:587
+#: en/git-rebase.txt:609
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:589
+#: en/git-rebase.txt:611
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:596
+#: en/git-rebase.txt:618
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:598
+#: en/git-rebase.txt:620
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:600
+#: en/git-rebase.txt:622
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:601
+#: en/git-rebase.txt:623
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:602
+#: en/git-rebase.txt:624
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:603
+#: en/git-rebase.txt:625
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:605
+#: en/git-rebase.txt:627
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:607
+#: en/git-rebase.txt:629
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:631
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:610
+#: en/git-rebase.txt:632
#, priority:100
msgid "commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:612
+#: en/git-rebase.txt:634
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:614
+#: en/git-rebase.txt:636
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:615
+#: en/git-rebase.txt:637
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:616
+#: en/git-rebase.txt:638
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:644
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:646
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:626
+#: en/git-rebase.txt:648
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:653
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:658
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -38543,73 +38856,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:641
+#: en/git-rebase.txt:663
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:668
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:649
+#: en/git-rebase.txt:671
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:652
+#: en/git-rebase.txt:674
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:655
+#: en/git-rebase.txt:677
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:685
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:667
+#: en/git-rebase.txt:689
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:693
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:696
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:699
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:680
+#: en/git-rebase.txt:702
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:687
+#: en/git-rebase.txt:709
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -38620,25 +38933,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:691
+#: en/git-rebase.txt:713
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:694
+#: en/git-rebase.txt:716
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:701
+#: en/git-rebase.txt:723
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:710
+#: en/git-rebase.txt:732
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -38651,31 +38964,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:715
+#: en/git-rebase.txt:737
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:720
+#: en/git-rebase.txt:742
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:745
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:727
+#: en/git-rebase.txt:749
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:759
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -38689,85 +39002,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:740
+#: en/git-rebase.txt:762
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:746
+#: en/git-rebase.txt:768
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:750
+#: en/git-rebase.txt:772
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:752
+#: en/git-rebase.txt:774
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:756
+#: en/git-rebase.txt:778
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:760
+#: en/git-rebase.txt:782
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:763
+#: en/git-rebase.txt:785
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:765
+#: en/git-rebase.txt:787
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:767
+#: en/git-rebase.txt:789
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:794
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:775
+#: en/git-rebase.txt:797
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:804
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:809
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:816
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38778,13 +39091,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:819
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:826
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38795,13 +39108,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:808
+#: en/git-rebase.txt:830
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:815
+#: en/git-rebase.txt:837
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38812,73 +39125,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:822
+#: en/git-rebase.txt:844
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:824
+#: en/git-rebase.txt:846
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:825
+#: en/git-rebase.txt:847
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:829
+#: en/git-rebase.txt:851
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:836
+#: en/git-rebase.txt:859
#, priority:100
-msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or `filter-branch`."
+msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:839
+#: en/git-rebase.txt:862
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:867
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:848
+#: en/git-rebase.txt:871
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:850
+#: en/git-rebase.txt:873
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:875
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:858
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38889,19 +39202,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:885
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:866
+#: en/git-rebase.txt:889
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:894
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -38911,67 +39224,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:876
+#: en/git-rebase.txt:899
#, priority:100
-msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge-base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
+msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:880
+#: en/git-rebase.txt:903
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:883
+#: en/git-rebase.txt:906
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:886
+#: en/git-rebase.txt:909
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:888
+#: en/git-rebase.txt:911
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:893
+#: en/git-rebase.txt:916
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:895
+#: en/git-rebase.txt:918
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:926
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:907
+#: en/git-rebase.txt:930
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:912
+#: en/git-rebase.txt:935
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:922
+#: en/git-rebase.txt:945
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -38985,25 +39298,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:929
+#: en/git-rebase.txt:952
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:932
+#: en/git-rebase.txt:955
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:935 en/git-rebase.txt:1012
+#: en/git-rebase.txt:958 en/git-rebase.txt:1035
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:941
+#: en/git-rebase.txt:964
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39014,7 +39327,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:946
+#: en/git-rebase.txt:969
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39024,7 +39337,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:950
+#: en/git-rebase.txt:973
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39033,55 +39346,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:954
+#: en/git-rebase.txt:977
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:962
+#: en/git-rebase.txt:985
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:992
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:975
+#: en/git-rebase.txt:998
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:978
+#: en/git-rebase.txt:1001
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1008
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:989
+#: en/git-rebase.txt:1012
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:996
+#: en/git-rebase.txt:1019
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1003
+#: en/git-rebase.txt:1026
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39092,13 +39405,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1009
+#: en/git-rebase.txt:1032
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1015
+#: en/git-rebase.txt:1038
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39106,7 +39419,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1022
+#: en/git-rebase.txt:1045
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39118,7 +39431,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1049
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39127,37 +39440,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1035
+#: en/git-rebase.txt:1058
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1037
+#: en/git-rebase.txt:1060
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1039
+#: en/git-rebase.txt:1062
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1043
+#: en/git-rebase.txt:1066
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1068
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1072
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -39465,117 +39778,118 @@ msgstr ""
msgid "Using this hook, it is easy to generate mails describing the updates to the repository. This example script sends one mail message per ref listing the commits pushed to the repository, and logs the push certificates of signed pushes with good signatures to a logger service:"
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:191
+#. type: delimited block -
+#: en/git-receive-pack.txt:192
#, no-wrap, priority:100
msgid ""
-"\t#!/bin/sh\n"
-"\t# mail out commit update information.\n"
-"\twhile read oval nval ref\n"
-"\tdo\n"
-"\t\tif expr \"$oval\" : '0*$' >/dev/null\n"
-"\t\tthen\n"
-"\t\t\techo \"Created a new ref, with the following commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\"\n"
-"\t\telse\n"
-"\t\t\techo \"New commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
-"\t\tfi |\n"
-"\t\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
-"\tdone\n"
-"\t# log signed push certificate, if any\n"
-"\tif test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"#!/bin/sh\n"
+"# mail out commit update information.\n"
+"while read oval nval ref\n"
+"do\n"
+"\tif expr \"$oval\" : '0*$' >/dev/null\n"
"\tthen\n"
-"\t\t(\n"
-"\t\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
-"\t\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
-"\t\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
-"\tfi\n"
-"\texit 0\n"
+"\t\techo \"Created a new ref, with the following commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\"\n"
+"\telse\n"
+"\t\techo \"New commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
+"\tfi |\n"
+"\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
+"done\n"
+"# log signed push certificate, if any\n"
+"if test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"then\n"
+"\t(\n"
+"\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
+"\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
+"\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
+"fi\n"
+"exit 0\n"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:194
+#: en/git-receive-pack.txt:196
#, priority:100
msgid "The exit code from this hook invocation is ignored, however a non-zero exit code will generate an error message."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:200
+#: en/git-receive-pack.txt:202
#, priority:100
msgid "Note that it is possible for refname to not have sha1-new when this hook runs. This can easily occur if another user modifies the ref after it was updated by 'git-receive-pack', but before the hook was able to evaluate it. It is recommended that hooks rely on sha1-new rather than the current value of refname."
msgstr ""
#. type: Title -
-#: en/git-receive-pack.txt:202
+#: en/git-receive-pack.txt:204
#, no-wrap, priority:100
msgid "POST-UPDATE HOOK"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:207
+#: en/git-receive-pack.txt:209
#, priority:100
msgid "After all other processing, if at least one ref was updated, and if $GIT_DIR/hooks/post-update file exists and is executable, then post-update will be called with the list of refs that have been updated. This can be used to implement any repository wide cleanup tasks."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:211
+#: en/git-receive-pack.txt:213
#, priority:100
msgid "The exit code from this hook invocation is ignored; the only thing left for 'git-receive-pack' to do at that point is to exit itself anyway."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:214
+#: en/git-receive-pack.txt:216
#, priority:100
msgid "This hook can be used, for example, to run `git update-server-info` if the repository is packed and is served via a dumb transport."
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:217
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/git-receive-pack.txt:220
+#, fuzzy, no-wrap, priority:100
+#| msgid "git-update-server-info(1)"
msgid ""
-"\t#!/bin/sh\n"
-"\texec git update-server-info\n"
-msgstr ""
+"#!/bin/sh\n"
+"exec git update-server-info\n"
+msgstr "git-update-server-info(1)"
#. type: Title -
-#: en/git-receive-pack.txt:220
+#: en/git-receive-pack.txt:224
#, no-wrap, priority:100
msgid "QUARANTINE ENVIRONMENT"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:227
+#: en/git-receive-pack.txt:231
#, priority:100
msgid "When `receive-pack` takes in objects, they are placed into a temporary \"quarantine\" directory within the `$GIT_DIR/objects` directory and migrated into the main object store only after the `pre-receive` hook has completed. If the push fails before then, the temporary directory is removed entirely."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:229
+#: en/git-receive-pack.txt:233
#, priority:100
msgid "This has a few user-visible effects and caveats:"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:235
+#: en/git-receive-pack.txt:239
#, priority:100
msgid "Pushes which fail due to problems with the incoming pack, missing objects, or due to the `pre-receive` hook will not leave any on-disk data. This is usually helpful to prevent repeated failed pushes from filling up your disk, but can make debugging more challenging."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:238
+#: en/git-receive-pack.txt:242
#, priority:100
msgid "Any objects created by the `pre-receive` hook will be created in the quarantine directory (and migrated only if it succeeds)."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:244
+#: en/git-receive-pack.txt:248
#, priority:100
msgid "The `pre-receive` hook MUST NOT update any refs to point to quarantined objects. Other programs accessing the repository will not be able to see the objects (and if the pre-receive hook fails, those refs would become corrupted). For safety, any ref updates from within `pre-receive` are automatically rejected."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:249
+#: en/git-receive-pack.txt:253
#, ignore-same, priority:100
msgid "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
msgstr "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
@@ -40903,7 +41217,7 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:131
#, priority:100
-msgid "linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and linkgit:git-rebase[1], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
+msgid "linkgit:git-hash-object[1], linkgit:git-rebase[1], and https://github.com/newren/git-filter-repo[git-filter-repo], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
msgstr ""
#. type: Plain text
@@ -40926,9 +41240,10 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:158
-#, priority:100
-msgid "linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1]"
-msgstr ""
+#, fuzzy, priority:100
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] https://github.com/newren/git-filter-repo[git-filter-repo]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title =
#: en/git-request-pull.txt:2
@@ -41720,7 +42035,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:228 en/git-stash.txt:229
+#: en/git-reset.txt:228 en/git-stash.txt:230
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -42447,102 +42762,49 @@ msgid "git-rev-list - Lists commit objects in reverse chronological order"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:65
+#: en/git-rev-list.txt:13
#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"'git rev-list' [ --max-count=<number> ]\n"
-"\t [ --skip=<number> ]\n"
-"\t [ --max-age=<timestamp> ]\n"
-"\t [ --min-age=<timestamp> ]\n"
-"\t [ --sparse ]\n"
-"\t [ --merges ]\n"
-"\t [ --no-merges ]\n"
-"\t [ --min-parents=<number> ]\n"
-"\t [ --no-min-parents ]\n"
-"\t [ --max-parents=<number> ]\n"
-"\t [ --no-max-parents ]\n"
-"\t [ --first-parent ]\n"
-"\t [ --remove-empty ]\n"
-"\t [ --full-history ]\n"
-"\t [ --not ]\n"
-"\t [ --all ]\n"
-"\t [ --branches[=<pattern>] ]\n"
-"\t [ --tags[=<pattern>] ]\n"
-"\t [ --remotes[=<pattern>] ]\n"
-"\t [ --glob=<glob-pattern> ]\n"
-"\t [ --ignore-missing ]\n"
-"\t [ --stdin ]\n"
-"\t [ --quiet ]\n"
-"\t [ --topo-order ]\n"
-"\t [ --parents ]\n"
-"\t [ --timestamp ]\n"
-"\t [ --left-right ]\n"
-"\t [ --left-only ]\n"
-"\t [ --right-only ]\n"
-"\t [ --cherry-mark ]\n"
-"\t [ --cherry-pick ]\n"
-"\t [ --encoding=<encoding> ]\n"
-"\t [ --(author|committer|grep)=<pattern> ]\n"
-"\t [ --regexp-ignore-case | -i ]\n"
-"\t [ --extended-regexp | -E ]\n"
-"\t [ --fixed-strings | -F ]\n"
-"\t [ --date=<format>]\n"
-"\t [ [ --objects | --objects-edge | --objects-edge-aggressive ]\n"
-"\t [ --unpacked ]\n"
-"\t [ --object-names | --no-object-names ]\n"
-"\t [ --filter=<filter-spec> [ --filter-print-omitted ] ] ]\n"
-"\t [ --missing=<missing-action> ]\n"
-"\t [ --pretty | --header ]\n"
-"\t [ --bisect ]\n"
-"\t [ --bisect-vars ]\n"
-"\t [ --bisect-all ]\n"
-"\t [ --merge ]\n"
-"\t [ --reverse ]\n"
-"\t [ --walk-reflogs ]\n"
-"\t [ --no-walk ] [ --do-walk ]\n"
-"\t [ --count ]\n"
-"\t [ --use-bitmap-index ]\n"
-"\t <commit>... [ \\-- <paths>... ]\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:73
+msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rev-list.txt:21
#, priority:100
msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:80
+#: en/git-rev-list.txt:28
#, priority:100
msgid "You can think of this as a set operation. Commits given on the command line form a set of commits that are reachable from any of them, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:82
+#: en/git-rev-list.txt:30
#, priority:100
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:85
+#: en/git-rev-list.txt:33
#, no-wrap, priority:100
msgid "\t$ git rev-list foo bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:89
+#: en/git-rev-list.txt:37
#, priority:100
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:93
+#: en/git-rev-list.txt:41
#, priority:100
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:97
+#: en/git-rev-list.txt:45
#, no-wrap, priority:100
msgid ""
"\t$ git rev-list origin..HEAD\n"
@@ -42550,13 +42812,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:102
+#: en/git-rev-list.txt:50
#, ignore-ellipsis, priority:100
msgid "Another special notation is \"'<commit1>'...'<commit2>'\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:106
+#: en/git-rev-list.txt:54
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git rev-list A B --not $(git merge-base --all A B)\n"
@@ -42564,7 +42826,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:113
+#: en/git-rev-list.txt:61
#, priority:100
msgid "'rev-list' is a very essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For this reason, it has a lot of different options that enables it to be used by commands as different as 'git bisect' and 'git repack'."
msgstr ""
@@ -44686,31 +44948,31 @@ msgstr ""
msgid "To use 'git send-email' to send your patches through the GMail SMTP server, edit ~/.gitconfig to specify your account settings:"
msgstr ""
-#. type: Plain text
-#: en/git-send-email.txt:494
+#. type: delimited block -
+#: en/git-send-email.txt:495
#, no-wrap, priority:100
msgid ""
-"\t[sendemail]\n"
-"\t\tsmtpEncryption = tls\n"
-"\t\tsmtpServer = smtp.gmail.com\n"
-"\t\tsmtpUser = yourname@gmail.com\n"
-"\t\tsmtpServerPort = 587\n"
+"[sendemail]\n"
+"\tsmtpEncryption = tls\n"
+"\tsmtpServer = smtp.gmail.com\n"
+"\tsmtpUser = yourname@gmail.com\n"
+"\tsmtpServerPort = 587\n"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:498
+#: en/git-send-email.txt:500
#, priority:100
msgid "If you have multifactor authentication setup on your gmail account, you will need to generate an app-specific password for use with 'git send-email'. Visit https://security.google.com/settings/security/apppasswords to create it."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:501
+#: en/git-send-email.txt:503
#, priority:100
msgid "Once your commits are ready to be sent to the mailing list, run the following commands:"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:505
+#: en/git-send-email.txt:507
#, no-wrap, priority:100
msgid ""
"\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -44719,19 +44981,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:510
+#: en/git-send-email.txt:512
#, priority:100
msgid "The first time you run it, you will be prompted for your credentials. Enter the app-specific or your regular password as appropriate. If you have credential helper configured (see linkgit:git-credential[1]), the password will be saved in the credential store so you won't have to type it the next time."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:518
#, priority:100
msgid "Note: the following core Perl modules that may be installed with your distribution of Perl are required: MIME::Base64, MIME::QuotedPrint, Net::Domain and Net::SMTP. These additional Perl modules are also required: Authen::SASL and Mail::Address."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:521
+#: en/git-send-email.txt:523
#, priority:100
msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
msgstr ""
@@ -46320,25 +46582,25 @@ msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--a
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:92
+#: en/git-stash.txt:93
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs, and any non-option arguments form the message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:93
+#: en/git-stash.txt:94
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:100
+#: en/git-stash.txt:101
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:104
+#: en/git-stash.txt:105
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46346,139 +46608,139 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:108
+#: en/git-stash.txt:109
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:109
+#: en/git-stash.txt:110
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:119
+#: en/git-stash.txt:120
#, priority:240
msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:120
+#: en/git-stash.txt:121
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:126
+#: en/git-stash.txt:127
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:130
+#: en/git-stash.txt:131
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:135
+#: en/git-stash.txt:136
#, priority:240
msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:138
+#: en/git-stash.txt:139
#, priority:240
msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:139
+#: en/git-stash.txt:140
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:145
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:145
+#: en/git-stash.txt:146
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:153
+#: en/git-stash.txt:154
#, priority:240
msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:159
+#: en/git-stash.txt:160
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:160
+#: en/git-stash.txt:161
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:164
+#: en/git-stash.txt:165
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:165
+#: en/git-stash.txt:166
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:171
+#: en/git-stash.txt:172
#, priority:240
msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:172 en/git-update-ref.txt:100
+#: en/git-stash.txt:173 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:179
+#: en/git-stash.txt:180
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:180
+#: en/git-stash.txt:181
#, no-wrap, priority:240
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:186
+#: en/git-stash.txt:187
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:195
+#: en/git-stash.txt:196
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:199
+#: en/git-stash.txt:200
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46487,31 +46749,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:203
+#: en/git-stash.txt:204
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:208
+#: en/git-stash.txt:209
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:214
+#: en/git-stash.txt:215
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:219
+#: en/git-stash.txt:220
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:227
+#: en/git-stash.txt:228
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -46523,13 +46785,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:235
+#: en/git-stash.txt:236
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:246
+#: en/git-stash.txt:247
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46544,13 +46806,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:249
+#: en/git-stash.txt:250
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:257
+#: en/git-stash.txt:258
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46562,19 +46824,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:259
+#: en/git-stash.txt:260
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:264
+#: en/git-stash.txt:265
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:275
+#: en/git-stash.txt:276
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46589,19 +46851,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:277
+#: en/git-stash.txt:278
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:283
+#: en/git-stash.txt:284
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:288
+#: en/git-stash.txt:289
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -46610,7 +46872,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:298
+#: en/git-stash.txt:299
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -46688,61 +46950,61 @@ msgid "In addition to the names of files that have been changed, also show the t
msgstr ""
#. type: Plain text
-#: en/git-status.txt:65
+#: en/git-status.txt:66
#, priority:280
msgid "The mode parameter is used to specify the handling of untracked files. It is optional: it defaults to 'all', and if specified, it must be stuck to the option (e.g. `-uno`, but not `-u no`)."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:69
+#: en/git-status.txt:70
#, no-wrap, priority:280
msgid "'no' - Show no untracked files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:70
+#: en/git-status.txt:71
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:81
+#: en/git-status.txt:82
#, priority:280
msgid "When `-u` option is not used, untracked files and directories are shown (i.e. the same as specifying `normal`), to help you avoid forgetting to add newly created files. Because it takes extra work to find untracked files in the filesystem, this mode may take some time in a large working tree. Consider enabling untracked cache and split index if supported (see `git update-index --untracked-cache` and `git update-index --split-index`), Otherwise you can use `no` to have `git status` return more quickly without showing untracked files."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:99
+#: en/git-status.txt:101
#, priority:280
msgid "Ignore changes to submodules when looking for changes. <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 before 1.7.0). Using \"all\" hides all changes to submodules (and suppresses the output of submodule summaries when the config option `status.submoduleSummary` is set)."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:100
+#: en/git-status.txt:102
#, no-wrap, priority:280
msgid "--ignored[=<mode>]"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:102
+#: en/git-status.txt:104
#, priority:280
msgid "Show ignored files as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:105
+#: en/git-status.txt:108
#, priority:280
msgid "The mode parameter is used to specify the handling of ignored files. It is optional: it defaults to 'traditional'."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:109
+#: en/git-status.txt:112
#, priority:280
msgid "'traditional' - Shows ignored files and directories, unless"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:112
+#: en/git-status.txt:115
#, no-wrap, priority:280
msgid ""
"--untracked-files=all is specified, in which case\n"
@@ -46751,109 +47013,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:113
+#: en/git-status.txt:116
#, no-wrap, priority:280
msgid "'no'\t - Show no ignored files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:114
+#: en/git-status.txt:117
#, no-wrap, priority:280
msgid "'matching' - Shows ignored files and directories matching an\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:115
+#: en/git-status.txt:118
#, no-wrap, priority:280
msgid "ignore pattern.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:121
+#: en/git-status.txt:124
#, priority:280
msgid "When 'matching' mode is specified, paths that explicitly match an ignored pattern are shown. If a directory matches an ignore pattern, then it is shown, but not paths contained in the ignored directory. If a directory does not match an ignore pattern, but all contents are ignored, then the directory is not shown, but all contents are shown."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:125
+#: en/git-status.txt:129
#, priority:280
msgid "Terminate entries with NUL, instead of LF. This implies the `--porcelain=v1` output format if no other format is given."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:132
+#: en/git-status.txt:136
#, priority:280
msgid "Display untracked files in columns. See configuration variable column.status for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:133
+#: en/git-status.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--ahead-behind"
msgstr "--ahead-behind"
#. type: Labeled list
-#: en/git-status.txt:134
+#: en/git-status.txt:138
#, ignore-same, no-wrap, priority:280
msgid "--no-ahead-behind"
msgstr "--no-ahead-behind"
#. type: Plain text
-#: en/git-status.txt:137
+#: en/git-status.txt:141
#, priority:280
msgid "Display or do not display detailed ahead/behind counts for the branch relative to its upstream branch. Defaults to true."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:138
+#: en/git-status.txt:142
#, ignore-same, no-wrap, priority:280
msgid "--renames"
msgstr "--renames"
#. type: Plain text
-#: en/git-status.txt:142
+#: en/git-status.txt:146
#, priority:280
msgid "Turn on/off rename detection regardless of user configuration. See also linkgit:git-diff[1] `--no-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:147
+#: en/git-status.txt:151
#, priority:280
msgid "Turn on rename detection, optionally setting the similarity threshold. See also linkgit:git-diff[1] `--find-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:150
+#: en/git-status.txt:154
#, priority:280
msgid "See the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:158
+#: en/git-status.txt:162
#, priority:280
msgid "The output from this command is designed to be used as a commit template comment. The default, long format, is designed to be human readable, verbose and descriptive. Its contents and format are subject to change at any time."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:163
+#: en/git-status.txt:167
#, priority:280
msgid "The paths mentioned in the output, unlike many other Git commands, are made relative to the current directory if you are working in a subdirectory (this is on purpose, to help cutting and pasting). See the status.relativePaths config option below."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:165
+#: en/git-status.txt:169
#, no-wrap, priority:280
msgid "Short Format"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:169
+#: en/git-status.txt:173
#, priority:280
msgid "In the short-format, the status of each path is shown as one of these forms"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:172
+#: en/git-status.txt:176
#, no-wrap, priority:280
msgid ""
"\tXY PATH\n"
@@ -46861,73 +47123,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:176
+#: en/git-status.txt:180
#, priority:280
msgid "where `ORIG_PATH` is where the renamed/copied contents came from. `ORIG_PATH` is only shown when the entry is renamed or copied. The `XY` is a two-letter status code."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:182
+#: en/git-status.txt:186
#, priority:280
msgid "The fields (including the `->`) are separated from each other by a single space. If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash-escaped."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:188
+#: en/git-status.txt:192
#, priority:280
msgid "For paths with merge conflicts, `X` and `Y` show the modification states of each side of the merge. For paths that do not have merge conflicts, `X` shows the status of the index, and `Y` shows the status of the work tree. For untracked paths, `XY` are `??`. Other status codes can be interpreted as follows:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:190
+#: en/git-status.txt:194
#, priority:280
msgid "' ' = unmodified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:191
+#: en/git-status.txt:195
#, priority:280
msgid "'M' = modified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:192
+#: en/git-status.txt:196
#, priority:280
msgid "'A' = added"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:193
+#: en/git-status.txt:197
#, priority:280
msgid "'D' = deleted"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:194
+#: en/git-status.txt:198
#, priority:280
msgid "'R' = renamed"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:195
+#: en/git-status.txt:199
#, priority:280
msgid "'C' = copied"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:196
+#: en/git-status.txt:200
#, priority:280
msgid "'U' = updated but unmerged"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:199
+#: en/git-status.txt:203
#, priority:280
msgid "Ignored files are not listed, unless `--ignored` option is in effect, in which case `XY` are `!!`."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:226
+#: en/git-status.txt:230
#, no-wrap, priority:280
msgid ""
"X Y Meaning\n"
@@ -46958,7 +47220,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:235
+#: en/git-status.txt:239
#, no-wrap, priority:280
msgid ""
"Submodules have more state and instead report\n"
@@ -46971,91 +47233,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:238
+#: en/git-status.txt:242
#, priority:280
msgid "'m' and '?' are applied recursively. For example if a nested submodule in a submodule contains an untracked file, this is reported as '?' as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:240
+#: en/git-status.txt:244
#, priority:280
msgid "If -b is used the short-format status is preceded by a line"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:242
+#: en/git-status.txt:246
#, no-wrap, priority:280
msgid " ## branchname tracking info\n"
msgstr ""
#. type: Title ~
-#: en/git-status.txt:244
+#: en/git-status.txt:248
#, no-wrap, priority:280
msgid "Porcelain Format Version 1"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:251
+#: en/git-status.txt:255
#, priority:280
msgid "Version 1 porcelain format is similar to the short format, but is guaranteed not to change in a backwards-incompatible way between Git versions or based on user configuration. This makes it ideal for parsing by scripts. The description of the short format above also describes the porcelain format, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:254
+#: en/git-status.txt:258
#, priority:280
msgid "The user's color.status configuration is not respected; color will always be off."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:257
+#: en/git-status.txt:261
#, priority:280
msgid "The user's status.relativePaths configuration is not respected; paths shown will always be relative to the repository root."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:267
+#: en/git-status.txt:271
#, priority:280
msgid "There is also an alternate -z format recommended for machine parsing. In that format, the status field is the same, but some other things change. First, the '\\->' is omitted from rename entries and the field order is reversed (e.g 'from \\-> to' becomes 'to from'). Second, a NUL (ASCII 0) follows each filename, replacing space as a field separator and the terminating newline (but a space still separates the status field from the first filename). Third, filenames containing special characters are not specially formatted; no quoting or backslash-escaping is performed."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:269
+#: en/git-status.txt:273
#, priority:280
msgid "Any submodule changes are reported as modified `M` instead of `m` or single `?`."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:271
+#: en/git-status.txt:275
#, no-wrap, priority:280
msgid "Porcelain Format Version 2"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:276
+#: en/git-status.txt:280
#, priority:280
msgid "Version 2 format adds more detailed information about the state of the worktree and changed items. Version 2 also defines an extensible set of easy to parse optional headers."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:280
+#: en/git-status.txt:284
#, priority:280
msgid "Header lines start with \"#\" and are added in response to specific command line arguments. Parsers should ignore headers they don't recognize."
msgstr ""
#. type: Title ^
-#: en/git-status.txt:282
+#: en/git-status.txt:286
#, no-wrap, priority:280
msgid "Branch Headers"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:286
+#: en/git-status.txt:290
#, priority:280
msgid "If `--branch` is given, a series of header lines are printed with information about the current branch."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:296
+#: en/git-status.txt:300
#, no-wrap, priority:280
msgid ""
"Line Notes\n"
@@ -47069,43 +47331,43 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:299
+#: en/git-status.txt:303
#, no-wrap, priority:280
msgid "Changed Tracked Entries"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:306
+#: en/git-status.txt:310
#, priority:280
msgid "Following the headers, a series of lines are printed for tracked entries. One of three different line formats may be used to describe an entry depending on the type of change. Tracked entries are printed in an undefined order; parsers should allow for a mixture of the 3 line types in any order."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:308
+#: en/git-status.txt:312
#, priority:280
msgid "Ordinary changed entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:310
+#: en/git-status.txt:314
#, no-wrap, priority:280
msgid " 1 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:312
+#: en/git-status.txt:316
#, priority:280
msgid "Renamed or copied entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:314
+#: en/git-status.txt:318
#, no-wrap, priority:280
msgid " 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:345
+#: en/git-status.txt:349
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47140,19 +47402,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:349
+#: en/git-status.txt:353
#, priority:280
msgid "Unmerged entries have the following format; the first character is a \"u\" to distinguish from ordinary changed entries."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:351
+#: en/git-status.txt:355
#, no-wrap, priority:280
msgid " u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:368
+#: en/git-status.txt:372
#, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47173,85 +47435,85 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:371
+#: en/git-status.txt:375
#, no-wrap, priority:280
msgid "Other Items"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:376
+#: en/git-status.txt:380
#, priority:280
msgid "Following the tracked entries (and if requested), a series of lines will be printed for untracked and then ignored items found in the worktree."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:378
+#: en/git-status.txt:382
#, priority:280
msgid "Untracked items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:380
+#: en/git-status.txt:384
#, no-wrap, priority:280
msgid " ? <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:382
+#: en/git-status.txt:386
#, priority:280
msgid "Ignored items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:384
+#: en/git-status.txt:388
#, no-wrap, priority:280
msgid " ! <path>\n"
msgstr ""
#. type: Title ^
-#: en/git-status.txt:386
+#: en/git-status.txt:390
#, no-wrap, priority:280
msgid "Pathname Format Notes and -z"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:391
+#: en/git-status.txt:395
#, priority:280
msgid "When the `-z` option is given, pathnames are printed as is and without any quoting and lines are terminated with a NUL (ASCII 0x00) byte."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:395
+#: en/git-status.txt:399
#, 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])."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:404
+#: en/git-status.txt:408
#, priority:280
msgid "The command honors `color.status` (or `status.color` -- they mean the same thing and the latter is kept for backward compatibility) and `color.status.<slot>` configuration variables to colorize its output."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:408
+#: en/git-status.txt:412
#, priority:280
msgid "If the config variable `status.relativePaths` is set to false, then all paths shown are relative to the repository root, not to the current directory."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:419
+#: en/git-status.txt:423
#, priority:280
msgid "If `status.submoduleSummary` is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). Please note that the summary output from the status command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings."
msgstr ""
#. type: Title -
-#: en/git-status.txt:421
+#: en/git-status.txt:425
#, no-wrap, priority:280
msgid "BACKGROUND REFRESH"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:432
+#: en/git-status.txt:436
#, priority:280
msgid "By default, `git status` will automatically refresh the index, updating the cached stat information from the working tree and writing out the result. Writing out the updated index is an optimization that isn't strictly necessary (`status` computes the values for itself, but writing them out is just to save subsequent programs from repeating our computation). When `status` is run in the background, the lock held during the write may conflict with other simultaneous processes, causing them to fail. Scripts running `status` in the background should consider using `git --no-optional-locks status` (see linkgit:git[1] for details)."
msgstr ""
@@ -47695,281 +47957,287 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:176
#, no-wrap, priority:220
-msgid "set-branch ((-d|--default)|(-b|--branch <branch>)) [--] <path>"
+msgid "set-branch (-b|--branch) <branch> [--] <path>"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-submodule.txt:177
+#, no-wrap, priority:220
+msgid "set-branch (-d|--default) [--] <path>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:181
+#: en/git-submodule.txt:182
#, priority:220
msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:182
+#: en/git-submodule.txt:183
#, ignore-ellipsis, no-wrap, priority:220
msgid "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:191
+#: en/git-submodule.txt:192
#, priority:220
msgid "Show commit summary between the given commit (defaults to HEAD) and working tree/index. For a submodule in question, a series of commits in the submodule between the given super project commit and the index or working tree (switched by `--cached`) are shown. If the option `--files` is given, show the series of commits in the submodule between the index of the super project and the working tree of the submodule (this option doesn't allow to use the `--cached` option or to provide an explicit commit)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:194
+#: en/git-submodule.txt:195
#, priority:220
msgid "Using the `--submodule=log` option with linkgit:git-diff[1] will provide that information too."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:195
+#: en/git-submodule.txt:196
#, no-wrap, priority:220
msgid "foreach [--recursive] <command>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:216
+#: en/git-submodule.txt:217
#, priority:220
msgid "Evaluates an arbitrary shell command in each checked out submodule. The command has access to the variables $name, $sm_path, $displaypath, $sha1 and $toplevel: $name is the name of the relevant submodule section in `.gitmodules`, $sm_path is the path of the submodule as recorded in the immediate superproject, $displaypath contains the relative path from the current working directory to the submodules root directory, $sha1 is the commit as recorded in the immediate superproject, and $toplevel is the absolute path to the top-level of the immediate superproject. Note that to avoid conflicts with '$PATH' on Windows, the '$path' variable is now a deprecated synonym of '$sm_path' variable. Any submodules defined in the superproject but not checked out are ignored by this command. Unless given `--quiet`, foreach prints the name of each submodule before evaluating the command. If `--recursive` is given, submodules are traversed recursively (i.e. the given shell command is evaluated in nested submodules as well). A non-zero return from the command in any submodule causes the processing to terminate. This can be overridden by adding '|| :' to the end of the command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:219
+#: en/git-submodule.txt:220
#, priority:220
msgid "As an example, the command below will show the path and currently checked out commit for each submodule:"
msgstr ""
#. type: delimited block -
-#: en/git-submodule.txt:222
+#: en/git-submodule.txt:223
#, no-wrap, priority:220
msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:224
+#: en/git-submodule.txt:225
#, ignore-ellipsis, no-wrap, priority:220
msgid "sync [--recursive] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:231
+#: en/git-submodule.txt:232
#, priority:220
msgid "Synchronizes submodules' remote URL configuration setting to the value specified in `.gitmodules`. It will only affect those submodules which already have a URL entry in .git/config (that is the case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:234
+#: en/git-submodule.txt:235
#, priority:220
msgid "`git submodule sync` synchronizes all submodules while `git submodule sync -- A` synchronizes submodule \"A\" only."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:237
+#: en/git-submodule.txt:238
#, priority:220
msgid "If `--recursive` is specified, this command will recurse into the registered submodules, and sync any nested submodules within."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:238
+#: en/git-submodule.txt:239
#, no-wrap, priority:220
msgid "absorbgitdirs"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:245
+#: en/git-submodule.txt:246
#, priority:220
msgid "If a git directory of a submodule is inside the submodule, move the git directory of the submodule into its superprojects `$GIT_DIR/modules` path and then connect the git directory and its working directory by setting the `core.worktree` and adding a .git file pointing to the git directory embedded in the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:249
+#: en/git-submodule.txt:250
#, priority:220
msgid "A repository that was cloned independently and later added as a submodule or old setups have the submodules git directory inside the submodule instead of embedded into the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:251
+#: en/git-submodule.txt:252
#, priority:220
msgid "This command is recursive by default."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:257
+#: en/git-submodule.txt:258
#, priority:220
msgid "Only print error messages."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:264
+#: en/git-submodule.txt:265
#, priority:220
msgid "This option is only valid for add and update commands. Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:268
+#: en/git-submodule.txt:269
#, priority:220
msgid "This option is only valid for the deinit command. Unregister all submodules in the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:269
+#: en/git-submodule.txt:270
#, no-wrap, priority:220
msgid "-b <branch>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:277
+#: en/git-submodule.txt:278
#, priority:220
msgid "Branch of repository to add as submodule. The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository. If the option is not specified, it defaults to 'master'."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:290
+#: en/git-submodule.txt:291
#, priority:220
msgid "This option is only valid for add, deinit and update commands. When running add, allow adding an otherwise ignored submodule path. When running deinit the submodule working trees will be removed even if they contain local changes. When running update (only effective with the checkout procedure), throw away local changes in submodules when switching to a different commit; and always run a checkout operation in the submodule, even if the commit listed in the index of the containing repository matches the commit checked out in the submodule."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:295
+#: en/git-submodule.txt:296
#, priority:220
msgid "This option is only valid for status and summary commands. These commands typically use the commit found in the submodule HEAD, but with this option, the commit stored in the index is used instead."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:296
+#: en/git-submodule.txt:297
#, ignore-same, no-wrap, priority:220
msgid "--files"
msgstr "--files"
#. type: Plain text
-#: en/git-submodule.txt:300
+#: en/git-submodule.txt:301
#, priority:220
msgid "This option is only valid for the summary command. This command compares the commit in the index with that in the submodule HEAD when this option is used."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:302
+#: en/git-submodule.txt:303
#, ignore-same, no-wrap, priority:220
msgid "--summary-limit"
msgstr "--summary-limit"
#. type: Plain text
-#: en/git-submodule.txt:308
+#: en/git-submodule.txt:309
#, priority:220
msgid "This option is only valid for the summary command. Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:309
+#: en/git-submodule.txt:310
#, ignore-same, no-wrap, priority:220
msgid "--remote"
msgstr "--remote"
#. type: Plain text
-#: en/git-submodule.txt:318
+#: en/git-submodule.txt:319
#, priority:220
msgid "This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:324
+#: en/git-submodule.txt:325
#, priority:220
msgid "This works for any of the supported update procedures (`--checkout`, `--rebase`, etc.). The only change is the source of the target SHA-1. For example, `submodule update --remote --merge` will merge upstream submodule changes into the submodules, while `submodule update --merge` will merge superproject gitlink changes into the submodules."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:329
+#: en/git-submodule.txt:330
#, priority:220
msgid "In order to ensure a current tracking branch state, `update --remote` fetches the submodule's remote repository before calculating the SHA-1. If you don't want to fetch, you should use `submodule update --remote --no-fetch`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:339
+#: en/git-submodule.txt:340
#, priority:220
msgid "Use this option to integrate changes from the upstream subproject with your submodule's current HEAD. Alternatively, you can run `git pull` from the submodule, which is equivalent except for the remote branch name: `update --remote` uses the default upstream repository and `submodule.<name>.branch`, while `git pull` uses the submodule's `branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want to distribute the default upstream branch with the superproject and `branch.<name>.merge` if you want a more native feel while working in the submodule itself."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:341
+#: en/git-submodule.txt:342
#, ignore-same, no-wrap, priority:220
msgid "--no-fetch"
msgstr "--no-fetch"
#. type: Plain text
-#: en/git-submodule.txt:344
+#: en/git-submodule.txt:345
#, priority:220
msgid "This option is only valid for the update command. Don't fetch new objects from the remote site."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:345
+#: en/git-submodule.txt:346
#, ignore-same, no-wrap, priority:220
msgid "--checkout"
msgstr "--checkout"
#. type: Plain text
-#: en/git-submodule.txt:353
+#: en/git-submodule.txt:354
#, priority:220
msgid "This option is only valid for the update command. Checkout the commit recorded in the superproject on a detached HEAD in the submodule. This is the default behavior, the main use of this option is to override `submodule.$name.update` when set to a value other than `checkout`. If the key `submodule.$name.update` is either not explicitly set or set to `checkout`, this option is implicit."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:363
+#: en/git-submodule.txt:364
#, priority:220
msgid "This option is only valid for the update command. Merge the commit recorded in the superproject into the current branch of the submodule. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve the resulting conflicts within the submodule with the usual conflict resolution tools. If the key `submodule.$name.update` is set to `merge`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:364
+#: en/git-submodule.txt:365
#, ignore-same, no-wrap, priority:220
msgid "--rebase"
msgstr "--rebase"
#. type: Plain text
-#: en/git-submodule.txt:372
+#: en/git-submodule.txt:373
#, priority:220
msgid "This option is only valid for the update command. Rebase the current branch onto the commit recorded in the superproject. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve these failures with linkgit:git-rebase[1]. If the key `submodule.$name.update` is set to `rebase`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:373
+#: en/git-submodule.txt:374
#, ignore-same, no-wrap, priority:220
msgid "--init"
msgstr "--init"
#. type: Plain text
-#: en/git-submodule.txt:377
+#: en/git-submodule.txt:378
#, priority:220
msgid "This option is only valid for the update command. Initialize all submodules for which \"git submodule init\" has not been called so far before updating."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:378
+#: en/git-submodule.txt:379
#, ignore-same, no-wrap, priority:220
msgid "--name"
msgstr "--name"
#. type: Plain text
-#: en/git-submodule.txt:382
+#: en/git-submodule.txt:383
#, priority:220
msgid "This option is only valid for the add command. It sets the submodule's name to the given string instead of defaulting to its path. The name must be valid as a directory name and may not end with a '/'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:383
+#: en/git-submodule.txt:384
#, no-wrap, priority:220
msgid "--reference <repository>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:387 en/git-submodule.txt:396
+#: en/git-submodule.txt:388 en/git-submodule.txt:397
#, priority:220
msgid "This option is only valid for add and update commands. These commands sometimes need to clone a remote repository. In this case, this option will be passed to the linkgit:git-clone[1] command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:391
+#: en/git-submodule.txt:392
#, no-wrap, priority:220
msgid ""
"*NOTE*: Do *not* use this option unless you have read the note\n"
@@ -47978,61 +48246,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:398
+#: en/git-submodule.txt:399
#, no-wrap, priority:220
msgid "*NOTE*: see the NOTE for the `--reference` option.\n"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:404
+#: en/git-submodule.txt:405
#, priority:220
msgid "This option is only valid for foreach, update, status and sync commands. Traverse submodules recursively. The operation is performed not only in the submodules of the current repo, but also in any nested submodules inside those submodules (and so on)."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:405
+#: en/git-submodule.txt:406
#, ignore-same, no-wrap, priority:220
msgid "--depth"
msgstr "--depth"
#. type: Plain text
-#: en/git-submodule.txt:409
+#: en/git-submodule.txt:410
#, priority:220
msgid "This option is valid for add and update commands. Create a 'shallow' clone with a history truncated to the specified number of revisions. See linkgit:git-clone[1]"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:410
+#: en/git-submodule.txt:411
#, ignore-same, no-wrap, priority:220
msgid "--[no-]recommend-shallow"
msgstr "--[no-]recommend-shallow"
#. type: Plain text
-#: en/git-submodule.txt:415
+#: en/git-submodule.txt:416
#, priority:220
msgid "This option is only valid for the update command. The initial clone of a submodule will use the recommended `submodule.<name>.shallow` as provided by the `.gitmodules` file by default. To ignore the suggestions use `--no-recommend-shallow`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:421
+#: en/git-submodule.txt:422
#, priority:220
msgid "This option is only valid for the update command. Clone new submodules in parallel with as many jobs. Defaults to the `submodule.fetchJobs` option."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:426
+#: en/git-submodule.txt:427
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:434
+#: en/git-submodule.txt:435
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:438
+#: en/git-submodule.txt:439
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -48664,7 +48932,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:889
+#: en/git-svn.txt:346 en/rev-list-options.txt:905
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -49477,7 +49745,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:777
#, priority:100
-msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider linkgit:git-filter-branch[1] instead. filter-branch also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
+msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports, and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider https://github.com/newren/git-filter-repo[git-filter-repo] instead. filter-repo also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
msgstr ""
#. type: Labeled list
@@ -51398,16 +51666,6 @@ msgid ""
"#\n"
msgstr ""
-#. type: delimited block -
-#: en/git.txt:310
-#, 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/git.txt:315
#, no-wrap, priority:100
@@ -55448,98 +55706,104 @@ msgstr ""
msgid "This option determines how the merge message will be cleaned up before commiting. See linkgit:git-commit[1] for more details. In addition, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on to the commit machinery in the case of a merge conflict."
msgstr ""
+#. type: Labeled list
+#: en/merge-options.txt:44
+#, ignore-same, no-wrap, priority:240
+msgid "--ff-only"
+msgstr "--ff-only"
+
#. type: Plain text
-#: en/merge-options.txt:46
+#: en/merge-options.txt:50
#, priority:240
-msgid "When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. This is the default behavior."
+msgid "Specifies how a merge is handled when the merged-in history is already a descendant of the current history. `--ff` is the default unless merging an annotated (and possibly signed) tag that is not stored in its natural place in the `refs/tags/` hierarchy, in which case `--no-ff` is assumed."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:52
+#: en/merge-options.txt:55
#, priority:240
-msgid "Create a merge commit even when the merge resolves as a fast-forward. This is the default behaviour when merging an annotated (and possibly signed) tag that is not stored in its natural place in 'refs/tags/' hierarchy."
+msgid "With `--ff`, when possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit."
msgstr ""
-#. type: Labeled list
-#: en/merge-options.txt:53
-#, ignore-same, no-wrap, priority:240
-msgid "--ff-only"
-msgstr "--ff-only"
+#. type: Plain text
+#: en/merge-options.txt:58
+#, priority:240
+msgid "With `--no-ff`, create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward."
+msgstr ""
#. type: Plain text
-#: en/merge-options.txt:57
+#: en/merge-options.txt:61
#, priority:240
-msgid "Refuse to merge and exit with a non-zero status unless the current `HEAD` is already up to date or the merge can be resolved as a fast-forward."
+msgid "With `--ff-only`, resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:63
+#: en/merge-options.txt:67
#, priority:240
msgid "GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:69
+#: en/merge-options.txt:73
#, priority:240
msgid "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also linkgit:git-fmt-merge-msg[1]."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:72
+#: en/merge-options.txt:76
#, priority:240
msgid "With --no-log do not list one-line descriptions from the actual commits being merged."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:74
+#: en/merge-options.txt:78
#, ignore-same, no-wrap, priority:240
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
-#: en/merge-options.txt:83
+#: en/merge-options.txt:87
#, priority:240
msgid "With --no-signoff do not add a Signed-off-by line."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:89
+#: en/merge-options.txt:93
#, priority:240
msgid "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:92
+#: en/merge-options.txt:96
#, priority:240
msgid "With -n or --no-stat do not show a diffstat at the end of the merge."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:93
+#: en/merge-options.txt:97
#, ignore-same, no-wrap, priority:240
msgid "--squash"
msgstr "--squash"
#. type: Labeled list
-#: en/merge-options.txt:94
+#: en/merge-options.txt:98
#, ignore-same, no-wrap, priority:240
msgid "--no-squash"
msgstr "--no-squash"
#. type: Plain text
-#: en/merge-options.txt:102
+#: en/merge-options.txt:106
#, priority:240
msgid "Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:105
+#: en/merge-options.txt:109
#, priority:240
msgid "With --no-squash perform the merge and commit the result. This option can be used to override --squash."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:107
+#: en/merge-options.txt:111
#, priority:240
msgid "With --squash, --commit is not allowed, and will fail."
msgstr ""
@@ -55547,71 +55811,77 @@ msgstr ""
#. type: Plain text
#: en/merge-options.txt:115
#, priority:240
+msgid "This option bypasses the pre-merge and commit-msg hooks. See also linkgit:githooks[5]."
+msgstr ""
+
+#. type: Plain text
+#: en/merge-options.txt:123
+#, priority:240
msgid "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise)."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:116
+#: en/merge-options.txt:124
#, no-wrap, priority:240
msgid "-X <option>"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:120
+#: en/merge-options.txt:128
#, priority:240
msgid "Pass merge strategy specific option through to the merge strategy."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:121
+#: en/merge-options.txt:129
#, ignore-same, no-wrap, priority:240
msgid "--verify-signatures"
msgstr "--verify-signatures"
#. type: Labeled list
-#: en/merge-options.txt:122
+#: en/merge-options.txt:130
#, ignore-same, no-wrap, priority:240
msgid "--no-verify-signatures"
msgstr "--no-verify-signatures"
#. type: Plain text
-#: en/merge-options.txt:128
+#: en/merge-options.txt:136
#, priority:240
msgid "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:130
+#: en/merge-options.txt:138
#, ignore-same, no-wrap, priority:240
msgid "--no-summary"
msgstr "--no-summary"
#. type: Plain text
-#: en/merge-options.txt:133
+#: en/merge-options.txt:141
#, priority:240
msgid "Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:138
+#: en/merge-options.txt:146
#, priority:240
msgid "Operate quietly. Implies --no-progress."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:149
+#: en/merge-options.txt:157
#, priority:240
msgid "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:152
+#: en/merge-options.txt:160
#, ignore-same, no-wrap, priority:240
msgid "--allow-unrelated-histories"
msgstr "--allow-unrelated-histories"
#. type: Plain text
-#: en/merge-options.txt:158
+#: en/merge-options.txt:166
#, priority:240
msgid "By default, `git merge` command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added."
msgstr ""
@@ -56934,7 +57204,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:215
#, priority:260
-msgid "minutes ago`}; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -59312,263 +59582,281 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:762
#, priority:260
+msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:771
+#, ignore-ellipsis, priority:260
+msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:775
+#, priority:260
+msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:778
+#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:779
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:766
+#: en/rev-list-options.txt:782
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:773
+#: en/rev-list-options.txt:789
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:781
+#: en/rev-list-options.txt:797
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:800
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:791
+#: en/rev-list-options.txt:807
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:793
+#: en/rev-list-options.txt:809
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:801
+#: en/rev-list-options.txt:817
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:802
+#: en/rev-list-options.txt:818
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:804
+#: en/rev-list-options.txt:820
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:822
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:812
+#: en/rev-list-options.txt:828
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:832
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:818
+#: en/rev-list-options.txt:834
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:819
+#: en/rev-list-options.txt:835
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:826
+#: en/rev-list-options.txt:842
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:847
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:833
+#: en/rev-list-options.txt:849
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:852
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:838
+#: en/rev-list-options.txt:854
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:839
+#: en/rev-list-options.txt:855
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:840
+#: en/rev-list-options.txt:856
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:859
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:846
+#: en/rev-list-options.txt:862
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:864
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:873
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:864
+#: en/rev-list-options.txt:880
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:868
+#: en/rev-list-options.txt:884
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:875
+#: en/rev-list-options.txt:891
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:894
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:880
+#: en/rev-list-options.txt:896
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:882
+#: en/rev-list-options.txt:898
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:884
+#: en/rev-list-options.txt:900
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:887
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:892
+#: en/rev-list-options.txt:908
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:909
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:896
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:898
+#: en/rev-list-options.txt:914
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:902
+#: en/rev-list-options.txt:918
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:907
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:925
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:932
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -59579,19 +59867,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:919
+#: en/rev-list-options.txt:935
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:922
+#: en/rev-list-options.txt:938
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:929
+#: en/rev-list-options.txt:945
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -59603,85 +59891,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:931
+#: en/rev-list-options.txt:947
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:937
+#: en/rev-list-options.txt:953
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:939
+#: en/rev-list-options.txt:955
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:942
+#: en/rev-list-options.txt:958
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:943
+#: en/rev-list-options.txt:959
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:949
+#: en/rev-list-options.txt:965
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:959
+#: en/rev-list-options.txt:975
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:963
+#: en/rev-list-options.txt:979
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:984
#, priority:260
msgid "Listed below are options that control the formatting of diff output. Some of them are specific to linkgit:git-rev-list[1], however other diff options may be given. See linkgit:git-diff-files[1] for more options."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:991
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:981
+#: en/rev-list-options.txt:997
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:1012
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1015
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1018
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po
index 125f34d4527d51fc2998e8fd752ad3dbfd1f7a11..951644cb80b5e73027dc705c1056f6088b145249 100644
--- a/po/documentation.zh_HANS-CN.po
+++ b/po/documentation.zh_HANS-CN.po
@@ -6,9 +6,9 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2019-08-27 18:53+0200\n"
+"POT-Creation-Date: 2019-12-08 16:35+0100\n"
"PO-Revision-Date: 2019-10-31 12:31+0100\n"
-"Last-Translator: Matthias A횩hauer <mha1993@live.de>\n"
+"Last-Translator: Matthias Ahauer <mha1993@live.de>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: zh_HANS-CN\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:319 en/git-fsck.txt:38 en/git-rebase.txt:471
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:321 en/git-fsck.txt:38 en/git-rebase.txt:493
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -88,7 +88,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1000
+#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1016
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -97,7 +97,7 @@ msgstr "-t"
#: en/blame-options.txt:27
#, fuzzy, priority:100
msgid "Show raw timestamp (Default: off)."
-msgstr "�양ㅊ�잌쭓�띌뿴�놂펷容섋�竊싧뀽��펹"
+msgstr ""
#. type: Labeled list
#: en/blame-options.txt:28
@@ -109,7 +109,7 @@ msgstr ""
#: en/blame-options.txt:30
#, fuzzy, priority:100
msgid "Use revisions from revs-file instead of calling linkgit:git-rev-list[1]."
-msgstr "鵝욜뵪�θ눎 <�뉏뻑> �꾡엶溫�썓�뚥툖��컘�� git-rev-list"
+msgstr " <> git-rev-list"
#. type: Labeled list
#: en/blame-options.txt:31
@@ -124,7 +124,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:433 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -139,7 +139,7 @@ msgstr "--porcelain"
#: en/blame-options.txt:42
#, fuzzy, priority:100
msgid "Show in a format designed for machine consumption."
-msgstr "�양ㅊ訝뷰�訝ら�귛릦�뷴솳瑥삣룚�꾣졏凉�"
+msgstr ""
#. type: Labeled list
#: en/blame-options.txt:43
@@ -295,7 +295,7 @@ msgstr "linkgit:git-annotate[1]"
#: en/cmds-ancillaryinterrogators.txt:3
#, fuzzy, priority:100
msgid "Annotate file lines with commit information."
-msgstr "鵝욜뵪�먧벡岳→겘力③뇢�뉏뻑烏�"
+msgstr ""
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:4 en/git-annotate.txt:30
@@ -307,7 +307,7 @@ msgstr "linkgit:git-blame[1]"
#: en/cmds-ancillaryinterrogators.txt:6
#, fuzzy, priority:100
msgid "Show what revision and author last modified each line of a file."
-msgstr "�양ㅊ�뉏뻑驪뤶�烏뚧��롣엶�밭쉪�덃쑍�뚥엶�배��"
+msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
@@ -319,7 +319,7 @@ msgstr "linkgit:git-count-objects[1]"
#: en/cmds-ancillaryinterrogators.txt:9
#, fuzzy, priority:100
msgid "Count unpacked number of objects and their disk consumption."
-msgstr "溫←츞�ゆ돀�끻�穩←쉪�곈뇧�뚨즯�섊㈉�닷뜝��"
+msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:10
@@ -331,7 +331,7 @@ msgstr "linkgit:git-difftool[1]"
#: en/cmds-ancillaryinterrogators.txt:12
#, fuzzy, priority:100
msgid "Show changes using common diff tools."
-msgstr "鵝욜뵪躍멱쭅�꾢량凉귛램�룡샑鹽뷸쎍��"
+msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:13
@@ -343,7 +343,7 @@ msgstr "linkgit:git-fsck[1]"
#: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20
#, fuzzy, priority:100
msgid "Verifies the connectivity and validity of the objects in the database."
-msgstr "謠뚩칮餓볟틩訝��穩←쉪瓦욇�싨�㎩뭽�됪븞��"
+msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:16
@@ -355,7 +355,7 @@ msgstr "linkgit:git-help[1]"
#: en/cmds-ancillaryinterrogators.txt:18
#, fuzzy, priority:100
msgid "Display help information about Git."
-msgstr "�양ㅊ Git �꾢리�⒳에��"
+msgstr " Git "
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:19
@@ -367,7 +367,7 @@ msgstr "linkgit:git-instaweb[1]"
#: en/cmds-ancillaryinterrogators.txt:21
#, fuzzy, priority:100
msgid "Instantly browse your working repository in gitweb."
-msgstr "�� gitweb 訝�뜵�뜻탲鰲덃궓�꾢램鵝쒍퍜佯�"
+msgstr " gitweb "
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:22
@@ -379,7 +379,7 @@ msgstr "linkgit:git-merge-tree[1]"
#: en/cmds-ancillaryinterrogators.txt:24
#, fuzzy, priority:100
msgid "Show three-way merge without touching index."
-msgstr "�양ㅊ訝됭러�덂뭉�뚥툖�①뇨凉�"
+msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:25
@@ -391,7 +391,7 @@ msgstr "linkgit:git-rerere[1]"
#: en/cmds-ancillaryinterrogators.txt:27
#, fuzzy, priority:100
msgid "Reuse recorded resolution of conflicted merges."
-msgstr "�띸뵪�꿰챳�덂뭉�꾥㎗�녔뼶旅덅�壤�"
+msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:28
@@ -403,7 +403,7 @@ msgstr "linkgit:git-show-branch[1]"
#: en/cmds-ancillaryinterrogators.txt:30
#, fuzzy, priority:100
msgid "Show branches and their commits."
-msgstr "�양ㅊ�녷뵱�뚧룓雅�"
+msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:31
@@ -415,7 +415,7 @@ msgstr "linkgit:git-verify-commit[1]"
#: en/cmds-ancillaryinterrogators.txt:33
#, fuzzy, priority:100
msgid "Check the GPG signature of commits."
-msgstr "汝��� GPG �먧벡嶺얍릫"
+msgstr " GPG "
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:34
@@ -427,7 +427,7 @@ msgstr "linkgit:git-verify-tag[1]"
#: en/cmds-ancillaryinterrogators.txt:36
#, fuzzy, priority:100
msgid "Check the GPG signature of tags."
-msgstr "汝��ζ젃嶺양쉪 GPG 嶺얍릫"
+msgstr " GPG "
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:37
@@ -439,7 +439,7 @@ msgstr "linkgit:git-whatchanged[1]"
#: en/cmds-ancillaryinterrogators.txt:39
#, fuzzy, priority:100
msgid "Show logs with difference each commit introduces."
-msgstr "�양ㅊ驪뤶�訝ゆ룓雅ㅵ폊�η쉪藥�펰�ε퓱"
+msgstr ""
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
@@ -451,7 +451,7 @@ msgstr "linkgit:gitweb[1]"
#: en/cmds-ancillaryinterrogators.txt:42
#, fuzzy, priority:100
msgid "Git web interface (web frontend to Git repositories)."
-msgstr "Git web �뚪씊竊뉷it 餓볟틩�� web �띸ク竊�"
+msgstr "Git web Git web "
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:1 en/git-difftool.txt:144
@@ -463,10 +463,10 @@ msgstr "linkgit:git-config[1]"
#: en/cmds-ancillarymanipulators.txt:3
#, fuzzy, priority:100
msgid "Get and set repository or global options."
-msgstr "�룟룚�뚩�營�퍜佯볠닑�끻뀲掠��됮」"
+msgstr ""
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1505
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1528
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-export[1]"
msgstr "linkgit:git-fast-export[1]"
@@ -475,10 +475,10 @@ msgstr "linkgit:git-fast-export[1]"
#: en/cmds-ancillarymanipulators.txt:6
#, fuzzy, priority:100
msgid "Git data exporter."
-msgstr "Git �경뜮野쇔눣��"
+msgstr "Git "
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:243
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-import[1]"
msgstr "linkgit:git-fast-import[1]"
@@ -487,7 +487,7 @@ msgstr "linkgit:git-fast-import[1]"
#: en/cmds-ancillarymanipulators.txt:9
#, fuzzy, priority:100
msgid "Backend for fast Git data importers."
-msgstr "Git 恙ラ�잍빊����ε솳�롧ク"
+msgstr "Git "
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:10
@@ -499,7 +499,7 @@ msgstr "linkgit:git-filter-branch[1]"
#: en/cmds-ancillarymanipulators.txt:12
#, fuzzy, priority:100
msgid "Rewrite branches."
-msgstr "�띶넍�녷뵱"
+msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:13 en/git-difftool.txt:141
@@ -511,7 +511,7 @@ msgstr "linkgit:git-mergetool[1]"
#: en/cmds-ancillarymanipulators.txt:15
#, fuzzy, priority:100
msgid "Run merge conflict resolution tools to resolve merge conflicts."
-msgstr "瓦먫죱�덂뭉�꿰챳鰲ｅ넶藥ε끁餓θ㎗�녑릦亮뜹넳囹�"
+msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:16
@@ -523,7 +523,7 @@ msgstr "linkgit:git-pack-refs[1]"
#: en/cmds-ancillarymanipulators.txt:18
#, fuzzy, priority:100
msgid "Pack heads and tags for efficient repository access."
-msgstr "�볟똿鸚닷뭽�뉒�餓ε츩�곈쳵�덄쉪餓볟틩溫욥뿮"
+msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:19
@@ -535,7 +535,7 @@ msgstr "linkgit:git-prune[1]"
#: en/cmds-ancillarymanipulators.txt:21
#, fuzzy, priority:100
msgid "Prune all unreachable objects from the object database."
-msgstr "�좈솮野배괌佯볞릎���됦툖��씨野배괌"
+msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:22
@@ -547,7 +547,7 @@ msgstr "linkgit:git-reflog[1]"
#: en/cmds-ancillarymanipulators.txt:24
#, fuzzy, priority:100
msgid "Manage reflog information."
-msgstr "嶸←릤 reflog 岳→겘"
+msgstr " reflog "
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:25
@@ -559,7 +559,7 @@ msgstr "linkgit:git-remote[1]"
#: en/cmds-ancillarymanipulators.txt:27
#, fuzzy, priority:100
msgid "Manage set of tracked repositories."
-msgstr "嶸←릤藥꿱퇎甕や퍜佯�"
+msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:28
@@ -571,7 +571,7 @@ msgstr "linkgit:git-repack[1]"
#: en/cmds-ancillarymanipulators.txt:30
#, fuzzy, priority:100
msgid "Pack unpacked objects in a repository."
-msgstr "�볟똿餓볟틩訝�쑋�볟똿野배괌"
+msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:31
@@ -583,7 +583,7 @@ msgstr "linkgit:git-replace[1]"
#: en/cmds-ancillarymanipulators.txt:33
#, fuzzy, priority:100
msgid "Create, list, delete refs to replace objects."
-msgstr "�쎾뻠�곩닓�뷩�곩닠�ㅵ�穩→쎘�℡폊��"
+msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:1
@@ -595,7 +595,7 @@ msgstr "linkgit:git-archimport[1]"
#: en/cmds-foreignscminterface.txt:3
#, fuzzy, priority:100
msgid "Import a GNU Arch repository into Git."
-msgstr "弱녵�訝� GNU Arch 餓볟틩野쇔뀯�� Git"
+msgstr " GNU Arch Git"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:4
@@ -607,7 +607,7 @@ msgstr "linkgit:git-cvsexportcommit[1]"
#: en/cmds-foreignscminterface.txt:6
#, fuzzy, priority:100
msgid "Export a single commit to a CVS checkout."
-msgstr "弱녵�訝ゆ룓雅ㅵ��뷴댆 CVS 汝��뷰릎"
+msgstr " CVS "
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:7
@@ -619,7 +619,7 @@ msgstr "linkgit:git-cvsimport[1]"
#: en/cmds-foreignscminterface.txt:9
#, fuzzy, priority:100
msgid "Salvage your data out of another SCM people love to hate."
-msgstr "餓롥룱鸚뽨�訝や볶餓х댇�①쉪�띸쉰嶸←릤楹사퍨訝�떙�묇퐷�꾣빊��"
+msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:10
@@ -631,7 +631,7 @@ msgstr "linkgit:git-cvsserver[1]"
#: en/cmds-foreignscminterface.txt:12
#, fuzzy, priority:100
msgid "A CVS server emulator for Git."
-msgstr "Git �꾡�訝� CVS �띶뒦與→떉��"
+msgstr "Git CVS "
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:13
@@ -643,7 +643,7 @@ msgstr "linkgit:git-imap-send[1]"
#: en/cmds-foreignscminterface.txt:15
#, fuzzy, priority:100
msgid "Send a collection of patches from stdin to an IMAP folder."
-msgstr "餓롦젃�녻풏�ε컛訝�瀯꾥‥訝곩룕�곩댆IMAP�뉏뻑鸚�"
+msgstr "IMAP"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:16
@@ -655,7 +655,7 @@ msgstr "linkgit:git-p4[1]"
#: en/cmds-foreignscminterface.txt:18
#, fuzzy, priority:100
msgid "Import from and submit to Perforce repositories."
-msgstr "野쇔뀯�뚧룓雅ㅵ댆 Perforce 餓볟틩訝�"
+msgstr " Perforce "
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:19
@@ -667,7 +667,7 @@ msgstr "linkgit:git-quiltimport[1]"
#: en/cmds-foreignscminterface.txt:21
#, fuzzy, priority:100
msgid "Applies a quilt patchset onto the current branch."
-msgstr "弱녵�訝� quilt 烏δ툈�녶틪�ⓨ댆壤볟뎺�녷뵱��"
+msgstr " quilt "
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:22
@@ -679,7 +679,7 @@ msgstr "linkgit:git-request-pull[1]"
#: en/cmds-foreignscminterface.txt:24
#, fuzzy, priority:100
msgid "Generates a summary of pending changes."
-msgstr "�잍닇孃끻츣�닸뵻�꾣몮誤�"
+msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:25
@@ -691,7 +691,7 @@ msgstr "linkgit:git-send-email[1]"
#: en/cmds-foreignscminterface.txt:27
#, fuzzy, priority:100
msgid "Send a collection of patches as emails."
-msgstr "�싪퓝�드춴��뻑�묌�곦�瀯꾥‥訝�"
+msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:28
@@ -703,7 +703,7 @@ msgstr "linkgit:git-svn[1]"
#: en/cmds-foreignscminterface.txt:30
#, fuzzy, priority:100
msgid "Bidirectional operation between a Subversion repository and Git."
-msgstr "Subersion 餓볟틩�� Git 阿뗩뿴�꾢룎�묉뱧鵝�"
+msgstr "Subersion Git "
#. type: Plain text
#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
@@ -715,7 +715,7 @@ msgstr "linkgit:git-add[1]"
#: en/cmds-mainporcelain.txt:3
#, fuzzy, priority:100
msgid "Add file contents to the index."
-msgstr "曆삣뒥�뉏뻑�끻��녕뇨凉�"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:4
@@ -727,7 +727,7 @@ msgstr "linkgit:git-am[1]"
#: en/cmds-mainporcelain.txt:6
#, fuzzy, priority:100
msgid "Apply a series of patches from a mailbox."
-msgstr "佯붺뵪����쇔폀�꾤내�쀨‥訝�"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:7
@@ -739,7 +739,7 @@ msgstr "linkgit:git-archive[1]"
#: en/cmds-mainporcelain.txt:9
#, fuzzy, priority:100
msgid "Create an archive of files from a named tree."
-msgstr "�뷰틢訝�訝ゆ뙁若싩쉪�묈닗兩뷸뻼餓뜹춼旅�"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:10
@@ -751,7 +751,7 @@ msgstr "linkgit:git-bisect[1]"
#: en/cmds-mainporcelain.txt:12
#, fuzzy, priority:100
msgid "Use binary search to find the commit that introduced a bug."
-msgstr "�싪퓝雅뚦늽�ζ돻若싦퐤凉뺝뀯 bug �꾣룓雅�"
+msgstr " bug "
#. type: Labeled list
#: en/cmds-mainporcelain.txt:13
@@ -763,7 +763,7 @@ msgstr "linkgit:git-branch[1]"
#: en/cmds-mainporcelain.txt:15
#, fuzzy, priority:100
msgid "List, create, or delete branches."
-msgstr "�쀥눣�곩닗兩뷸닑�좈솮�녷뵱"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:16
@@ -775,7 +775,7 @@ msgstr "linkgit:git-bundle[1]"
#: en/cmds-mainporcelain.txt:18
#, fuzzy, priority:100
msgid "Move objects and refs by archive."
-msgstr "�싪퓝壤믤。燁삣뒯野배괌�뚦폊��"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:19
@@ -787,7 +787,7 @@ msgstr "linkgit:git-checkout[1]"
#: en/cmds-mainporcelain.txt:21
#, fuzzy, priority:100
msgid "Switch branches or restore working tree files."
-msgstr "�뉑뜟�녷뵱�뽪걿鸚띶램鵝쒎뙷�뉏뻑"
+msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:22 en/git-revert.txt:139
@@ -799,7 +799,7 @@ msgstr "linkgit:git-cherry-pick[1]"
#: en/cmds-mainporcelain.txt:24
#, fuzzy, priority:100
msgid "Apply the changes introduced by some existing commits."
-msgstr "佯붺뵪訝�雅쏁렟耶섉룓雅ㅵ폊�η쉪岳�뵻"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:25
@@ -811,7 +811,7 @@ msgstr "linkgit:git-citool[1]"
#: en/cmds-mainporcelain.txt:27
#, fuzzy, priority:100
msgid "Graphical alternative to git-commit."
-msgstr "git-commit �꾢쎗壤€쎘餓ｇ븣��"
+msgstr "git-commit "
#. type: Labeled list
#: en/cmds-mainporcelain.txt:28
@@ -823,7 +823,7 @@ msgstr "linkgit:git-clean[1]"
#: en/cmds-mainporcelain.txt:30
#, fuzzy, priority:100
msgid "Remove untracked files from the working tree."
-msgstr "餓롥램鵝쒎뙷訝�닠�ㅶ쑋瓮잒릉�뉏뻑"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:31
@@ -835,7 +835,7 @@ msgstr "linkgit:git-clone[1]"
#: en/cmds-mainporcelain.txt:33
#, fuzzy, priority:100
msgid "Clone a repository into a new directory."
-msgstr "�뗩쉮餓볟틩�겻�訝ゆ뼭��퐬"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:34
@@ -847,7 +847,7 @@ msgstr "linkgit:git-commit[1]"
#: en/cmds-mainporcelain.txt:36
#, fuzzy, priority:100
msgid "Record changes to the repository."
-msgstr "溫겼퐬�섉쎍�겻퍜佯�"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:37
@@ -859,7 +859,7 @@ msgstr "linkgit:git-describe[1]"
#: en/cmds-mainporcelain.txt:39
#, fuzzy, priority:100
msgid "Give an object a human readable name based on an available ref."
-msgstr "�뷰틢訝�訝ょ렟耶섊쉪凉뺟뵪訝뷰�訝ゅ�穩↑돈訝�訝ゅ룾瑥사쉪�띸㎞"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:138
@@ -871,7 +871,7 @@ msgstr "linkgit:git-diff[1]"
#: en/cmds-mainporcelain.txt:42
#, fuzzy, priority:100
msgid "Show changes between commits, commit and working tree, etc."
-msgstr "�양ㅊ�먧벡阿뗩뿴�곫룓雅ㅵ뭽藥δ퐳�뷰퉳�당춬�꾢량凉�"
+msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:43 en/git-fetch-pack.txt:129
@@ -883,7 +883,7 @@ msgstr "linkgit:git-fetch[1]"
#: en/cmds-mainporcelain.txt:45
#, fuzzy, priority:100
msgid "Download objects and refs from another repository."
-msgstr "餓롥룱鸚뽨�訝や퍜佯볞툔饔썲�穩▼뭽凉뺟뵪"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:46
@@ -895,7 +895,7 @@ msgstr "linkgit:git-format-patch[1]"
#: en/cmds-mainporcelain.txt:48
#, fuzzy, priority:100
msgid "Prepare patches for e-mail submission."
-msgstr "�녶쨭�드춴��뻑�먧벡�꾥‥訝�"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:49
@@ -907,7 +907,7 @@ msgstr "linkgit:git-gc[1]"
#: en/cmds-mainporcelain.txt:51
#, fuzzy, priority:100
msgid "Cleanup unnecessary files and optimize the local repository."
-msgstr "歷낂솮訝띶퓚誤곭쉪�뉏뻑�뚥폍�뽪쑍�겻퍜佯�"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:52
@@ -919,7 +919,7 @@ msgstr "linkgit:git-grep[1]"
#: en/cmds-mainporcelain.txt:54
#, fuzzy, priority:100
msgid "Print lines matching a pattern."
-msgstr "渦볟눣�뚧Æ凉뤷뙶�띸쉪烏�"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:55
@@ -931,7 +931,7 @@ msgstr "linkgit:git-gui[1]"
#: en/cmds-mainporcelain.txt:57
#, fuzzy, priority:100
msgid "A portable graphical interface to Git."
-msgstr "訝�訝や씩�븀쉪 Git �얍숱若€댎塋�"
+msgstr " Git "
#. type: Labeled list
#: en/cmds-mainporcelain.txt:58
@@ -943,7 +943,7 @@ msgstr "linkgit:git-init[1]"
#: en/cmds-mainporcelain.txt:60
#, fuzzy, priority:100
msgid "Create an empty Git repository or reinitialize an existing one."
-msgstr "�쎾뻠訝�訝ょ㈉�� Git 餓볟틩�뽭뇥�겼닜冶뗥뙑訝�訝ゅ럴耶섇쑉�꾡퍜佯�"
+msgstr " Git "
#. type: Labeled list
#: en/cmds-mainporcelain.txt:61
@@ -955,7 +955,7 @@ msgstr "linkgit:git-log[1]"
#: en/cmds-mainporcelain.txt:63
#, fuzzy, priority:100
msgid "Show commit logs."
-msgstr "�양ㅊ�먧벡�ε퓱"
+msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:64 en/git-fmt-merge-msg.txt:75
@@ -967,7 +967,7 @@ msgstr "linkgit:git-merge[1]"
#: en/cmds-mainporcelain.txt:66
#, fuzzy, priority:100
msgid "Join two or more development histories together."
-msgstr "�덂뭉訝ㅴ릉�뽪쎍鸚싧��묈럣��"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:67
@@ -979,7 +979,7 @@ msgstr "linkgit:git-mv[1]"
#: en/cmds-mainporcelain.txt:69
#, fuzzy, priority:100
msgid "Move or rename a file, a directory, or a symlink."
-msgstr "燁삣뒯�뽭뇥�썲릫訝�訝ゆ뻼餓뜰�곭쎅壤뺞닑寧�뤇�얏렏"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:70
@@ -991,7 +991,7 @@ msgstr "linkgit:git-notes[1]"
#: en/cmds-mainporcelain.txt:72
#, fuzzy, priority:100
msgid "Add or inspect object notes."
-msgstr "曆삣뒥�뽪��ε�穩→낏��"
+msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:73 en/git-fetch.txt:296
@@ -1003,7 +1003,7 @@ msgstr "linkgit:git-pull[1]"
#: en/cmds-mainporcelain.txt:75
#, fuzzy, priority:100
msgid "Fetch from and integrate with another repository or a local branch."
-msgstr "�룟룚亮뜻빐�덂룱鸚뽫쉪餓볟틩�뽨�訝ゆ쑍�겼늽��"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:76
@@ -1015,7 +1015,7 @@ msgstr "linkgit:git-push[1]"
#: en/cmds-mainporcelain.txt:78
#, fuzzy, priority:100
msgid "Update remote refs along with associated objects."
-msgstr "�닸뼭瓦쒐쮮凉뺟뵪�뚨쎑�녕쉪野배괌"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:79
@@ -1027,7 +1027,7 @@ msgstr "linkgit:git-range-diff[1]"
#: en/cmds-mainporcelain.txt:81
#, fuzzy, priority:100
msgid "Compare two commit ranges (e.g. two versions of a branch)."
-msgstr "驪붻푵訝ㅴ릉�먧벡�껃쎍竊덂쫩訝�訝ゅ늽��쉪訝ㅴ릉�덃쑍竊�"
+msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:82 en/git-svn.txt:1171
@@ -1039,7 +1039,7 @@ msgstr "linkgit:git-rebase[1]"
#: en/cmds-mainporcelain.txt:84
#, fuzzy, priority:100
msgid "Reapply commits on top of another base tip."
-msgstr "�ⓨ룱訝�訝ゅ늽��툓�띷뼭佯붺뵪�먧벡"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:85
@@ -1051,7 +1051,7 @@ msgstr "linkgit:git-reset[1]"
#: en/cmds-mainporcelain.txt:87
#, fuzzy, priority:100
msgid "Reset current HEAD to the specified state."
-msgstr "�띸쉰壤볟뎺 HEAD �경뙁若싩듁��"
+msgstr " HEAD "
#. type: Labeled list
#: en/cmds-mainporcelain.txt:88
@@ -1063,7 +1063,7 @@ msgstr "linkgit:git-restore[1]"
#: en/cmds-mainporcelain.txt:90
#, fuzzy, priority:100
msgid "Restore working tree files."
-msgstr "�℡쨳藥δ퐳�뷸뻼餓�"
+msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:91 en/git-cherry-pick.txt:240
@@ -1075,7 +1075,7 @@ msgstr "linkgit:git-revert[1]"
#: en/cmds-mainporcelain.txt:93
#, fuzzy, priority:100
msgid "Revert some existing commits."
-msgstr "�욇��訝�雅쏁렟耶섉룓雅�"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:94
@@ -1087,7 +1087,7 @@ msgstr "linkgit:git-rm[1]"
#: en/cmds-mainporcelain.txt:96
#, fuzzy, priority:100
msgid "Remove files from the working tree and from the index."
-msgstr "餓롥램鵝쒎뙷�뚨뇨凉뺜릎�좈솮�뉏뻑"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:97
@@ -1099,7 +1099,7 @@ msgstr "linkgit:git-shortlog[1]"
#: en/cmds-mainporcelain.txt:99
#, fuzzy, priority:100
msgid "Summarize 'git log' output."
-msgstr "'git log' 渦볟눣�섋쫨"
+msgstr "'git log' "
#. type: Labeled list
#: en/cmds-mainporcelain.txt:100
@@ -1111,7 +1111,7 @@ msgstr "linkgit:git-show[1]"
#: en/cmds-mainporcelain.txt:102
#, fuzzy, priority:100
msgid "Show various types of objects."
-msgstr "�양ㅊ�꾤쭕映삣엹�꾢�穩�"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
@@ -1123,7 +1123,7 @@ msgstr "linkgit:git-stash[1]"
#: en/cmds-mainporcelain.txt:105
#, fuzzy, priority:100
msgid "Stash the changes in a dirty working directory away."
-msgstr "兀�뿈�뤷램鵝쒎뙷訝�쉪岳�뵻"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:106
@@ -1135,7 +1135,7 @@ msgstr "linkgit:git-status[1]"
#: en/cmds-mainporcelain.txt:108
#, fuzzy, priority:100
msgid "Show the working tree status."
-msgstr "�양ㅊ藥δ퐳�븀듁��"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:109
@@ -1147,7 +1147,7 @@ msgstr "linkgit:git-submodule[1]"
#: en/cmds-mainporcelain.txt:111
#, fuzzy, priority:100
msgid "Initialize, update or inspect submodules."
-msgstr "�앭쭓�뽧�곫쎍�경닑汝��ε춴與←퍍"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:112
@@ -1159,7 +1159,7 @@ msgstr "linkgit:git-switch[1]"
#: en/cmds-mainporcelain.txt:114
#, fuzzy, priority:100
msgid "Switch branches."
-msgstr "�뉑뜟�녷뵱"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:115
@@ -1171,7 +1171,7 @@ msgstr "linkgit:git-tag[1]"
#: en/cmds-mainporcelain.txt:117
#, fuzzy, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
-msgstr "�쎾뻠�곩닓�뷩�곩닠�ㅶ닑�↓챿訝�訝� GPG 嶺얍릫�꾣젃嶺얍�穩�"
+msgstr " GPG "
#. type: Labeled list
#: en/cmds-mainporcelain.txt:118
@@ -1183,7 +1183,7 @@ msgstr "linkgit:git-worktree[1]"
#: en/cmds-mainporcelain.txt:120
#, fuzzy, priority:100
msgid "Manage multiple working trees."
-msgstr "嶸←릤鸚싦릉藥δ퐳��"
+msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
@@ -1195,7 +1195,7 @@ msgstr "linkgit:gitk[1]"
#: en/cmds-mainporcelain.txt:123
#, fuzzy, priority:100
msgid "The Git repository browser."
-msgstr "Git 餓볟틩役뤺쭏��"
+msgstr "Git "
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:1
@@ -1207,7 +1207,7 @@ msgstr "linkgit:git-cat-file[1]"
#: en/cmds-plumbinginterrogators.txt:3
#, fuzzy, priority:100
msgid "Provide content or type and size information for repository objects."
-msgstr "�먧풘餓볟틩野배괌�꾢냵若밤�곭굳�뗦닑鸚㎩컦"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:4
@@ -1219,7 +1219,7 @@ msgstr "linkgit:git-cherry[1]"
#: en/cmds-plumbinginterrogators.txt:6
#, fuzzy, priority:100
msgid "Find commits yet to be applied to upstream."
-msgstr "�ζ돻弱싨쑋佯붺뵪�겻툓歷며쉪�먧벡"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:7
@@ -1231,7 +1231,7 @@ msgstr "linkgit:git-diff-files[1]"
#: en/cmds-plumbinginterrogators.txt:9
#, fuzzy, priority:100
msgid "Compares files in the working tree and the index."
-msgstr "驪붻푵藥δ퐳�뷴뭽榮℡폊�뷰릎�꾣뻼餓�"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:10
@@ -1243,7 +1243,7 @@ msgstr "linkgit:git-diff-index[1]"
#: en/cmds-plumbinginterrogators.txt:12
#, fuzzy, priority:100
msgid "Compare a tree to the working tree or index."
-msgstr "弱녵�訝ゆ젒�뚦램鵝쒎뙷�뽫뇨凉뺝걳驪붻푵"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:13
@@ -1255,7 +1255,7 @@ msgstr "linkgit:git-diff-tree[1]"
#: en/cmds-plumbinginterrogators.txt:15
#, fuzzy, priority:100
msgid "Compares the content and mode of blobs found via two tree objects."
-msgstr "驪붻푵訝ㅴ릉�묈�穩←쉪�뉏뻑�끻��뚧Æ凉�"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:16
@@ -1267,7 +1267,7 @@ msgstr "linkgit:git-for-each-ref[1]"
#: en/cmds-plumbinginterrogators.txt:18
#, fuzzy, priority:100
msgid "Output information on each ref."
-msgstr "野방캀訝�訝ゅ폊�②풏�뷰에�� "
+msgstr " "
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:19
@@ -1279,7 +1279,7 @@ msgstr "linkgit:git-get-tar-commit-id[1]"
#: en/cmds-plumbinginterrogators.txt:21
#, fuzzy, priority:100
msgid "Extract commit ID from an archive created using git-archive."
-msgstr "餓� git-archive �쎾뻠�꾢퐩旅ｆ뻼餓뜸릎�먨룚�먧벡 ID"
+msgstr " git-archive ID"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:22
@@ -1291,7 +1291,7 @@ msgstr "linkgit:git-ls-files[1]"
#: en/cmds-plumbinginterrogators.txt:24
#, fuzzy, priority:100
msgid "Show information about files in the index and the working tree."
-msgstr "�양ㅊ榮℡폊�뚦램鵝쒎뙷訝�뻼餓띄쉪岳→겘"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:25
@@ -1303,7 +1303,7 @@ msgstr "linkgit:git-ls-remote[1]"
#: en/cmds-plumbinginterrogators.txt:27
#, fuzzy, priority:100
msgid "List references in a remote repository."
-msgstr "�양ㅊ訝�訝よ퓶葉뗤퍜佯볡쉪凉뺟뵪"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:28
@@ -1315,7 +1315,7 @@ msgstr "linkgit:git-ls-tree[1]"
#: en/cmds-plumbinginterrogators.txt:30
#, fuzzy, priority:100
msgid "List the contents of a tree object."
-msgstr "�양ㅊ訝�訝ゆ젒野배괌�꾢냵若�"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:31
@@ -1327,7 +1327,7 @@ msgstr "linkgit:git-merge-base[1]"
#: en/cmds-plumbinginterrogators.txt:33
#, fuzzy, priority:100
msgid "Find as good common ancestors as possible for a merge."
-msgstr "訝뷰틙�덂뭉�ζ돻弱썲룾�썲��꾢뀶�긺쪝�덃룓雅�"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:34
@@ -1340,7 +1340,7 @@ msgstr "linkgit:git-name-rev[1]"
#: en/cmds-plumbinginterrogators.txt:36
#, fuzzy, priority:100
msgid "Find symbolic names for given revs."
-msgstr "�ζ돻瀯쇿츣�덃쑍�꾤Е�룟릫燁�"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:37
@@ -1352,7 +1352,7 @@ msgstr "linkgit:git-pack-redundant[1]"
#: en/cmds-plumbinginterrogators.txt:39
#, fuzzy, priority:100
msgid "Find redundant pack files."
-msgstr "�ζ돻�쀤퐰�꾢똿�뉏뻑"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:40
@@ -1364,7 +1364,7 @@ msgstr "linkgit:git-rev-list[1]"
#: en/cmds-plumbinginterrogators.txt:42
#, fuzzy, priority:100
msgid "Lists commit objects in reverse chronological order."
-msgstr "�됪뿶�닻『佯뤷닓�뷸룓雅ㅵ�穩�"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:43
@@ -1376,7 +1376,7 @@ msgstr "linkgit:git-rev-parse[1]"
#: en/cmds-plumbinginterrogators.txt:45
#, fuzzy, priority:100
msgid "Pick out and massage parameters."
-msgstr "�됧눣亮뜹쨪�녶뢿��"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:46
@@ -1388,7 +1388,7 @@ msgstr "linkgit:git-show-index[1]"
#: en/cmds-plumbinginterrogators.txt:48
#, fuzzy, priority:100
msgid "Show packed archive index."
-msgstr "�양ㅊ�볟똿壤믤。榮℡폊"
+msgstr ""
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:49 en/git-for-each-ref.txt:391
@@ -1400,7 +1400,7 @@ msgstr "linkgit:git-show-ref[1]"
#: en/cmds-plumbinginterrogators.txt:51
#, fuzzy, priority:100
msgid "List references in a local repository."
-msgstr "�양ㅊ�у쑑餓볟틩訝�쉪凉뺟뵪"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:52
@@ -1412,7 +1412,7 @@ msgstr "linkgit:git-unpack-file[1]"
#: en/cmds-plumbinginterrogators.txt:54
#, fuzzy, priority:100
msgid "Creates a temporary file with a blob's contents."
-msgstr "�� blob �경뜮野배괌�꾢냵若밧닗兩뷰�訝や릿�뜻뻼餓�"
+msgstr " blob "
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:55
@@ -1424,7 +1424,7 @@ msgstr "linkgit:git-var[1]"
#: en/cmds-plumbinginterrogators.txt:57
#, fuzzy, priority:100
msgid "Show a Git logical variable."
-msgstr "�양ㅊ訝�訝찱it�삭풌�섌뇧"
+msgstr "Git"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:58
@@ -1436,7 +1436,7 @@ msgstr "linkgit:git-verify-pack[1]"
#: en/cmds-plumbinginterrogators.txt:60
#, fuzzy, priority:100
msgid "Validate packed Git archive files."
-msgstr "�↓챿�볟똿�껯it耶섆퍜�뉏뻑"
+msgstr "Git"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:1
@@ -1448,7 +1448,7 @@ msgstr "linkgit:git-apply[1]"
#: en/cmds-plumbingmanipulators.txt:3
#, fuzzy, priority:100
msgid "Apply a patch to files and/or to the index."
-msgstr "佯붺뵪訝�訝よ‥訝곩댆�뉏뻑��/�뽫뇨凉뺝뙷"
+msgstr "/"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:4
@@ -1460,7 +1460,7 @@ msgstr "linkgit:git-checkout-index[1]"
#: en/cmds-plumbingmanipulators.txt:6
#, fuzzy, priority:100
msgid "Copy files from the index to the working tree."
-msgstr "餓롧뇨凉뺞떣兀앮뻼餓뜹댆藥δ퐳��"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:7
@@ -1472,7 +1472,7 @@ msgstr "linkgit:git-commit-graph[1]"
#: en/cmds-plumbingmanipulators.txt:9
#, fuzzy, priority:100
msgid "Write and verify Git commit-graph files."
-msgstr "�쇿뀯�뚧젩謠� Git �먧벡�얏뻼餓�"
+msgstr " Git "
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:10
@@ -1484,7 +1484,7 @@ msgstr "linkgit:git-commit-tree[1]"
#: en/cmds-plumbingmanipulators.txt:12
#, fuzzy, priority:100
msgid "Create a new commit object."
-msgstr "�쎾뻠訝�訝ゆ뼭�꾣룓雅ㅵ�穩�"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:13
@@ -1496,7 +1496,7 @@ msgstr "linkgit:git-hash-object[1]"
#: en/cmds-plumbingmanipulators.txt:15
#, fuzzy, priority:100
msgid "Compute object ID and optionally creates a blob from a file."
-msgstr "餓롣�訝ゆ뻼餓띈�嶸쀥�穩� ID竊뚦뭉��빳�쎾뻠 blob �경뜮野배괌"
+msgstr " ID blob "
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:16
@@ -1508,7 +1508,7 @@ msgstr "linkgit:git-index-pack[1]"
#: en/cmds-plumbingmanipulators.txt:18
#, fuzzy, priority:100
msgid "Build pack index file for an existing packed archive."
-msgstr "餓롣�訝ょ렟耶섊쉪�끻춼旅ｆ뻼餓뜹닗兩뷴똿榮℡폊"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:19
@@ -1520,7 +1520,7 @@ msgstr "linkgit:git-merge-file[1]"
#: en/cmds-plumbingmanipulators.txt:21
#, fuzzy, priority:100
msgid "Run a three-way file merge."
-msgstr "瓦먫죱訝�訝や툒瓮�뻼餓뜹릦亮�"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:22
@@ -1532,7 +1532,7 @@ msgstr "linkgit:git-merge-index[1]"
#: en/cmds-plumbingmanipulators.txt:24
#, fuzzy, priority:100
msgid "Run a merge for files needing merging."
-msgstr "野밥틢��誤곩릦亮띄쉪�뉏뻑�㎬죱�덂뭉"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:25
@@ -1544,7 +1544,7 @@ msgstr "linkgit:git-mktag[1]"
#: en/cmds-plumbingmanipulators.txt:27
#, fuzzy, priority:100
msgid "Creates a tag object."
-msgstr "�쎾뻠訝�訝ゆ젃嶺얍�穩�"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:28
@@ -1556,7 +1556,7 @@ msgstr "linkgit:git-mktree[1]"
#: en/cmds-plumbingmanipulators.txt:30
#, fuzzy, priority:100
msgid "Build a tree-object from ls-tree formatted text."
-msgstr "�뷰틢 ls-tree �꾣졏凉뤷뙑�뉑쑍�쎾뻠訝�訝ゆ젒野배괌"
+msgstr " ls-tree "
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:31
@@ -1568,7 +1568,7 @@ msgstr "linkgit:git-multi-pack-index[1]"
#: en/cmds-plumbingmanipulators.txt:33
#, fuzzy, priority:100
msgid "Write and verify multi-pack-indexes."
-msgstr "�쇿뀯�뚧젩謠뚦쩀�끿뇨凉�"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:34
@@ -1580,7 +1580,7 @@ msgstr "linkgit:git-pack-objects[1]"
#: en/cmds-plumbingmanipulators.txt:36
#, fuzzy, priority:100
msgid "Create a packed archive of objects."
-msgstr "�쎾뻠野배괌�꾢춼旅ｅ똿"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:37
@@ -1592,7 +1592,7 @@ msgstr "linkgit:git-prune-packed[1]"
#: en/cmds-plumbingmanipulators.txt:39
#, fuzzy, priority:100
msgid "Remove extra objects that are already in pack files."
-msgstr "�좈솮藥꿰퍘�ⓨ똿�뉏뻑訝�쉪鸚싦퐰野배괌"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:40
@@ -1604,7 +1604,7 @@ msgstr "linkgit:git-read-tree[1]"
#: en/cmds-plumbingmanipulators.txt:42
#, fuzzy, priority:100
msgid "Reads tree information into the index."
-msgstr "弱녷젒岳→겘瑥삣룚�곁뇨凉�"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:43
@@ -1616,7 +1616,7 @@ msgstr "linkgit:git-symbolic-ref[1]"
#: en/cmds-plumbingmanipulators.txt:45
#, fuzzy, priority:100
msgid "Read, modify and delete symbolic refs."
-msgstr "瑥삣룚�곦엶�밧뭽�좈솮寧�뤇凉뺟뵪"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:46
@@ -1628,7 +1628,7 @@ msgstr "linkgit:git-unpack-objects[1]"
#: en/cmds-plumbingmanipulators.txt:48
#, fuzzy, priority:100
msgid "Unpack objects from a packed archive."
-msgstr "餓롦돀�끾뻼餓뜸릎鰲ｅ럨煐⒴�穩�"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:49
@@ -1640,7 +1640,7 @@ msgstr "linkgit:git-update-index[1]"
#: en/cmds-plumbingmanipulators.txt:51
#, fuzzy, priority:100
msgid "Register file contents in the working tree to the index."
-msgstr "弱녶램鵝쒎뙷�꾣뻼餓뜹냵若방낏�뚦댆榮℡폊"
+msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:52
@@ -1652,7 +1652,7 @@ msgstr "linkgit:git-update-ref[1]"
#: en/cmds-plumbingmanipulators.txt:54
#, fuzzy, priority:100
msgid "Update the object name stored in a ref safely."
-msgstr "若됧뀲�경쎍�겼춼�ⓧ틢凉뺟뵪訝�쉪野배괌�띸㎞"
+msgstr ""
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:120
@@ -1664,7 +1664,7 @@ msgstr "linkgit:git-write-tree[1]"
#: en/cmds-plumbingmanipulators.txt:57
#, fuzzy, priority:100
msgid "Create a tree object from the current index."
-msgstr "餓롥퐪�띸뇨凉뺝닗兩뷰�訝ゆ젒野배괌"
+msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:1
@@ -1676,7 +1676,7 @@ msgstr "linkgit:git-check-attr[1]"
#: en/cmds-purehelpers.txt:3
#, fuzzy, priority:100
msgid "Display gitattributes information."
-msgstr "�양ㅊ gitattributes 岳→겘"
+msgstr " gitattributes "
#. type: Labeled list
#: en/cmds-purehelpers.txt:4
@@ -1688,7 +1688,7 @@ msgstr "linkgit:git-check-ignore[1]"
#: en/cmds-purehelpers.txt:6
#, fuzzy, priority:100
msgid "Debug gitignore / exclude files."
-msgstr "瘟껇캊 gitignore / exclude �뉏뻑"
+msgstr " gitignore / exclude "
#. type: Labeled list
#: en/cmds-purehelpers.txt:7
@@ -1700,7 +1700,7 @@ msgstr "linkgit:git-check-mailmap[1]"
#: en/cmds-purehelpers.txt:9
#, fuzzy, priority:100
msgid "Show canonical names and email addresses of contacts."
-msgstr "�양ㅊ�붺내雅븀쉪鰲꾥똽�띸㎞�뚨뵷耶먬궙餓�"
+msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:10
@@ -1712,7 +1712,7 @@ msgstr "linkgit:git-check-ref-format[1]"
#: en/cmds-purehelpers.txt:12
#, fuzzy, priority:100
msgid "Ensures that a reference name is well formed."
-msgstr "簾�퓷凉뺟뵪�띸㎞�쇔폀閭ｇ‘"
+msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:13
@@ -1724,7 +1724,7 @@ msgstr "linkgit:git-column[1]"
#: en/cmds-purehelpers.txt:15
#, fuzzy, priority:100
msgid "Display data in columns."
-msgstr "餓ε닓�꾣뼶凉뤸샑鹽뷸빊��"
+msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:16
@@ -1736,7 +1736,7 @@ msgstr "linkgit:git-credential[1]"
#: en/cmds-purehelpers.txt:18
#, fuzzy, priority:100
msgid "Retrieve and store user credentials."
-msgstr "汝�榮℡뭽耶섇궓�ⓩ댎野녺쟻"
+msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:19
@@ -1748,7 +1748,7 @@ msgstr "linkgit:git-credential-cache[1]"
#: en/cmds-purehelpers.txt:21
#, fuzzy, priority:100
msgid "Helper to temporarily store passwords in memory."
-msgstr "�ⓨ냵耶섆릎訝닸뿶耶섇궓野녺쟻�꾢뒰��"
+msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:22
@@ -1760,7 +1760,7 @@ msgstr "linkgit:git-credential-store[1]"
#: en/cmds-purehelpers.txt:24
#, fuzzy, priority:100
msgid "Helper to store credentials on disk."
-msgstr "�①즯�섇춼�ⓨ칳�곭쉪�⒵뎸"
+msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:25
@@ -1772,7 +1772,7 @@ msgstr "linkgit:git-fmt-merge-msg[1]"
#: en/cmds-purehelpers.txt:27
#, fuzzy, priority:100
msgid "Produce a merge commit message."
-msgstr "�잍닇訝�訝ゅ릦亮뜻룓雅ㅴ에��"
+msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:28
@@ -1784,7 +1784,7 @@ msgstr "linkgit:git-interpret-trailers[1]"
#: en/cmds-purehelpers.txt:30
#, fuzzy, priority:100
msgid "Add or parse structured information in commit messages."
-msgstr "曆삣뒥�뽬㎗�먩룓雅ㅸ��롣릎�꾤퍜�꾢뙑岳→겘"
+msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:31
@@ -1796,7 +1796,7 @@ msgstr "linkgit:git-mailinfo[1]"
#: en/cmds-purehelpers.txt:33
#, fuzzy, priority:100
msgid "Extracts patch and authorship from a single e-mail message."
-msgstr "餓롥뜒訝ょ뵷耶먬궙餓뜸릎�먨룚烏δ툈�뚥퐳�낁벴餓�"
+msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:34
@@ -1808,7 +1808,7 @@ msgstr "linkgit:git-mailsplit[1]"
#: en/cmds-purehelpers.txt:36
#, fuzzy, priority:100
msgid "Simple UNIX mbox splitter program."
-msgstr "嶸��뺟쉪 UNIX mbox ����뉐늽葉뗥틣"
+msgstr " UNIX mbox "
#. type: Labeled list
#: en/cmds-purehelpers.txt:37
@@ -1820,7 +1820,7 @@ msgstr "linkgit:git-merge-one-file[1]"
#: en/cmds-purehelpers.txt:39
#, fuzzy, priority:100
msgid "The standard helper program to use with git-merge-index."
-msgstr "訝� git-merge-index 訝�壅룝슴�①쉪�뉐뇛�묈�葉뗥틣"
+msgstr " git-merge-index "
#. type: Plain text
#: en/cmds-purehelpers.txt:40 en/git-cherry.txt:142
@@ -1832,7 +1832,7 @@ msgstr "linkgit:git-patch-id[1]"
#: en/cmds-purehelpers.txt:42
#, fuzzy, priority:100
msgid "Compute unique ID for a patch."
-msgstr "溫←츞訝�訝よ‥訝곭쉪��� ID"
+msgstr " ID"
#. type: Labeled list
#: en/cmds-purehelpers.txt:43
@@ -1844,7 +1844,7 @@ msgstr "linkgit:git-sh-i18n[1]"
#: en/cmds-purehelpers.txt:45
#, fuzzy, priority:100
msgid "Git's i18n setup code for shell scripts."
-msgstr "訝� shell �싨쑍�녶쨭�� Git �썽솀�뽬�營�빰��"
+msgstr " shell Git "
#. type: Labeled list
#: en/cmds-purehelpers.txt:46
@@ -1856,7 +1856,7 @@ msgstr "linkgit:git-sh-setup[1]"
#: en/cmds-purehelpers.txt:48
#, fuzzy, priority:100
msgid "Common Git shell script setup code."
-msgstr "躍며뵪�� Git shell �싨쑍溫양쉰餓ｇ쟻"
+msgstr " Git shell "
#. type: Labeled list
#: en/cmds-purehelpers.txt:49
@@ -1868,7 +1868,7 @@ msgstr "linkgit:git-stripspace[1]"
#: en/cmds-purehelpers.txt:51
#, fuzzy, priority:100
msgid "Remove unnecessary whitespace."
-msgstr "�좈솮訝띶퓚誤곭쉪令븀쇋耶쀧Е"
+msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:1
@@ -1880,7 +1880,7 @@ msgstr "linkgit:git-http-fetch[1]"
#: en/cmds-synchelpers.txt:3
#, fuzzy, priority:100
msgid "Download from a remote Git repository via HTTP."
-msgstr "�싪퓝 HTTP 餓롨퓶葉� Git 餓볟틩訝뗨슬"
+msgstr " HTTP Git "
#. type: Labeled list
#: en/cmds-synchelpers.txt:4
@@ -1892,7 +1892,7 @@ msgstr "linkgit:git-http-push[1]"
#: en/cmds-synchelpers.txt:6
#, fuzzy, priority:100
msgid "Push objects over HTTP/DAV to another repository."
-msgstr "�싪퓝 HTTP/DAV �③�곩�穩▼룱訝�訝や퍜佯�"
+msgstr " HTTP/DAV "
#. type: Labeled list
#: en/cmds-synchelpers.txt:7
@@ -1904,7 +1904,7 @@ msgstr "linkgit:git-parse-remote[1]"
#: en/cmds-synchelpers.txt:9
#, fuzzy, priority:100
msgid "Routines to help parsing remote repository access parameters."
-msgstr "躍�뒰鰲ｆ옄瓦쒐쮮餓볟틩溫욥뿮�귝빊�꾡풃葉�"
+msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:10
@@ -1916,7 +1916,7 @@ msgstr "linkgit:git-receive-pack[1]"
#: en/cmds-synchelpers.txt:12
#, fuzzy, priority:100
msgid "Receive what is pushed into the repository."
-msgstr "�ζ뵸�③�곩댆餓볟틩訝�쉪野배괌"
+msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:13
@@ -1928,7 +1928,7 @@ msgstr "linkgit:git-shell[1]"
#: en/cmds-synchelpers.txt:15
#, fuzzy, priority:100
msgid "Restricted login shell for Git-only SSH access."
-msgstr "�ゅ뀅溫� Git SSH 溫욥뿮�꾢룛�먪쇉壤븉hell"
+msgstr " Git SSH shell"
#. type: Labeled list
#: en/cmds-synchelpers.txt:16
@@ -1940,7 +1940,7 @@ msgstr "linkgit:git-upload-archive[1]"
#: en/cmds-synchelpers.txt:18
#, fuzzy, priority:100
msgid "Send archive back to git-archive."
-msgstr "弱녶춼旅ｅ룕�곩썮 git-archive"
+msgstr " git-archive"
#. type: Labeled list
#: en/cmds-synchelpers.txt:19
@@ -1952,7 +1952,7 @@ msgstr "linkgit:git-upload-pack[1]"
#: en/cmds-synchelpers.txt:21
#, fuzzy, priority:100
msgid "Send objects packed back to git-fetch-pack."
-msgstr "弱녶�穩▼럨煐⒴똿�묌�곩썮 git-fetch-pack"
+msgstr " git-fetch-pack"
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:1
@@ -1964,7 +1964,7 @@ msgstr "linkgit:git-daemon[1]"
#: en/cmds-synchingrepositories.txt:3
#, fuzzy, priority:100
msgid "A really simple server for Git repositories."
-msgstr "訝�訝ら씆躍며��뺟쉪 Git 餓볟틩�띶뒦��"
+msgstr " Git "
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:4
@@ -1976,7 +1976,7 @@ msgstr "linkgit:git-fetch-pack[1]"
#: en/cmds-synchingrepositories.txt:6
#, fuzzy, priority:100
msgid "Receive missing objects from another repository."
-msgstr "餓롥룱訝�訝や퍜佯볢렩�뽫성鸚긺쉪野배괌"
+msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:7
@@ -1988,7 +1988,7 @@ msgstr "linkgit:git-http-backend[1]"
#: en/cmds-synchingrepositories.txt:9
#, fuzzy, priority:100
msgid "Server side implementation of Git over HTTP."
-msgstr "Git HTTP �뤺��꾣쐨�←ク若욅렟"
+msgstr "Git HTTP "
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:10
@@ -2000,7 +2000,7 @@ msgstr "linkgit:git-send-pack[1]"
#: en/cmds-synchingrepositories.txt:12
#, fuzzy, priority:100
msgid "Push objects over Git protocol to another repository."
-msgstr "鵝욜뵪 Git �뤺��③�곩�穩▼댆�╊�訝や퍜佯�"
+msgstr " Git "
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:13
@@ -2012,7 +2012,7 @@ msgstr "linkgit:git-update-server-info[1]"
#: en/cmds-synchingrepositories.txt:15
#, fuzzy, priority:100
msgid "Update auxiliary info file to help dumb servers."
-msgstr "�닸뼭渦끻뒰岳→겘�뉏뻑餓ε리�⒴뱫�뤺��띶뒦"
+msgstr ""
#. type: Title -
#: en/config.txt:2 en/git-worktree.txt:237
@@ -2256,99 +2256,99 @@ msgstr ""
#. type: Title ~
#: en/config.txt:179 en/git-rev-parse.txt:359 en/git-rev-parse.txt:415
-#, ignore-translated, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "Example"
msgstr ""
-#. type: Plain text
-#: en/config.txt:185
+#. type: delimited block -
+#: en/config.txt:186
#, no-wrap, priority:100
msgid ""
-"\t# Core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"# Core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:190
+#. type: delimited block -
+#: en/config.txt:191
#, no-wrap, priority:100
msgid ""
-"\t# Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"# Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:194
+#. type: delimited block -
+#: en/config.txt:195
#, no-wrap, priority:100
msgid ""
-"\t[branch \"devel\"]\n"
-"\t\tremote = origin\n"
-"\t\tmerge = refs/heads/devel\n"
+"[branch \"devel\"]\n"
+"\tremote = origin\n"
+"\tmerge = refs/heads/devel\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:199
+#. type: delimited block -
+#: en/config.txt:200
#, no-wrap, priority:100
msgid ""
-"\t# Proxy settings\n"
-"\t[core]\n"
-"\t\tgitProxy=\"ssh\" for \"kernel.org\"\n"
-"\t\tgitProxy=default-proxy ; for the rest\n"
+"# Proxy settings\n"
+"[core]\n"
+"\tgitProxy=\"ssh\" for \"kernel.org\"\n"
+"\tgitProxy=default-proxy ; for the rest\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:204
+#. type: delimited block -
+#: en/config.txt:205
#, no-wrap, priority:100
msgid ""
-"\t[include]\n"
-"\t\tpath = /path/to/foo.inc ; include by absolute path\n"
-"\t\tpath = foo.inc ; find \"foo.inc\" relative to the current file\n"
-"\t\tpath = ~/foo.inc ; find \"foo.inc\" in your `$HOME` directory\n"
+"[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: Plain text
-#: en/config.txt:208
+#. type: delimited block -
+#: en/config.txt:209
#, no-wrap, priority:100
msgid ""
-"\t; include if $GIT_DIR is /path/to/foo/.git\n"
-"\t[includeIf \"gitdir:/path/to/foo/.git\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; 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: Plain text
-#: en/config.txt:212
+#. type: delimited block -
+#: en/config.txt:213
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside /path/to/group\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside /path/to/group\n"
+"[includeIf \"gitdir:/path/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:216
+#. type: delimited block -
+#: en/config.txt:217
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside $HOME/to/group\n"
-"\t[includeIf \"gitdir:~/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside $HOME/to/group\n"
+"[includeIf \"gitdir:~/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:222
+#. type: delimited block -
+#: en/config.txt:223
#, no-wrap, priority:100
msgid ""
-"\t; relative paths are always relative to the including\n"
-"\t; file (if the condition is true); their location is not\n"
-"\t; affected by the condition\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = foo.inc\n"
+"; 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:227
+#: en/config.txt:229
#, no-wrap, priority:100
msgid ""
"\t; include only if we are in a worktree where foo-branch is\n"
@@ -2358,43 +2358,43 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/config.txt:229
+#: en/config.txt:231
#, no-wrap, priority:100
msgid "Values"
msgstr ""
#. type: Plain text
-#: en/config.txt:234
+#: 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:235
+#: en/config.txt:237
#, no-wrap, priority:100
msgid "boolean"
msgstr ""
#. type: Plain text
-#: en/config.txt:240
+#: 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:241
+#: en/config.txt:243
#, no-wrap, priority:100
msgid "true"
msgstr ""
#. type: Plain text
-#: en/config.txt:242
+#: en/config.txt:244
#, priority:100
msgid "Boolean true literals are `yes`, `on`, `true`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:244
+#: en/config.txt:246
#, no-wrap, priority:100
msgid ""
"and `1`. Also, a variable defined without `= <value>`\n"
@@ -2402,109 +2402,109 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/config.txt:245
+#: en/config.txt:247
#, no-wrap, priority:100
msgid "false"
msgstr ""
#. type: Plain text
-#: en/config.txt:246
+#: en/config.txt:248
#, priority:100
msgid "Boolean false literals are `no`, `off`, `false`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:247
+#: en/config.txt:249
#, no-wrap, priority:100
msgid "`0` and the empty string.\n"
msgstr ""
#. type: Plain text
-#: en/config.txt:251
+#: 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:252
+#: en/config.txt:254
#, no-wrap, priority:100
msgid "integer"
msgstr ""
#. type: Plain text
-#: en/config.txt:256
+#: 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:257 en/diff-options.txt:356 en/git-for-each-ref.txt:177
+#: 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:261
+#: 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:265
+#: en/config.txt:267
#, 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."
msgstr ""
#. type: Plain text
-#: en/config.txt:270
+#: en/config.txt:272
#, 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:277
+#: en/config.txt:279
#, 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:280
+#: en/config.txt:282
#, 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:289
+#: en/config.txt:291
#, 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:290
+#: en/config.txt:292
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:296
+#: en/config.txt:298
#, 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:299 en/git-imap-send.txt:58
+#: en/config.txt:301 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:304
+#: en/config.txt:306
#, 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:309
+#: en/config.txt:311
#, 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 ""
@@ -3015,7 +3015,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-format.txt:76 en/git-svn.txt:499 en/git-svn.txt:539
-#, ignore-translated, no-wrap, priority:280
+#, no-wrap, priority:280
msgid "Example:"
msgstr ""
@@ -3242,53 +3242,53 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
#, no-wrap, priority:260
-msgid "Generating patches with -p"
+msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:10
+#: en/diff-generate-patch.txt:14
#, priority:260
-msgid "When \"git-diff-index\", \"git-diff-tree\", or \"git-diff-files\" are run with a `-p` option, \"git diff\" without the `--raw` option, or \"git log\" with the \"-p\" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
+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:13
+#: 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:15
+#: 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:17
+#: 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:21
+#: 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:25
+#: 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:27
+#: 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:39
+#: en/diff-generate-patch.txt:43
#, no-wrap, priority:260
msgid ""
"old mode <mode>\n"
@@ -3305,43 +3305,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:42
+#: 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:44
+#: 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:51
+#: 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:55
+#: en/diff-generate-patch.txt:59
#, priority:260
-msgid "The index line includes the SHA-1 checksum 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."
+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:59
+#: 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:64
+#: 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:71
+#: en/diff-generate-patch.txt:75
#, no-wrap, priority:260
msgid ""
"diff --git a/a b/b\n"
@@ -3353,25 +3353,25 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/diff-generate-patch.txt:74
+#: en/diff-generate-patch.txt:78
#, no-wrap, priority:260
-msgid "combined diff format"
+msgid "Combined diff format"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:82
+#: 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:84
+#: en/diff-generate-patch.txt:88
#, priority:260
-msgid "A 'combined diff' format looks like this:"
+msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:93
+#: en/diff-generate-patch.txt:97
#, no-wrap, priority:260
msgid ""
"diff --combined describe.c\n"
@@ -3384,7 +3384,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:103
+#: en/diff-generate-patch.txt:107
#, no-wrap, priority:260
msgid ""
"- static void describe(char *arg)\n"
@@ -3399,7 +3399,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:113
+#: en/diff-generate-patch.txt:117
#, no-wrap, priority:260
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
@@ -3414,37 +3414,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:117
+#: en/diff-generate-patch.txt:121
#, priority:260
-msgid "It is preceded with a \"git diff\" header, that looks like this (when `-c` option is used):"
+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:119
+#: en/diff-generate-patch.txt:123
#, no-wrap, priority:260
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:121
+#: en/diff-generate-patch.txt:125
#, priority:260
-msgid "or like this (when `--cc` option is used):"
+msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:123
+#: en/diff-generate-patch.txt:127
#, no-wrap, priority:260
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:126
+#: 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:131
+#: en/diff-generate-patch.txt:135
#, no-wrap, priority:260
msgid ""
"index <hash>,<hash>..<hash>\n"
@@ -3454,91 +3454,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:137
+#: 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:139
+#: 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:141 en/diff-generate-patch.txt:152 en/diff-generate-patch.txt:153 en/diff-generate-patch.txt:154
+#: 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:142 en/diff-generate-patch.txt:155
+#: 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:146
+#: 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:150
+#: 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:159
+#: 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:165
+#: 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 for apply. The change is similar to the change in the extended 'index' header:"
+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:167
+#: 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:170
+#: 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:179
+#: 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:185
+#: 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:191
+#: 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:197
+#: 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:327 en/merge-options.txt:86
+#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3550,7 +3550,7 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:186 en/git-add.txt:111 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/diff-options.txt:23 en/fetch-options.txt:198 en/git-add.txt:111 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
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
@@ -3574,7 +3574,7 @@ msgid "\tThis is the default.\n"
msgstr ""
#. 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:117 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
+#: 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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:118 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"
@@ -3661,7 +3661,7 @@ msgstr "--raw"
#: en/diff-options.txt:58
#, fuzzy, no-wrap, priority:280
msgid "\tGenerate the diff in raw format.\n"
-msgstr "�잍닇�잌쭓�쇔폀�꾢량凉�"
+msgstr ""
#. type: Plain text
#: en/diff-options.txt:68
@@ -3684,7 +3684,7 @@ msgstr "--patch-with-raw"
#: en/diff-options.txt:74
#, fuzzy, priority:280
msgid "Synonym for `-p --raw`."
-msgstr "�� '-p --raw' �뚥퉱"
+msgstr " '-p --raw' "
#. type: Labeled list
#: en/diff-options.txt:76
@@ -3732,7 +3732,7 @@ msgstr "--patience"
#: en/diff-options.txt:89
#, fuzzy, priority:280
msgid "Generate a diff using the \"patience diff\" algorithm."
-msgstr "鵝욜뵪 \"patience diff\" 嶸쀦퀡�잍닇藥�펰"
+msgstr " \"patience diff\" "
#. type: Labeled list
#: en/diff-options.txt:90
@@ -3744,7 +3744,7 @@ msgstr "--histogram"
#: en/diff-options.txt:92
#, fuzzy, priority:280
msgid "Generate a diff using the \"histogram diff\" algorithm."
-msgstr "鵝욜뵪 \"histogram diff\" 嶸쀦퀡�잍닇藥�펰"
+msgstr " \"histogram diff\" "
#. type: Labeled list
#: en/diff-options.txt:93
@@ -3756,7 +3756,7 @@ msgstr ""
#: en/diff-options.txt:95
#, fuzzy, priority:280
msgid "Generate a diff using the \"anchored diff\" algorithm."
-msgstr "鵝욜뵪 \"anchored diff\" 嶸쀦퀡�잍닇藥�펰"
+msgstr " \"anchored diff\" "
#. type: Plain text
#: en/diff-options.txt:97
@@ -3834,7 +3834,7 @@ msgstr ""
#: en/diff-options.txt:123
#, fuzzy, no-wrap, priority:280
msgid "--stat[=<width>[,<name-width>[,<count>]]]"
-msgstr "<若썲벧>[,<�뉏뻑�띶�佯�>[,<轝→빊>]]"
+msgstr "<>[,<>[,<>]]"
#. type: Plain text
#: en/diff-options.txt:137
@@ -3978,7 +3978,7 @@ msgstr "--cumulative"
#: en/diff-options.txt:208
#, fuzzy, priority:280
msgid "Synonym for --dirstat=cumulative"
-msgstr "�� --dirstat=cumulative �뚥퉱"
+msgstr " --dirstat=cumulative "
#. type: Labeled list
#: en/diff-options.txt:209
@@ -3990,10 +3990,10 @@ msgstr ""
#: en/diff-options.txt:211
#, fuzzy, ignore-ellipsis, priority:280
msgid "Synonym for --dirstat=files,param1,param2..."
-msgstr "�� --dirstat=files,param1,param2... �꾢릪阿됭칾"
+msgstr " --dirstat=files,param1,param2... "
#. type: Labeled list
-#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:129
+#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--summary"
msgstr "--summary"
@@ -4014,10 +4014,10 @@ msgstr "--patch-with-stat"
#: en/diff-options.txt:219
#, fuzzy, priority:280
msgid "Synonym for `-p --stat`."
-msgstr "�� '-p --stat' �뚥퉱"
+msgstr " '-p --stat' "
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:122 en/git-update-index.txt:168
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:168
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4058,7 +4058,7 @@ msgstr "--name-only"
#: en/diff-options.txt:241
#, fuzzy, priority:280
msgid "Show only names of changed files."
-msgstr "�ゆ샑鹽뷴룜�닸뻼餓띄쉪�뉏뻑��"
+msgstr ""
#. type: Labeled list
#: en/diff-options.txt:242 en/git-ls-tree.txt:60
@@ -4138,7 +4138,7 @@ msgstr ""
#: en/diff-options.txt:276
#, fuzzy, priority:280
msgid "Moved lines of code are colored differently."
-msgstr "燁삣뒯�꾡빰�곮죱�ⓧ툖�뚧뼶凉뤹���"
+msgstr ""
#. type: Plain text
#: en/diff-options.txt:278
@@ -4279,7 +4279,7 @@ msgstr "ignore-space-at-eol"
#: en/diff-options.txt:330 en/diff-options.txt:665
#, fuzzy, priority:280
msgid "Ignore changes in whitespace at EOL."
-msgstr "恙썹븼烏뚦갼�꾤㈉�썲춻寧�룜��"
+msgstr ""
#. type: Labeled list
#: en/diff-options.txt:330 en/merge-strategies.txt:59
@@ -4426,7 +4426,7 @@ msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:402 en/git-status.txt:139
+#: en/diff-options.txt:402 en/git-status.txt:143
#, ignore-same, no-wrap, priority:280
msgid "--no-renames"
msgstr "--no-renames"
@@ -4530,7 +4530,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:463
#, priority:280
-msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
+msgid "It affects the way a change that amounts to a total rewrite of a file does not appear as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
msgstr ""
#. type: Plain text
@@ -4546,7 +4546,7 @@ msgid "-M[<n>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:473 en/git-status.txt:143
+#: en/diff-options.txt:473 en/git-status.txt:147
#, no-wrap, priority:280
msgid "--find-renames[=<n>]"
msgstr ""
@@ -4555,7 +4555,7 @@ msgstr ""
#: en/diff-options.txt:476
#, fuzzy, no-wrap, priority:280
msgid "\tDetect renames.\n"
-msgstr "汝�役뗩뇥�썲릫"
+msgstr ""
#. type: Plain text
#: en/diff-options.txt:481
@@ -4675,7 +4675,7 @@ msgstr ""
#: en/diff-options.txt:548
#, fuzzy, no-wrap, priority:280
msgid "-S<string>"
-msgstr "<耶쀧Е訝�>"
+msgstr "<>"
#. type: Plain text
#: en/diff-options.txt:552
@@ -4699,7 +4699,7 @@ msgstr ""
#: en/diff-options.txt:561
#, fuzzy, no-wrap, priority:280
msgid "-G<regex>"
-msgstr "<閭ｅ닕>"
+msgstr "<>"
#. type: Plain text
#: en/diff-options.txt:564
@@ -4870,7 +4870,7 @@ msgstr "--text"
#: en/diff-options.txt:659
#, fuzzy, priority:280
msgid "Treat all files as text."
-msgstr "�딀��됪뻼餓뜹퐪�싨뻼�у쨪��"
+msgstr ""
#. type: Labeled list
#: en/diff-options.txt:660
@@ -4924,7 +4924,7 @@ msgstr "--ignore-blank-lines"
#: en/diff-options.txt:680
#, fuzzy, priority:280
msgid "Ignore changes whose lines are all blank."
-msgstr "恙썹븼�닺죱�썸삸令븀쇋�꾢룜��"
+msgstr ""
#. type: Labeled list
#: en/diff-options.txt:681
@@ -4969,7 +4969,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:203 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:52 en/git-clone.txt:120 en/git-commit.txt:314 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:301 en/git-gc.txt:68 en/git-grep.txt:296 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:315 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:255 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:136 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:215 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:316 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:302 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:256 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5023,7 +5023,7 @@ msgid "Allow (or disallow) external text conversion filters to be run when compa
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:85
+#: en/diff-options.txt:722 en/git-status.txt:87
#, no-wrap, priority:280
msgid "--ignore-submodules[=<when>]"
msgstr ""
@@ -5044,7 +5044,7 @@ msgstr ""
#: en/diff-options.txt:737
#, fuzzy, priority:280
msgid "Show the given source prefix instead of \"a/\"."
-msgstr "�양ㅊ瀯쇿츣�꾣틦�띸��뽨빰 \"a/\""
+msgstr " \"a/\""
#. type: Labeled list
#: en/diff-options.txt:738
@@ -5056,7 +5056,7 @@ msgstr ""
#: en/diff-options.txt:740
#, fuzzy, priority:280
msgid "Show the given destination prefix instead of \"b/\"."
-msgstr "�양ㅊ瀯쇿츣�꾤쎅�뉐뎺煐��뽨빰 \"b/\""
+msgstr " \"b/\""
#. type: Labeled list
#: en/diff-options.txt:741
@@ -5068,7 +5068,7 @@ msgstr "--no-prefix"
#: en/diff-options.txt:743
#, fuzzy, priority:280
msgid "Do not show any source or destination prefix."
-msgstr "訝띷샑鹽뷰뻣鵝뺞틦�뚨쎅�뉐뎺煐�"
+msgstr ""
#. type: Labeled list
#: en/diff-options.txt:744
@@ -5080,7 +5080,7 @@ msgstr ""
#: en/diff-options.txt:746
#, fuzzy, priority:280
msgid "Prepend an additional prefix to every line of output."
-msgstr "渦볟눣�꾣캀訝�烏뚪셿�졾뎺煐�"
+msgstr ""
#. type: Labeled list
#: en/diff-options.txt:747
@@ -5101,7 +5101,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:265 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:266 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5233,7 +5233,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:48 en/git-commit.txt:317 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:50 en/git-commit.txt:319 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5245,13 +5245,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:34 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:195 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:347 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:278 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:279 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:35 en/git-fast-import.txt:37 en/git-filter-branch.txt:196 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:279 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:280 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5283,7 +5283,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:112 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:113 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5298,7 +5298,7 @@ msgstr "--keep"
#: en/fetch-options.txt:85
#, fuzzy, priority:220
msgid "Keep downloaded pack."
-msgstr "岳앮똻訝뗨슬��"
+msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:87
@@ -5361,7 +5361,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:47 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:97 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:326 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:301 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:85
+#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:98 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:302 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5427,187 +5427,211 @@ msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:167
+#: en/fetch-options.txt:164
#, priority:220
-msgid "Number of parallel children to be used for fetching submodules. Each will fetch from different submodules, such that fetching many submodules will be faster. By default submodules will be fetched one at a time."
+msgid "Number of parallel children to be used for all forms of fetching."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:169
+#, priority:220
+msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:172
+#, priority:220
+msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:168 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:173 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:171
+#: en/fetch-options.txt:176
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:172
+#: en/fetch-options.txt:177 en/git-branch.txt:225 en/git-push.txt:349
+#, ignore-same, no-wrap, priority:240
+msgid "--set-upstream"
+msgstr "--set-upstream"
+
+#. type: Plain text
+#: en/fetch-options.txt:183
+#, priority:220
+msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:184
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:188
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177
+#: en/fetch-options.txt:189
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:184
+#: en/fetch-options.txt:196
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:199
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:194
+#: en/fetch-options.txt:206
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:195 en/git-clone.txt:182
+#: en/fetch-options.txt:207 en/git-clone.txt:182
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:212
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:202 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:51 en/git-clone.txt:119 en/git-commit.txt:313 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:300 en/git-grep.txt:295 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:314 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:254 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:135
+#: en/fetch-options.txt:214 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:315 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:301 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:255 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:207
+#: en/fetch-options.txt:219
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:208 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:298 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:318 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:139
+#: en/fetch-options.txt:220 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:300 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:209 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:299 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:319 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:140
+#: en/fetch-options.txt:221 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:301 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:211 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:142
+#: en/fetch-options.txt:223 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:150
#, fuzzy, priority:300
msgid "Be verbose."
-msgstr "�쀩빣渦볟눣"
+msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:213 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:326 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:258 en/git-switch.txt:144 en/merge-options.txt:143
+#: en/fetch-options.txt:225 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:328 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:259 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:218 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:230 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:219 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:231 en/git-ls-remote.txt:73 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:220 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:232 en/git-clone.txt:135 en/git-ls-remote.txt:74
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-clone.txt:142
+#: en/fetch-options.txt:239 en/git-clone.txt:142
#, priority:300
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:228
+#: en/fetch-options.txt:240
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:233
+#: en/fetch-options.txt:245
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:234
+#: en/fetch-options.txt:246
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:240
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:241 en/git-push.txt:398
+#: en/fetch-options.txt:253 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:242 en/git-push.txt:399
+#: en/fetch-options.txt:254 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:244 en/git-push.txt:401
+#: en/fetch-options.txt:256 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:245 en/git-push.txt:402
+#: en/fetch-options.txt:257 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:246 en/git-push.txt:403
+#: en/fetch-options.txt:258 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:247 en/git-push.txt:405
+#: en/fetch-options.txt:259 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5628,7 +5652,7 @@ msgstr ""
#: en/git-add.txt:7
#, fuzzy, priority:300
msgid "git-add - Add file contents to the index"
-msgstr "曆삣뒥�뉏뻑�끻��녕뇨凉�"
+msgstr ""
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10
@@ -5647,7 +5671,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:20 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:67 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
+#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr ""
@@ -5689,13 +5713,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr ""
#. type: Title -
-#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:83 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:85 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:115 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:253 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:86 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:254 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:52 en/git-grep.txt:308 en/git-status.txt:148
+#: en/git-add.txt:52 en/git-grep.txt:325 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
@@ -5707,7 +5731,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:67 en/git-grep.txt:314
+#: en/git-add.txt:67 en/git-grep.txt:331
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -5722,16 +5746,16 @@ msgstr ""
#: en/git-add.txt:80
#, fuzzy, priority:300
msgid "Allow adding otherwise ignored files."
-msgstr "�곮�曆삣뒥恙썹븼�꾣뻼餓�"
+msgstr ""
#. type: Labeled list
-#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:42 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:394 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:43 en/git-rebase.txt:395 en/git-rebase.txt:536 en/git-svn.txt:297
+#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5755,7 +5779,7 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:275 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
@@ -5845,7 +5869,7 @@ msgid "This option is primarily to help users who are used to older versions of
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:146 en/git-format-patch.txt:101 en/git-submodule.txt:340
+#: en/git-add.txt:146 en/git-format-patch.txt:102 en/git-submodule.txt:341
#, no-wrap, priority:300
msgid "-N"
msgstr ""
@@ -5935,7 +5959,7 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:343 en/git-grep.txt:304 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
+#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:345 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr ""
@@ -5947,7 +5971,7 @@ msgid "This option can be used to separate command-line options from the list of
msgstr ""
#. type: Title -
-#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:357 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:153 en/git-fetch.txt:242 en/git-filter-branch.txt:234 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:634 en/git-grep.txt:316 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:206 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:359 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:638 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr ""
@@ -5989,7 +6013,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:221 en/git-rebase.txt:591
+#: en/git-add.txt:221 en/git-rebase.txt:613
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr ""
@@ -6001,7 +6025,7 @@ msgid "When the command enters the interactive mode, it shows the output of the
msgstr ""
#. type: Plain text
-#: en/git-add.txt:230 en/git-clean.txt:83
+#: en/git-add.txt:230 en/git-clean.txt:85
#, priority:300
msgid "The command loop shows the list of subcommands available, and gives a prompt \"What now> \". In general, when the prompt ends with a single '>', you can pick only one of the choices given and type return, like this:"
msgstr ""
@@ -6104,7 +6128,7 @@ msgstr ""
#: en/git-add.txt:296
#, no-wrap, priority:300
msgid "revert"
-msgstr "瓦섇렅"
+msgstr ""
#. type: Plain text
#: en/git-add.txt:301
@@ -6116,7 +6140,7 @@ msgstr ""
#: en/git-add.txt:302
#, fuzzy, no-wrap, priority:300
msgid "add untracked"
-msgstr "曆삣뒥�よ퇎甕ょ쉪"
+msgstr ""
#. type: Plain text
#: en/git-add.txt:306
@@ -6128,7 +6152,7 @@ msgstr ""
#: en/git-add.txt:307
#, fuzzy, no-wrap, priority:300
msgid "patch"
-msgstr "瓮�푶"
+msgstr ""
#. type: Plain text
#: en/git-add.txt:314
@@ -6221,7 +6245,7 @@ msgstr ""
#: en/git-add.txt:365
#, fuzzy, no-wrap, priority:300
msgid "modified content"
-msgstr "岳�뵻�꾢냵若�, "
+msgstr ", "
#. type: Plain text
#: en/git-add.txt:372
@@ -6302,7 +6326,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:135 en/git-commit-tree.txt:118 en/git-commit.txt:487 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:241 en/git-fast-import.txt:1503 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:679 en/git-gc.txt:154 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:112 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:247 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:519 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:292 en/git-status.txt:434 en/git-submodule.txt:436 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
+#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:489 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1526 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:683 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:437 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
@@ -6314,13 +6338,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:139 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:495 en/git-config.txt:492 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:245 en/git-fast-import.txt:1507 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:480 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:683 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:334 en/git-gui.txt:126 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:116 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:230 en/git-merge-file.txt:94 en/git-merge-index.txt:78 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1052 en/git-receive-pack.txt:251 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:123 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:523 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:300 en/git-status.txt:438 en/git-stripspace.txt:93 en/git-submodule.txt:440 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
+#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:497 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1530 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:693 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:687 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:441 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
#, no-wrap, priority:300
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:140 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:496 en/git-config.txt:493 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:246 en/git-fast-import.txt:1508 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:481 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:684 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:335 en/git-gui.txt:127 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:117 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:231 en/git-merge-file.txt:95 en/git-merge-index.txt:79 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1053 en/git-receive-pack.txt:252 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:124 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:524 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:301 en/git-status.txt:439 en/git-stripspace.txt:94 en/git-submodule.txt:441 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
+#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:498 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1531 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:694 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:688 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:442 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6335,7 +6359,7 @@ msgstr "git-am(1)"
#: en/git-am.txt:7
#, fuzzy, priority:100
msgid "git-am - Apply a series of patches from a mailbox"
-msgstr "佯붺뵪����쇔폀�꾤내�쀨‥訝�"
+msgstr ""
#. type: Plain text
#: en/git-am.txt:20
@@ -6370,7 +6394,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:118 en/git-rebase.txt:387 en/git-revert.txt:98 en/merge-options.txt:73
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:119 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6412,7 +6436,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:969
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:985
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6442,7 +6466,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:267 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:989
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1005
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6534,37 +6558,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:303 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:304 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:307 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:373 en/git-rebase.txt:524
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:374
+#: en/git-am.txt:109 en/git-rebase.txt:396
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:337
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6621,10 +6645,10 @@ msgstr ""
#: en/git-am.txt:130
#, fuzzy, priority:100
msgid "Run interactively."
-msgstr "餓δ벡雅믣폀�밧폀瓦먫죱"
+msgstr ""
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:380 en/git-rebase.txt:521
+#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6636,7 +6660,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:381 en/git-rebase.txt:522
+#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6648,7 +6672,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:256 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6660,31 +6684,31 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:333 en/git-rebase.txt:308 en/git-revert.txt:91 en/merge-options.txt:58
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:335 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:334 en/git-rebase.txt:309 en/git-revert.txt:92 en/merge-options.txt:59
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:336 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:338 en/git-rebase.txt:313 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:340 en/git-rebase.txt:331 en/git-revert.txt:96
#, priority:280
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:228 en/sequencer.txt:1
+#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:246 en/sequencer.txt:1
#, ignore-same, no-wrap, priority:240
msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:406 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:997
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1013
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6714,7 +6738,7 @@ msgid "When a patch failure occurs, <msg> will be printed to the screen before e
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:231 en/sequencer.txt:15
+#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:249 en/sequencer.txt:15
#, ignore-same, no-wrap, priority:240
msgid "--abort"
msgstr "--abort"
@@ -6723,10 +6747,10 @@ msgstr "--abort"
#: en/git-am.txt:174
#, fuzzy, priority:100
msgid "Restore the original branch and abort the patching operation."
-msgstr "�℡쨳�잌쭓�녷뵱亮띄퍑閭€돀烏δ툈�띴퐳��"
+msgstr ""
#. type: Labeled list
-#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:238 en/sequencer.txt:10
+#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:256 en/sequencer.txt:10
#, ignore-same, no-wrap, priority:240
msgid "--quit"
msgstr "--quit"
@@ -6738,7 +6762,7 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:262
+#: en/git-am.txt:179 en/git-rebase.txt:280
#, ignore-same, no-wrap, priority:100
msgid "--show-current-patch"
msgstr "--show-current-patch"
@@ -6750,7 +6774,7 @@ msgid "Show the patch being applied when \"git am\" is stopped because of confli
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:451 en/git-format-patch.txt:351 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:188 en/git-tag.txt:231
+#: en/git-am.txt:184 en/git-commit.txt:453 en/git-format-patch.txt:355 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
@@ -6834,7 +6858,7 @@ msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the curren
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:471 en/git-gc.txt:147
+#: en/git-am.txt:234 en/git-commit.txt:473 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
@@ -6891,7 +6915,7 @@ msgstr "git-apply(1)"
#: en/git-apply.txt:7
#, fuzzy, priority:100
msgid "git-apply - Apply a patch to files and/or to the index"
-msgstr "佯붺뵪訝�訝よ‥訝곩댆�뉏뻑��/�뽫뇨凉뺝뙷"
+msgstr "/"
#. type: Plain text
#: en/git-apply.txt:20
@@ -6932,7 +6956,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:322 en/merge-options.txt:84
+#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -6974,7 +6998,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:291
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:292
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7025,7 +7049,7 @@ msgstr "--reverse"
#: en/git-apply.txt:107
#, fuzzy, priority:100
msgid "Apply the patch in reverse."
-msgstr "�띶릲佯붺뵪烏δ툈"
+msgstr ""
#. type: Plain text
#: en/git-apply.txt:114
@@ -7046,7 +7070,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:342
+#: en/git-apply.txt:134 en/git-rebase.txt:360
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7262,7 +7286,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:330 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:398 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:332 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -7495,7 +7519,7 @@ msgstr "git-archive(1)"
#: en/git-archive.txt:7
#, fuzzy, priority:100
msgid "git-archive - Create an archive of files from a named tree"
-msgstr "�뷰틢訝�訝ゆ뙁若싩쉪�묈닗兩뷸뻼餓뜹춼旅�"
+msgstr ""
#. type: Plain text
#: en/git-archive.txt:16
@@ -7559,7 +7583,7 @@ msgstr ""
#: en/git-archive.txt:53
#, fuzzy, priority:100
msgid "Prepend <prefix>/ to each filename in the archive."
-msgstr "訝뷴퐩旅ｄ릎驪뤶릉瓮�푶�띶뒥訝듿뎺煐�"
+msgstr ""
#. type: Labeled list
#: en/git-archive.txt:54
@@ -7625,7 +7649,7 @@ msgstr ""
#: en/git-archive.txt:77 en/git-checkout.txt:338 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:337
#, fuzzy, no-wrap, priority:240
msgid "<tree-ish>"
-msgstr "�묉닑�먧벡"
+msgstr ""
#. type: Plain text
#: en/git-archive.txt:79
@@ -7871,7 +7895,7 @@ msgstr "git-bisect(1)"
#: en/git-bisect.txt:7
#, fuzzy, priority:100
msgid "git-bisect - Use binary search to find the commit that introduced a bug"
-msgstr "�싪퓝雅뚦늽�ζ돻若싦퐤凉뺝뀯 bug �꾣룓雅�"
+msgstr " bug "
#. type: Plain text
#: en/git-bisect.txt:13
@@ -8634,7 +8658,7 @@ msgstr "git-blame(1)"
#: en/git-blame.txt:7
#, fuzzy, priority:100
msgid "git-blame - Show what revision and author last modified each line of a file"
-msgstr "�양ㅊ�뉏뻑驪뤶�烏뚧��롣엶�밭쉪�덃쑍�뚥엶�배��"
+msgstr ""
#. type: Plain text
#: en/git-blame.txt:16
@@ -8690,7 +8714,7 @@ msgstr ""
#: en/git-blame.txt:55
#, fuzzy, priority:100
msgid "Use the same output mode as linkgit:git-annotate[1] (Default: off)."
-msgstr "鵝욜뵪�� git-annotate �멨릪�꾥풏�뷸Æ凉륅펷容섋�竊싧뀽��펹"
+msgstr " git-annotate "
#. type: Labeled list
#: en/git-blame.txt:56
@@ -9184,7 +9208,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:525
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9217,16 +9241,16 @@ msgstr "--ignore-case"
#: en/git-branch.txt:152
#, fuzzy, priority:240
msgid "Sorting and filtering branches are case insensitive."
-msgstr "�믣틣�뚩퓝譯ㅵ콪雅롥ㄷ弱뤷넍訝띷븦��"
+msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:153 en/git-status.txt:126 en/git-tag.txt:134
+#: en/git-branch.txt:153 en/git-status.txt:130 en/git-tag.txt:134
#, no-wrap, priority:280
msgid "--column[=<options>]"
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:154 en/git-status.txt:127 en/git-tag.txt:135
+#: en/git-branch.txt:154 en/git-status.txt:131 en/git-tag.txt:135
#, ignore-same, no-wrap, priority:280
msgid "--no-column"
msgstr "--no-column"
@@ -9351,12 +9375,6 @@ msgstr "--no-track"
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
-#. type: Labeled list
-#: en/git-branch.txt:225 en/git-push.txt:349
-#, ignore-same, no-wrap, priority:240
-msgid "--set-upstream"
-msgstr "--set-upstream"
-
#. type: Plain text
#: en/git-branch.txt:228
#, priority:240
@@ -9493,7 +9511,7 @@ msgstr ""
#: en/git-branch.txt:277
#, fuzzy, no-wrap, priority:240
msgid "<newbranch>"
-msgstr "[�겼늽��]"
+msgstr "[]"
#. type: Plain text
#: en/git-branch.txt:280
@@ -9626,7 +9644,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-filter-branch.txt:449 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -9968,7 +9986,7 @@ msgstr "git-cat-file(1)"
#: en/git-cat-file.txt:7
#, fuzzy, priority:100
msgid "git-cat-file - Provide content or type and size information for repository objects"
-msgstr "�먧풘餓볟틩野배괌�꾢냵若밤�곭굳�뗦닑鸚㎩컦"
+msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:14
@@ -9994,7 +10012,7 @@ msgstr ""
#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:325
#, fuzzy, no-wrap, priority:240
msgid "<object>"
-msgstr "野배괌"
+msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:35
@@ -10246,7 +10264,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:152 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10895,7 +10913,7 @@ msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will al
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:226
+#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
@@ -10958,7 +10976,7 @@ msgstr ""
#: en/git-check-mailmap.txt:13
#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid "'git check-mailmap' [<options>] <contact>...\n"
-msgstr "git check-mailmap [<�됮」>] <�붺내�겼�>..."
+msgstr "git check-mailmap [<>] <>..."
#. type: Plain text
#: en/git-check-mailmap.txt:22
@@ -11023,7 +11041,7 @@ msgstr ""
#: en/git-checkout-index.txt:37
#, fuzzy, priority:100
msgid "forces overwrite of existing files"
-msgstr "凉뷴댍誤녺썣�경쐣�꾣뻼餓�"
+msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:42
@@ -11092,7 +11110,7 @@ msgid "Only meaningful with `--stdin`; paths are separated with NUL character in
msgstr ""
#. type: Plain text
-#: en/git-checkout-index.txt:73 en/git-commit.txt:345 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
+#: en/git-checkout-index.txt:73 en/git-commit.txt:347 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
#, priority:280
msgid "Do not interpret any more arguments as options."
msgstr ""
@@ -11263,7 +11281,7 @@ msgstr "git-checkout(1)"
#: en/git-checkout.txt:7
#, fuzzy, priority:240
msgid "git-checkout - Switch branches or restore working tree files"
-msgstr "�뉑뜟�녷뵱�뽪걿鸚띶램鵝쒎뙷�뉏뻑"
+msgstr ""
#. type: Plain text
#: en/git-checkout.txt:18
@@ -11410,10 +11428,10 @@ msgstr ""
#: en/git-checkout.txt:111 en/git-read-tree.txt:135 en/git-switch.txt:143
#, fuzzy, priority:240
msgid "Quiet, suppress feedback messages."
-msgstr "�묈댍�띺쫰岳→겘"
+msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:144
+#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:152
#, ignore-same, no-wrap, priority:240
msgid "--no-progress"
msgstr "--no-progress"
@@ -11599,7 +11617,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:241 en/git-rebase.txt:268 en/git-rebase.txt:529 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:354 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
+#: en/git-checkout.txt:241 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:355 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11719,7 +11737,7 @@ msgid "In the default overlay mode, `git checkout` never removes files from the
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:312 en/git-rebase.txt:225 en/git-switch.txt:36
+#: en/git-checkout.txt:312 en/git-rebase.txt:243 en/git-switch.txt:36
#, fuzzy, no-wrap, priority:240
msgid "<branch>"
msgstr "'branch'"
@@ -11746,7 +11764,7 @@ msgstr ""
#: en/git-checkout.txt:327
#, fuzzy, no-wrap, priority:240
msgid "<new_branch>"
-msgstr "�겼늽��"
+msgstr ""
#. type: Plain text
#: en/git-checkout.txt:329 en/git-switch.txt:41
@@ -12001,7 +12019,7 @@ msgstr ""
#: en/git-checkout.txt:506
#, fuzzy, priority:240
msgid "switch branch"
-msgstr "�뉑뜟�녷뵱"
+msgstr ""
#. type: Plain text
#: en/git-checkout.txt:507 en/git-restore.txt:131
@@ -12425,7 +12443,7 @@ msgid "This option determines how the commit message will be cleaned up before b
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:65 en/git-clean.txt:61
+#: en/git-cherry-pick.txt:65 en/git-clean.txt:63
#, ignore-same, no-wrap, priority:100
msgid "-x"
msgstr "-x"
@@ -12446,7 +12464,7 @@ msgstr ""
#: en/git-cherry-pick.txt:84 en/git-revert.txt:50
#, fuzzy, no-wrap, priority:100
msgid "-m parent-number"
-msgstr "�띄폋��"
+msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:85 en/git-revert.txt:51
@@ -12509,7 +12527,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:249 en/git-rebase.txt:532
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:267 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12533,7 +12551,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:282 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:109
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12551,7 +12569,7 @@ msgid "-X<option>"
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:125
#, no-wrap, priority:240
msgid "--strategy-option=<option>"
msgstr ""
@@ -12714,13 +12732,13 @@ msgstr "git-cherry(1)"
#: en/git-cherry.txt:7
#, fuzzy, priority:100
msgid "git-cherry - Find commits yet to be applied to upstream"
-msgstr "�ζ돻弱싨쑋佯붺뵪�겻툓歷며쉪�먧벡"
+msgstr ""
#. type: Plain text
#: en/git-cherry.txt:12
#, fuzzy, no-wrap, priority:100
msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
-msgstr "git cherry [-v] [<訝딀만> [<鸚�> [<�먨댍>]]]"
+msgstr "git cherry [-v] [<> [<> [<>]]]"
#. type: Plain text
#: en/git-cherry.txt:17
@@ -12747,10 +12765,10 @@ msgid "Show the commit subjects next to the SHA1s."
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:32 en/git-rebase.txt:220
+#: en/git-cherry.txt:32 en/git-rebase.txt:238
#, fuzzy, no-wrap, priority:100
msgid "<upstream>"
-msgstr "訝딀만"
+msgstr ""
#. type: Plain text
#: en/git-cherry.txt:35
@@ -12765,7 +12783,7 @@ msgid "<head>"
msgstr ""
#. type: Plain text
-#: en/git-cherry.txt:38 en/git-rebase.txt:227
+#: en/git-cherry.txt:38 en/git-rebase.txt:245
#, priority:100
msgid "Working branch; defaults to HEAD."
msgstr ""
@@ -12951,13 +12969,13 @@ msgstr "git-clean(1)"
#: en/git-clean.txt:7
#, fuzzy, priority:100
msgid "git-clean - Remove untracked files from the working tree"
-msgstr "餓롥램鵝쒎뙷訝�닠�ㅶ쑋瓮잒릉�뉏뻑"
+msgstr ""
#. type: Plain text
#: en/git-clean.txt:12
#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <path>...\n"
-msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e <與▼폀>] [-x | -X] [--] <瓮�푶>..."
+msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e <>] [-x | -X] [--] <>..."
#. type: Plain text
#: en/git-clean.txt:18
@@ -12978,85 +12996,85 @@ msgid "If any optional `<path>...` arguments are given, only those paths are aff
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:33
+#: en/git-clean.txt:35
#, priority:100
-msgid "Remove untracked directories in addition to untracked files. If an untracked directory is managed by a different Git repository, it is not removed by default. Use -f option twice if you really want to remove such a directory."
+msgid "Normally, when no <path> is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. If any paths are specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under `--force`) will be removed."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:41
+#: en/git-clean.txt:43
#, priority:100
-msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f, -n or -i. Git will refuse to delete directories with .git sub directory or file unless a second -f is given."
+msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f or -i. Git will refuse to modify untracked nested git repositories (directories with a .git subdirectory) unless a second -f is given."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:46
+#: en/git-clean.txt:48
#, priority:100
msgid "Show what would be done and clean files interactively. See ``Interactive mode'' for details."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:50
+#: en/git-clean.txt:52
#, priority:100
msgid "Don't actually remove anything, just show what would be done."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:55
+#: en/git-clean.txt:57
#, priority:100
msgid "Be quiet, only report errors, but not the files that are successfully removed."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:56
+#: en/git-clean.txt:58
#, no-wrap, priority:100
msgid "-e <pattern>"
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:57 en/git-ls-files.txt:85 en/git-name-rev.txt:33
+#: en/git-clean.txt:59 en/git-ls-files.txt:85 en/git-name-rev.txt:33
#, no-wrap, priority:100
msgid "--exclude=<pattern>"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:60
+#: en/git-clean.txt:62
#, priority:100
msgid "Use the given exclude pattern in addition to the standard ignore rules (see linkgit:gitignore[5])."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:68
+#: en/git-clean.txt:70
#, priority:100
msgid "Don't use the standard ignore rules (see linkgit:gitignore[5]), but still use the ignore rules given with `-e` options from the command line. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git restore' or 'git reset') to create a pristine working directory to test a clean build."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:69
+#: en/git-clean.txt:71
#, no-wrap, priority:100
msgid "-X"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:72
+#: en/git-clean.txt:74
#, priority:100
msgid "Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files."
msgstr ""
#. type: Title -
-#: en/git-clean.txt:74
+#: en/git-clean.txt:76
#, no-wrap, priority:100
msgid "Interactive mode"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:78
+#: en/git-clean.txt:80
#, priority:100
msgid "When the command enters the interactive mode, it shows the files and directories to be cleaned, and goes into its interactive command loop."
msgstr ""
#. type: delimited block -
-#: en/git-clean.txt:89
+#: en/git-clean.txt:91
#, no-wrap, priority:100
msgid ""
" *** Commands ***\n"
@@ -13066,91 +13084,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:92
+#: en/git-clean.txt:94
#, priority:100
msgid "You also could say `c` or `clean` above as long as the choice is unique."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:94
+#: en/git-clean.txt:96
#, priority:100
msgid "The main command loop has 6 subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:95
+#: en/git-clean.txt:97
#, no-wrap, priority:100
msgid "clean"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:98
+#: en/git-clean.txt:100
#, priority:100
msgid "Start cleaning files and directories, and then quit."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:99
+#: en/git-clean.txt:101
#, no-wrap, priority:100
msgid "filter by pattern"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:107
+#: en/git-clean.txt:109
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Input ignore patterns>>\" prompt. You can input space-separated patterns to exclude files and directories from deletion. E.g. \"*.c *.h\" will excludes files end with \".c\" and \".h\" from deletion. When you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:108
+#: en/git-clean.txt:110
#, no-wrap, priority:100
msgid "select by numbers"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:119
+#: en/git-clean.txt:121
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Select items to delete>>\" prompt. When the prompt ends with double '>>' like this, you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything. Also when you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:120
+#: en/git-clean.txt:122
#, no-wrap, priority:100
msgid "ask each"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:125
+#: en/git-clean.txt:127
#, priority:100
msgid "This will start to clean, and you must confirm one by one in order to delete items. Please note that this action is not as efficient as the above two actions."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:126
+#: en/git-clean.txt:128
#, fuzzy, no-wrap, priority:100
msgid "quit"
-msgstr "�숅퍡與▼폀"
+msgstr ""
#. type: Plain text
-#: en/git-clean.txt:129
+#: en/git-clean.txt:131
#, priority:100
msgid "This lets you quit without do cleaning."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:130
+#: en/git-clean.txt:132
#, no-wrap, priority:100
msgid "help"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:133
+#: en/git-clean.txt:135
#, priority:100
msgid "Show brief usage of interactive git-clean."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:137 en/git-status.txt:436
+#: en/git-clean.txt:139 en/git-status.txt:440
#, ignore-same, priority:280
msgid "linkgit:gitignore[5]"
msgstr "linkgit:gitignore[5]"
@@ -13165,7 +13183,7 @@ msgstr "git-clone(1)"
#: en/git-clone.txt:7
#, fuzzy, priority:300
msgid "git-clone - Clone a repository into a new directory"
-msgstr "�뗩쉮餓볟틩�겻�訝ゆ뼭��퐬"
+msgstr ""
#. type: Plain text
#: en/git-clone.txt:20
@@ -13289,7 +13307,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:108 en/git-submodule.txt:392
+#: en/git-clone.txt:108 en/git-submodule.txt:393
#, ignore-same, no-wrap, priority:300
msgid "--dissociate"
msgstr "--dissociate"
@@ -13519,7 +13537,7 @@ msgstr "--[no-]remote-submodules"
#. type: Plain text
#: en/git-clone.txt:269
#, priority:300
-msgid "All submodules which are cloned will use the status of the submodule�셲 remote-tracking branch to update the submodule, rather than the superproject�셲 recorded SHA-1. Equivalent to passing `--remote` to `git submodule update`."
+msgid "All submodules which are cloned will use the status of the submodules remote-tracking branch to update the submodule, rather than the superprojects recorded SHA-1. Equivalent to passing `--remote` to `git submodule update`."
msgstr ""
#. type: Labeled list
@@ -13535,13 +13553,13 @@ msgid "Instead of placing the cloned repository where it is supposed to be, plac
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:277 en/git-submodule.txt:416
+#: en/git-clone.txt:277 en/git-submodule.txt:417
#, no-wrap, priority:300
msgid "-j <n>"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:278 en/git-submodule.txt:417
+#: en/git-clone.txt:278 en/git-submodule.txt:418
#, no-wrap, priority:300
msgid "--jobs <n>"
msgstr ""
@@ -13556,7 +13574,7 @@ msgstr ""
#: en/git-clone.txt:282 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:81 en/git-push.txt:50 en/pull-fetch-param.txt:1
#, fuzzy, no-wrap, priority:300
msgid "<repository>"
-msgstr "餓볟틩"
+msgstr ""
#. type: Plain text
#: en/git-clone.txt:286
@@ -13899,7 +13917,7 @@ msgid "Read the commit log message from the given file. Use `-` to read from the
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:68 en/git-commit.txt:339
+#: en/git-commit-tree.txt:68 en/git-commit.txt:341
#, ignore-same, no-wrap, priority:280
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
@@ -13983,7 +14001,7 @@ msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:477 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:428 en/git-svn.txt:1156
+#: en/git-commit-tree.txt:114 en/git-commit.txt:479 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:429 en/git-svn.txt:1156
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
@@ -14289,13 +14307,13 @@ msgid "When editing the commit message, start the editor with the contents in th
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:173 en/merge-options.txt:81
+#: en/git-commit.txt:173 en/merge-options.txt:85
#, priority:280
msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:175 en/git-rebase.txt:330
+#: en/git-commit.txt:175 en/git-rebase.txt:348 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14457,7 +14475,7 @@ msgstr "--no-post-rewrite"
#: en/git-commit.txt:259
#, fuzzy, priority:280
msgid "Bypass the post-rewrite hook."
-msgstr "瀯뺠퓝 post-rewrite �⒴춴"
+msgstr " post-rewrite "
#. type: Labeled list
#: en/git-commit.txt:261
@@ -14499,118 +14517,118 @@ msgstr ""
#: en/git-commit.txt:284 en/git-status.txt:61
#, fuzzy, priority:280
msgid "Show untracked files."
-msgstr "亦→쐣�よ퇎甕ょ쉪�뉏뻑��\n"
+msgstr "\n"
#. type: Plain text
-#: en/git-commit.txt:288
+#: en/git-commit.txt:289
#, priority:280
msgid "The mode parameter is optional (defaults to 'all'), and is used to specify the handling of untracked files; when -u is not used, the default is 'normal', i.e. show untracked files and directories."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:290 en/git-status.txt:67 en/git-status.txt:107
+#: en/git-commit.txt:291 en/git-status.txt:68 en/git-status.txt:110
#, priority:280
msgid "The possible options are:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:292
+#: en/git-commit.txt:293
#, no-wrap, priority:280
msgid "'no' - Show no untracked files\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:293
+#: en/git-commit.txt:294
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:294 en/git-status.txt:71
+#: en/git-commit.txt:295 en/git-status.txt:72
#, no-wrap, priority:280
msgid "'all' - Also shows individual files in untracked directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:297 en/git-status.txt:84
+#: en/git-commit.txt:298 en/git-status.txt:85
#, priority:280
msgid "The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:308
+#: en/git-commit.txt:310
#, priority:280
msgid "Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template to help the user describe the commit by reminding what changes the commit has. Note that this diff output doesn't have its lines prefixed with '#'. This diff will not be a part of the commit message. See the `commit.verbose` configuration variable in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:312
+#: en/git-commit.txt:314
#, priority:280
msgid "If specified twice, show in addition the unified diff between what would be committed and the worktree files, i.e. the unstaged changes to tracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:316
+#: en/git-commit.txt:318
#, priority:280
msgid "Suppress commit summary message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:321
+#: en/git-commit.txt:323
#, priority:280
msgid "Do not create a commit, but show a list of paths that are to be committed, paths with local changes that will be left uncommitted and paths that are untracked."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:322
+#: en/git-commit.txt:324
#, ignore-same, no-wrap, priority:280
msgid "--status"
msgstr "--status"
#. type: Plain text
-#: en/git-commit.txt:327
+#: en/git-commit.txt:329
#, priority:280
msgid "Include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the commit message. Defaults to on, but can be used to override configuration variable commit.status."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:328
+#: en/git-commit.txt:330
#, ignore-same, no-wrap, priority:280
msgid "--no-status"
msgstr "--no-status"
#. type: Plain text
-#: en/git-commit.txt:332
+#: en/git-commit.txt:334
#, priority:280
msgid "Do not include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the default commit message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:342
+#: en/git-commit.txt:344
#, priority:280
msgid "Countermand `commit.gpgSign` configuration variable that is set to force each and every commit to be signed."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:346 en/git-rm.txt:29
+#: en/git-commit.txt:348 en/git-rm.txt:29
#, ignore-ellipsis, no-wrap, priority:280
msgid "<file>..."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:352
+#: en/git-commit.txt:354
#, priority:280
msgid "When files are given on the command line, the command commits the contents of the named files, without recording the changes already staged. The contents of these files are also staged for the next commit on top of what have been staged before."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:369
+#: en/git-commit.txt:371
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:375
+#: en/git-commit.txt:377
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14620,13 +14638,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:383
+#: en/git-commit.txt:385
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:388
+#: en/git-commit.txt:390
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14635,19 +14653,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:393
+#: en/git-commit.txt:395
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:398
+#: en/git-commit.txt:400
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:404
+#: en/git-commit.txt:406
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14657,31 +14675,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:411
+#: en/git-commit.txt:413
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:414 en/git-commit.txt:440
+#: en/git-commit.txt:416 en/git-commit.txt:442
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:418
+#: en/git-commit.txt:420
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:426
+#: en/git-commit.txt:428
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:432
+#: en/git-commit.txt:434
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14691,55 +14709,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:437
+#: en/git-commit.txt:439
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:448
+#: en/git-commit.txt:450
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:460
+#: en/git-commit.txt:462
#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:464
+#: en/git-commit.txt:466
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:469
+#: en/git-commit.txt:471
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:475
+#: en/git-commit.txt:477
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:479
+#: en/git-commit.txt:481
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:485
+#: en/git-commit.txt:487
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:493
+#: en/git-commit.txt:495
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -14754,7 +14772,7 @@ msgstr "git-config(1)"
#: en/git-config.txt:7
#, fuzzy, priority:100
msgid "git-config - Get and set repository or global options"
-msgstr "�룟룚�뚩�營�퍜佯볠닑�끻뀲掠��됮」"
+msgstr ""
#. type: Plain text
#: en/git-config.txt:27
@@ -15407,211 +15425,211 @@ msgstr ""
msgid "Given a .git/config like this:"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:347
+#. type: delimited block -
+#: en/git-config.txt:348
#, no-wrap, priority:100
msgid ""
-"\t#\n"
-"\t# This is the config file, and\n"
-"\t# a '#' or ';' character indicates\n"
-"\t# a comment\n"
-"\t#\n"
+"#\n"
+"# This is the config file, and\n"
+"# a '#' or ';' character indicates\n"
+"# a comment\n"
+"#\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:352
+#. type: delimited block -
+#: en/git-config.txt:353 en/git.txt:310
#, no-wrap, priority:100
msgid ""
-"\t; core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"; core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:357
+#. type: delimited block -
+#: en/git-config.txt:358
#, no-wrap, priority:100
msgid ""
-"\t; Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"; Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:362
+#. type: delimited block -
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
-"\t; Proxy settings\n"
-"\t[core]\n"
-"\t\tgitproxy=proxy-command for kernel.org\n"
-"\t\tgitproxy=default-proxy ; for all the rest\n"
+"; Proxy settings\n"
+"[core]\n"
+"\tgitproxy=proxy-command for kernel.org\n"
+"\tgitproxy=default-proxy ; for all the rest\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:369
+#. type: delimited block -
+#: en/git-config.txt:370
#, no-wrap, priority:100
msgid ""
-"\t; HTTP\n"
-"\t[http]\n"
-"\t\tsslVerify\n"
-"\t[http \"https://weak.example.com\"]\n"
-"\t\tsslVerify = false\n"
-"\t\tcookieFile = /tmp/cookie.txt\n"
+"; HTTP\n"
+"[http]\n"
+"\tsslVerify\n"
+"[http \"https://weak.example.com\"]\n"
+"\tsslVerify = false\n"
+"\tcookieFile = /tmp/cookie.txt\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:371
+#: en/git-config.txt:373
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:374
+#: en/git-config.txt:376
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:379
+#: en/git-config.txt:381
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:382
+#: en/git-config.txt:384
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:385
+#: en/git-config.txt:387
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:389
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:390
+#: en/git-config.txt:392
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:394
+#: en/git-config.txt:396
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:398
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:399
+#: en/git-config.txt:401
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:402 en/git-gui.txt:120 en/git-merge-index.txt:64
+#: en/git-config.txt:404 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:405
+#: en/git-config.txt:407
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:408
+#: en/git-config.txt:410
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:411
+#: en/git-config.txt:413
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:414
+#: en/git-config.txt:416
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:417
+#: en/git-config.txt:419
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:421
+#: en/git-config.txt:423
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:424
+#: en/git-config.txt:426
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:428
+#: en/git-config.txt:430
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:431
+#: en/git-config.txt:433
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:434
+#: en/git-config.txt:436
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:437
+#: en/git-config.txt:439
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:440
+#: en/git-config.txt:442
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:443
+#: en/git-config.txt:445
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:447
+#: en/git-config.txt:449
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:453
+#: en/git-config.txt:455
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15621,13 +15639,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:457
+#: en/git-config.txt:459
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:466
+#: en/git-config.txt:468
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15640,19 +15658,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:471 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1029 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
+#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:476
+#: en/git-config.txt:478
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:480
+#: en/git-config.txt:482
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15660,13 +15678,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:483
+#: en/git-config.txt:485
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:488
+#: en/git-config.txt:490
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15768,7 +15786,7 @@ msgstr "--human-readable"
#: en/git-count-objects.txt:51
#, fuzzy, priority:100
msgid "Print sizes in human readable format"
-msgstr "餓η뵪�룟룾瑥사쉪�쇔폀�양ㅊ鸚㎩컦"
+msgstr ""
#. type: Title =
#: en/git-credential-cache--daemon.txt:2
@@ -16391,7 +16409,7 @@ msgstr ""
#: en/git-cvsexportcommit.txt:84
#, fuzzy, priority:100
msgid "Verbose."
-msgstr "�쀩빣渦볟눣"
+msgstr ""
#. type: Labeled list
#: en/git-cvsexportcommit.txt:87
@@ -16458,7 +16476,7 @@ msgstr "git-cvsimport(1)"
#: en/git-cvsimport.txt:7
#, fuzzy, priority:100
msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
-msgstr "餓롥룱鸚뽨�訝や볶餓х댇�①쉪�띸쉰嶸←릤楹사퍨訝�떙�묇퐷�꾣빊��"
+msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:17
@@ -17029,7 +17047,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
msgstr ""
#. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:234
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
#, no-wrap, priority:100
msgid "LIMITATIONS"
msgstr ""
@@ -17622,7 +17640,7 @@ msgstr "git-daemon(1)"
#: en/git-daemon.txt:7
#, fuzzy, priority:100
msgid "git-daemon - A really simple server for Git repositories"
-msgstr "訝�訝ら씆躍며��뺟쉪 Git 餓볟틩�띶뒦��"
+msgstr " Git "
#. type: Plain text
#: en/git-daemon.txt:25
@@ -18188,7 +18206,7 @@ msgstr "git-describe(1)"
#: en/git-describe.txt:7
#, fuzzy, priority:260
msgid "git-describe - Give an object a human readable name based on an available ref"
-msgstr "�뷰틢訝�訝ょ렟耶섊쉪凉뺟뵪訝뷰�訝ゅ�穩↑돈訝�訝ゅ룾瑥사쉪�띸㎞"
+msgstr ""
#. type: Plain text
#: en/git-describe.txt:14
@@ -18323,7 +18341,7 @@ msgstr ""
#: en/git-describe.txt:96
#, fuzzy, no-wrap, priority:260
msgid "--match <pattern>"
-msgstr "�백뀓 <與▼폀>"
+msgstr " <>"
#. type: Plain text
#: en/git-describe.txt:105
@@ -18353,7 +18371,7 @@ msgstr "--always"
#: en/git-describe.txt:120 en/git-name-rev.txt:63
#, fuzzy, priority:260
msgid "Show uniquely abbreviated commit object as fallback."
-msgstr "�양ㅊ嶸��숂쉪�먧벡�룝퐳訝뷴릮鸚�"
+msgstr ""
#. type: Labeled list
#: en/git-describe.txt:121 en/rev-list-options.txt:124
@@ -18534,7 +18552,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:976
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:992
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -18744,7 +18762,7 @@ msgstr ""
#: en/git-difftool.txt:12
#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
-msgstr "git difftool [<�됮」>] [<�먧벡> [<�먧벡>]] [--] [<瓮�푶>...]"
+msgstr "git difftool [<>] [<> [<>]] [--] [<>...]"
#. type: Plain text
#: en/git-difftool.txt:19
@@ -18780,7 +18798,7 @@ msgstr "--no-prompt"
#: en/git-difftool.txt:31
#, fuzzy, priority:100
msgid "Do not prompt before launching a diff tool."
-msgstr "��뒯藥�펰驪붻푵藥ε끁阿뗥뎺訝띷룓鹽�"
+msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:32 en/git-mergetool.txt:78
@@ -18846,7 +18864,7 @@ msgstr "--tool-help"
#: en/git-difftool.txt:71
#, fuzzy, priority:100
msgid "Print a list of diff tools that may be used with `--tool`."
-msgstr "�양ㅊ��빳�ⓨ쑉 `--tool` �귝빊�롧쉪藥�펰藥ε끁�쀨〃"
+msgstr " `--tool` "
#. type: Labeled list
#: en/git-difftool.txt:72
@@ -19026,19 +19044,19 @@ msgstr ""
#: en/git-difftool.txt:140
#, priority:100
msgid "Show changes between commits, commit and working tree, etc"
-msgstr "�양ㅊ�먧벡阿뗩뿴�곫룓雅ㅵ뭽藥δ퐳�뷰퉳�당춬�꾢량凉�"
+msgstr ""
#. type: Plain text
#: en/git-difftool.txt:143
#, priority:100
msgid "Run merge conflict resolution tools to resolve merge conflicts"
-msgstr "瓦먫죱�덂뭉�꿰챳鰲ｅ넶藥ε끁餓θ㎗�녑릦亮뜹넳囹�"
+msgstr ""
#. type: Plain text
#: en/git-difftool.txt:146
#, priority:100
msgid "Get and set repository or global options"
-msgstr "�룟룚�뚩�營�퍜佯볠닑�끻뀲掠��됮」"
+msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
@@ -19050,7 +19068,7 @@ msgstr "git-diff-tree(1)"
#: en/git-diff-tree.txt:7
#, fuzzy, priority:100
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
-msgstr "驪붻푵訝ㅴ릉�묈�穩←쉪�뉏뻑�끻��뚧Æ凉�"
+msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:15
@@ -19065,7 +19083,7 @@ msgstr ""
#: en/git-diff-tree.txt:19
#, fuzzy, priority:100
msgid "Compares the content and mode of the blobs found via two tree objects."
-msgstr "驪붻푵訝ㅴ릉�묈�穩←쉪�뉏뻑�끻��뚧Æ凉�"
+msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:22
@@ -19086,7 +19104,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:422
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:423
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -19101,7 +19119,7 @@ msgstr ""
#: en/git-diff-tree.txt:38
#, fuzzy, priority:100
msgid "recurse into sub-trees"
-msgstr "�믣퐩�겼춴��"
+msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:41
@@ -19182,13 +19200,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:982
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:998
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:988
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1004
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -19209,7 +19227,7 @@ msgstr "git-diff(1)"
#: en/git-diff.txt:7
#, fuzzy, priority:280
msgid "git-diff - Show changes between commits, commit and working tree, etc"
-msgstr "�양ㅊ�먧벡阿뗩뿴�곫룓雅ㅵ뭽藥δ퐳�뷰퉳�당춬�꾢량凉�"
+msgstr ""
#. type: Plain text
#: en/git-diff.txt:17
@@ -19256,7 +19274,7 @@ msgstr ""
#: en/git-diff.txt:41
#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
-msgstr "git difftool [<�됮」>] [<�먧벡> [<�먧벡>]] [--] [<瓮�푶>...]"
+msgstr "git difftool [<>] [<> [<>]] [--] [<>...]"
#. type: Plain text
#: en/git-diff.txt:50
@@ -19280,7 +19298,7 @@ msgstr ""
#: en/git-diff.txt:59
#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
-msgstr "git difftool [<�됮」>] [<�먧벡> [<�먧벡>]] [--] [<瓮�푶>...]"
+msgstr "git difftool [<>] [<> [<>]] [--] [<>...]"
#. type: Plain text
#: en/git-diff.txt:63
@@ -19292,7 +19310,7 @@ msgstr ""
#: en/git-diff.txt:64
#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
-msgstr "git difftool [<�됮」>] [<�먧벡> [<�먧벡>]] [--] [<瓮�푶>...]"
+msgstr "git difftool [<>] [<> [<>]] [--] [<>...]"
#. type: Plain text
#: en/git-diff.txt:69
@@ -19304,7 +19322,7 @@ msgstr ""
#: en/git-diff.txt:70
#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
-msgstr "git difftool [<�됮」>] [<�먧벡> [<�먧벡>]] [--] [<瓮�푶>...]"
+msgstr "git difftool [<>] [<> [<>]] [--] [<>...]"
#. type: Plain text
#: en/git-diff.txt:77
@@ -19543,9 +19561,9 @@ msgid "This program dumps the given revisions in a form suitable to be piped int
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:22
+#: en/git-fast-export.txt:23
#, priority:100
-msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a kind of an interactive 'git filter-branch'."
+msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
@@ -19632,146 +19650,158 @@ msgstr ""
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
+#. type: Labeled list
+#: en/git-fast-export.txt:79
+#, ignore-same, no-wrap, priority:100
+msgid "--mark-tags"
+msgstr "--mark-tags"
+
#. type: Plain text
-#: en/git-fast-export.txt:83
+#: en/git-fast-export.txt:87
#, priority:100
-msgid "Any commits that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
+msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:92
+#, priority:100
+msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:84
+#: en/git-fast-export.txt:93
#, ignore-same, no-wrap, priority:100
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
-#: en/git-fast-export.txt:89
+#: en/git-fast-export.txt:98
#, priority:100
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:90
+#: en/git-fast-export.txt:99
#, ignore-same, no-wrap, priority:100
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
-#: en/git-fast-export.txt:93
+#: en/git-fast-export.txt:102
#, priority:100
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:94
+#: en/git-fast-export.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
-#: en/git-fast-export.txt:101
+#: en/git-fast-export.txt:110
#, priority:100
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
+#: en/git-fast-export.txt:111 en/git-ls-tree.txt:72
#, ignore-same, no-wrap, priority:100
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
-#: en/git-fast-export.txt:107
+#: en/git-fast-export.txt:116
#, priority:100
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:108
+#: en/git-fast-export.txt:117
#, ignore-same, no-wrap, priority:100
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
-#: en/git-fast-export.txt:112
+#: en/git-fast-export.txt:121
#, priority:100
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:113
+#: en/git-fast-export.txt:122
#, ignore-same, no-wrap, priority:100
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
-#: en/git-fast-export.txt:124
+#: en/git-fast-export.txt:133
#, priority:100
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:125
+#: en/git-fast-export.txt:134
#, ignore-same, no-wrap, priority:100
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
-#: en/git-fast-export.txt:131
+#: en/git-fast-export.txt:140
#, priority:100
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:132
+#: en/git-fast-export.txt:141
#, no-wrap, priority:100
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:138
+#: en/git-fast-export.txt:147
#, priority:100
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be reencoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:139
+#: en/git-fast-export.txt:148
#, ignore-same, no-wrap, priority:100
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
-#: en/git-fast-export.txt:142
+#: en/git-fast-export.txt:151
#, priority:100
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:143
+#: en/git-fast-export.txt:152
#, ignore-ellipsis, no-wrap, priority:100
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:160
#, priority:100
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:157
+#: en/git-fast-export.txt:166
#, no-wrap, priority:100
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:162
+#: en/git-fast-export.txt:171
#, priority:100
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:167
+#: en/git-fast-export.txt:176
#, no-wrap, priority:100
msgid ""
"$ git fast-export master~5..master |\n"
@@ -19780,55 +19810,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:180
#, priority:100
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:175
+#: en/git-fast-export.txt:184
#, priority:100
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
-#: en/git-fast-export.txt:178
+#: en/git-fast-export.txt:187
#, no-wrap, priority:100
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:186
+#: en/git-fast-export.txt:195
#, priority:100
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:198
+#: en/git-fast-export.txt:207
#, priority:100
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:201
+#: en/git-fast-export.txt:210
#, priority:100
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:204
+#: en/git-fast-export.txt:213
#, no-wrap, priority:100
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:209
+#: en/git-fast-export.txt:218
#, priority:100
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:215
+#: en/git-fast-export.txt:224
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git init anon-repo\n"
@@ -19838,25 +19868,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:222
+#: en/git-fast-export.txt:231
#, priority:100
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:225
+#: en/git-fast-export.txt:234
#, no-wrap, priority:100
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:240
#, priority:100
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:239
+#: en/git-fast-export.txt:248
#, priority:100
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
@@ -20090,7 +20120,7 @@ msgid "See linkgit:git-config[1]"
msgstr "linkgit:git-config[1]"
#. type: Title -
-#: en/git-fast-import.txt:144 en/git-p4.txt:507
+#: en/git-fast-import.txt:144 en/git-filter-branch.txt:463 en/git-p4.txt:507
#, no-wrap, priority:100
msgid "PERFORMANCE"
msgstr ""
@@ -20315,7 +20345,7 @@ msgstr ""
#: en/git-fast-import.txt:314
#, fuzzy, no-wrap, priority:100
msgid "Commands"
-msgstr "�썰빱"
+msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:318
@@ -20324,7 +20354,7 @@ msgid "fast-import accepts several commands to update the current repository and
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:319 en/git-fast-import.txt:381
+#: en/git-fast-import.txt:319 en/git-fast-import.txt:388
#, ignore-same, no-wrap, priority:100
msgid "`commit`"
msgstr "`commit`"
@@ -20336,7 +20366,7 @@ msgid "Creates a new branch or updates an existing branch by creating a new comm
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:324 en/git-fast-import.txt:771
+#: en/git-fast-import.txt:324 en/git-fast-import.txt:778
#, ignore-same, no-wrap, priority:100
msgid "`tag`"
msgstr "`tag`"
@@ -20348,7 +20378,7 @@ msgid "Creates an annotated tag object from an existing commit or branch. Light
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:330 en/git-fast-import.txt:815
+#: en/git-fast-import.txt:330 en/git-fast-import.txt:823
#, ignore-same, no-wrap, priority:100
msgid "`reset`"
msgstr "`reset`"
@@ -20360,7 +20390,7 @@ msgid "Reset an existing branch (or a new branch) to a specific revision. This
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:335 en/git-fast-import.txt:844
+#: en/git-fast-import.txt:335 en/git-fast-import.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`blob`"
msgstr "`blob`"
@@ -20372,109 +20402,121 @@ msgid "Convert raw file data into a blob, for future use in a `commit` command.
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:340 en/git-fast-import.txt:917
+#: en/git-fast-import.txt:340 en/git-fast-import.txt:925
+#, ignore-same, no-wrap, priority:100
+msgid "`alias`"
+msgstr "`alias`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:346
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
+msgstr ""
+
+#. type: Title ~
+#: en/git-fast-import.txt:347 en/git-fast-import.txt:940
#, ignore-same, no-wrap, priority:100
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
-#: en/git-fast-import.txt:345
+#: en/git-fast-import.txt:352
#, priority:100
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:346 en/git-fast-import.txt:945
+#: en/git-fast-import.txt:353 en/git-fast-import.txt:968
#, ignore-same, no-wrap, priority:100
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
-#: en/git-fast-import.txt:350
+#: en/git-fast-import.txt:357
#, priority:100
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:351 en/git-fast-import.txt:1152
+#: en/git-fast-import.txt:358 en/git-fast-import.txt:1175
#, ignore-same, no-wrap, priority:100
msgid "`done`"
msgstr "`done`"
#. type: Plain text
-#: en/git-fast-import.txt:355
+#: en/git-fast-import.txt:362
#, priority:100
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:356 en/git-fast-import.txt:970
+#: en/git-fast-import.txt:363 en/git-fast-import.txt:993
#, ignore-same, no-wrap, priority:100
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
-#: en/git-fast-import.txt:360
+#: en/git-fast-import.txt:367
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:361 en/git-fast-import.txt:985
+#: en/git-fast-import.txt:368 en/git-fast-import.txt:1008
#, ignore-same, no-wrap, priority:100
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
-#: en/git-fast-import.txt:365
+#: en/git-fast-import.txt:372
#, priority:100
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:366 en/git-fast-import.txt:1016
+#: en/git-fast-import.txt:373 en/git-fast-import.txt:1039
#, ignore-same, no-wrap, priority:100
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
-#: en/git-fast-import.txt:370
+#: en/git-fast-import.txt:377
#, priority:100
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:371 en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:378 en/git-fast-import.txt:1092
#, ignore-same, no-wrap, priority:100
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
#, priority:100
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:1124
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:1147
#, ignore-same, no-wrap, priority:100
msgid "`option`"
msgstr "`option`"
#. type: Plain text
-#: en/git-fast-import.txt:379
+#: en/git-fast-import.txt:386
#, priority:100
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:384
+#: en/git-fast-import.txt:391
#, priority:100
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
#, no-wrap, priority:100
msgid ""
"\t'commit' SP <ref> LF\n"
@@ -20485,247 +20527,247 @@ msgid ""
"\t('encoding' SP <encoding>)?\n"
"\tdata\n"
"\t('from' SP <commit-ish> LF)?\n"
-"\t('merge' SP <commit-ish> LF)?\n"
+"\t('merge' SP <commit-ish> LF)*\n"
"\t(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*\n"
"\tLF?\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:405
+#: en/git-fast-import.txt:412
#, priority:100
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:411
+#: en/git-fast-import.txt:418
#, priority:100
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:417
+#: en/git-fast-import.txt:424
#, priority:100
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:425
+#: en/git-fast-import.txt:432
#, priority:100
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:432
+#: en/git-fast-import.txt:439
#, priority:100
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:434
+#: en/git-fast-import.txt:441
#, ignore-same, no-wrap, priority:100
msgid "`author`"
msgstr "`author`"
#. type: Plain text
-#: en/git-fast-import.txt:440
+#: en/git-fast-import.txt:447
#, priority:100
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:442
+#: en/git-fast-import.txt:449
#, ignore-same, no-wrap, priority:100
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
-#: en/git-fast-import.txt:445
+#: en/git-fast-import.txt:452
#, priority:100
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
#, priority:100
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:458
+#: en/git-fast-import.txt:465
#, priority:100
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:460
+#: en/git-fast-import.txt:467
#, ignore-same, no-wrap, priority:100
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
-#: en/git-fast-import.txt:464
+#: en/git-fast-import.txt:471
#, priority:100
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:466
+#: en/git-fast-import.txt:473
#, ignore-same, no-wrap, priority:100
msgid "`from`"
msgstr "`from`"
#. type: Plain text
-#: en/git-fast-import.txt:472
+#: en/git-fast-import.txt:479
#, priority:100
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
#, priority:100
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:485
+#: en/git-fast-import.txt:492
#, priority:100
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
#, priority:100
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:491
+#: en/git-fast-import.txt:498
#, priority:100
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:493
+#: en/git-fast-import.txt:500
#, priority:100
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:499
+#: en/git-fast-import.txt:506
#, priority:100
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:501
+#: en/git-fast-import.txt:508
#, priority:100
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:503
+#: en/git-fast-import.txt:510
#, priority:100
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
#, priority:100
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:509
+#: en/git-fast-import.txt:516
#, priority:100
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:512
+#: en/git-fast-import.txt:519
#, priority:100
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
#, no-wrap, priority:100
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:521
+#: en/git-fast-import.txt:528
#, priority:100
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:523
+#: en/git-fast-import.txt:530
#, ignore-same, no-wrap, priority:100
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
-#: en/git-fast-import.txt:531
+#: en/git-fast-import.txt:538
#, priority:100
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:534
+#: en/git-fast-import.txt:541
#, priority:100
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:536
+#: en/git-fast-import.txt:543
#, ignore-same, no-wrap, priority:100
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:540
+#: en/git-fast-import.txt:547
#, priority:100
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:541 en/git-fast-import.txt:708
+#: en/git-fast-import.txt:548 en/git-fast-import.txt:715
#, no-wrap, priority:100
msgid "External data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:544
+#: en/git-fast-import.txt:551
#, priority:100
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:547
+#: en/git-fast-import.txt:554
#, no-wrap, priority:100
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
#, priority:100
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:555 en/git-fast-import.txt:721
+#: en/git-fast-import.txt:562 en/git-fast-import.txt:728
#, no-wrap, priority:100
msgid "Inline data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:559
+#: en/git-fast-import.txt:566
#, priority:100
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
#, no-wrap, priority:100
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -20733,259 +20775,259 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:566 en/git-fast-import.txt:732
+#: en/git-fast-import.txt:573 en/git-fast-import.txt:739
#, priority:100
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:569
+#: en/git-fast-import.txt:576
#, priority:100
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
#, priority:100
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:574
+#: en/git-fast-import.txt:581
#, priority:100
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:575
+#: en/git-fast-import.txt:582
#, priority:100
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
#, priority:100
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:580
+#: en/git-fast-import.txt:587
#, priority:100
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:583
+#: en/git-fast-import.txt:590
#, priority:100
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:587
+#: en/git-fast-import.txt:594
#, priority:100
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:594
+#: en/git-fast-import.txt:601
#, priority:100
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
#, priority:100
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:598
+#: en/git-fast-import.txt:605
#, priority:100
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:599
+#: en/git-fast-import.txt:606
#, priority:100
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:600
+#: en/git-fast-import.txt:607
#, priority:100
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:602
+#: en/git-fast-import.txt:609
#, priority:100
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:604
+#: en/git-fast-import.txt:611
#, priority:100
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:606
+#: en/git-fast-import.txt:613
#, priority:100
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:608
+#: en/git-fast-import.txt:615
#, ignore-same, no-wrap, priority:100
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
-#: en/git-fast-import.txt:614
+#: en/git-fast-import.txt:621
#, priority:100
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
#, no-wrap, priority:100
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
#, priority:100
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:624
+#: en/git-fast-import.txt:631
#, ignore-same, no-wrap, priority:100
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
#, priority:100
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:632
+#: en/git-fast-import.txt:639
#, no-wrap, priority:100
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:638 en/git-fast-import.txt:658
+#: en/git-fast-import.txt:645 en/git-fast-import.txt:665
#, priority:100
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:643
+#: en/git-fast-import.txt:650
#, priority:100
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:645
+#: en/git-fast-import.txt:652
#, ignore-same, no-wrap, priority:100
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
-#: en/git-fast-import.txt:649
+#: en/git-fast-import.txt:656
#, priority:100
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:652
+#: en/git-fast-import.txt:659
#, no-wrap, priority:100
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:663
+#: en/git-fast-import.txt:670
#, priority:100
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:672
+#: en/git-fast-import.txt:679
#, priority:100
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
-#: en/git-fast-import.txt:679
+#: en/git-fast-import.txt:686
#, priority:100
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:682
+#: en/git-fast-import.txt:689
#, no-wrap, priority:100
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:688
+#: en/git-fast-import.txt:695
#, priority:100
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:696
+#: en/git-fast-import.txt:703
#, priority:100
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:698
+#: en/git-fast-import.txt:705
#, ignore-same, no-wrap, priority:100
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:707
+#: en/git-fast-import.txt:714
#, priority:100
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:712
+#: en/git-fast-import.txt:719
#, priority:100
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:715
+#: en/git-fast-import.txt:722
#, no-wrap, priority:100
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:720
+#: en/git-fast-import.txt:727
#, priority:100
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:725
+#: en/git-fast-import.txt:732
#, priority:100
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:729
+#: en/git-fast-import.txt:736
#, no-wrap, priority:100
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -20993,76 +21035,77 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:735
+#: en/git-fast-import.txt:742
#, priority:100
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:737
+#: en/git-fast-import.txt:744
#, ignore-same, no-wrap, priority:100
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
-#: en/git-fast-import.txt:743
+#: en/git-fast-import.txt:750
#, priority:100
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:746
+#: en/git-fast-import.txt:753
#, no-wrap, priority:100
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:752
+#: en/git-fast-import.txt:759
#, priority:100
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:756
+#: en/git-fast-import.txt:763
#, priority:100
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:758
+#: en/git-fast-import.txt:765
#, ignore-same, no-wrap, priority:100
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
-#: en/git-fast-import.txt:763
+#: en/git-fast-import.txt:770
#, priority:100
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:766
+#: en/git-fast-import.txt:773
#, no-wrap, priority:100
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:769
+#: en/git-fast-import.txt:776
#, priority:100
msgid "where `<object-identifer>` is any string not containing LF."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:774
+#: en/git-fast-import.txt:781
#, priority:100
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:781
+#: en/git-fast-import.txt:789
#, no-wrap, priority:100
msgid ""
"\t'tag' SP <name> LF\n"
+"\tmark?\n"
"\t'from' SP <commit-ish> LF\n"
"\toriginal-oid?\n"
"\t'tagger' (SP <name>)? SP LT <email> GT SP <when> LF\n"
@@ -21070,55 +21113,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:784
+#: en/git-fast-import.txt:792
#, priority:100
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:789
+#: en/git-fast-import.txt:797
#, priority:100
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:793
+#: en/git-fast-import.txt:801
#, priority:100
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:796
+#: en/git-fast-import.txt:804
#, priority:100
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:799
+#: en/git-fast-import.txt:807
#, priority:100
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:813
#, priority:100
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:813
+#: en/git-fast-import.txt:821
#, priority:100
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:820
+#: en/git-fast-import.txt:828
#, priority:100
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:825
+#: en/git-fast-import.txt:833
#, no-wrap, priority:100
msgid ""
"\t'reset' SP <ref> LF\n"
@@ -21127,25 +21170,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:829
+#: en/git-fast-import.txt:837
#, priority:100
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:831 en/git-fast-import.txt:943
+#: en/git-fast-import.txt:839 en/git-fast-import.txt:966
#, priority:100
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:834
+#: en/git-fast-import.txt:842
#, priority:100
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:838
+#: en/git-fast-import.txt:846
#, no-wrap, priority:100
msgid ""
"\treset refs/tags/938\n"
@@ -21153,19 +21196,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:850
#, priority:100
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:849
+#: en/git-fast-import.txt:857
#, priority:100
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:855
+#: en/git-fast-import.txt:863
#, no-wrap, priority:100
msgid ""
"\t'blob' LF\n"
@@ -21175,43 +21218,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:861
+#: en/git-fast-import.txt:869
#, priority:100
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:871
#, ignore-same, no-wrap, priority:100
msgid "`data`"
msgstr "`data`"
#. type: Plain text
-#: en/git-fast-import.txt:870
+#: en/git-fast-import.txt:878
#, priority:100
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:875
+#: en/git-fast-import.txt:883
#, priority:100
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:876
+#: en/git-fast-import.txt:884
#, no-wrap, priority:100
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:878
+#: en/git-fast-import.txt:886
#, priority:100
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:882
+#: en/git-fast-import.txt:890
#, no-wrap, priority:100
msgid ""
"\t'data' SP <count> LF\n"
@@ -21219,31 +21262,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:888
+#: en/git-fast-import.txt:896
#, priority:100
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:893
+#: en/git-fast-import.txt:901
#, priority:100
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:894
+#: en/git-fast-import.txt:902
#, no-wrap, priority:100
msgid "Delimited format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:899
+#: en/git-fast-import.txt:907
#, priority:100
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:905
+#: en/git-fast-import.txt:913
#, no-wrap, priority:100
msgid ""
"\t'data' SP '<<' <delim> LF\n"
@@ -21253,25 +21296,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:921
#, priority:100
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:915
+#: en/git-fast-import.txt:923
#, priority:100
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:920
+#: en/git-fast-import.txt:928
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object."
+msgstr ""
+
+#. type: delimited block .
+#: en/git-fast-import.txt:934
+#, no-wrap, priority:100
+msgid ""
+"\t'alias' LF\n"
+"\tmark\n"
+"\t'to' SP <commit-ish> LF\n"
+"\tLF?\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:937
+#, priority:100
+msgid "For a detailed description of `<commit-ish>` see above under `from`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:943
#, priority:100
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:924
+#: en/git-fast-import.txt:947
#, no-wrap, priority:100
msgid ""
"\t'checkpoint' LF\n"
@@ -21279,31 +21344,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:930
+#: en/git-fast-import.txt:953
#, priority:100
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:935
+#: en/git-fast-import.txt:958
#, priority:100
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:941
+#: en/git-fast-import.txt:964
#, priority:100
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:950
+#: en/git-fast-import.txt:973
#, priority:100
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:954
+#: en/git-fast-import.txt:977
#, no-wrap, priority:100
msgid ""
"\t'progress' SP <any> LF\n"
@@ -21311,67 +21376,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:960
+#: en/git-fast-import.txt:983
#, priority:100
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:986
#, no-wrap, priority:100
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:968
+#: en/git-fast-import.txt:991
#, priority:100
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:976
+#: en/git-fast-import.txt:999
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:979
+#: en/git-fast-import.txt:1002
#, no-wrap, priority:100
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:983 en/git-fast-import.txt:1014 en/git-fast-import.txt:1067
+#: en/git-fast-import.txt:1006 en/git-fast-import.txt:1037 en/git-fast-import.txt:1090
#, priority:100
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:991
+#: en/git-fast-import.txt:1014
#, priority:100
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:994
+#: en/git-fast-import.txt:1017
#, no-wrap, priority:100
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1022
#, priority:100
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:1024
#, priority:100
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1005
+#: en/git-fast-import.txt:1028
#, no-wrap, priority:100
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21379,283 +21444,283 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1011
+#: en/git-fast-import.txt:1034
#, priority:100
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1022
+#: en/git-fast-import.txt:1045
#, priority:100
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1025
+#: en/git-fast-import.txt:1048
#, priority:100
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1049
#, no-wrap, priority:100
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1030
+#: en/git-fast-import.txt:1053
#, priority:100
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1033
+#: en/git-fast-import.txt:1056
#, no-wrap, priority:100
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1035
+#: en/git-fast-import.txt:1058
#, no-wrap, priority:100
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1041
+#: en/git-fast-import.txt:1064
#, priority:100
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1044
+#: en/git-fast-import.txt:1067
#, no-wrap, priority:100
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1047
+#: en/git-fast-import.txt:1070
#, priority:100
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1072
#, priority:100
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1075
#, no-wrap, priority:100
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1080
#, priority:100
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1060
+#: en/git-fast-import.txt:1083
#, priority:100
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1086
#, no-wrap, priority:100
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1072
+#: en/git-fast-import.txt:1095
#, priority:100
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1075
+#: en/git-fast-import.txt:1098
#, no-wrap, priority:100
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1078
+#: en/git-fast-import.txt:1101
#, priority:100
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1079 en/git-fast-import.txt:1146
+#: en/git-fast-import.txt:1102 en/git-fast-import.txt:1169
#, no-wrap, priority:100
msgid "date-format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1080 en/git-fast-import.txt:1148
+#: en/git-fast-import.txt:1103 en/git-fast-import.txt:1171
#, no-wrap, priority:100
msgid "export-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1081
+#: en/git-fast-import.txt:1104
#, no-wrap, priority:100
msgid "relative-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1082
+#: en/git-fast-import.txt:1105
#, fuzzy, no-wrap, priority:100
msgid "no-relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
-#: en/git-fast-import.txt:1083 en/git-fast-import.txt:1150
+#: en/git-fast-import.txt:1106 en/git-fast-import.txt:1173
#, no-wrap, priority:100
msgid "force"
-msgstr "凉뷴댍"
+msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1087
+#: en/git-fast-import.txt:1110
#, priority:100
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1088 en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1111 en/git-fast-import.txt:1170
#, no-wrap, priority:100
msgid "import-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1089
+#: en/git-fast-import.txt:1112
#, no-wrap, priority:100
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1097
+#: en/git-fast-import.txt:1120
#, priority:100
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1098
+#: en/git-fast-import.txt:1121
#, fuzzy, no-wrap, priority:100
msgid "get-mark"
msgstr "`get-mark`"
#. type: Labeled list
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1122
#, fuzzy, no-wrap, priority:100
msgid "cat-blob"
msgstr "`cat-blob`"
#. type: Labeled list
-#: en/git-fast-import.txt:1100
+#: en/git-fast-import.txt:1123
#, no-wrap, priority:100
msgid "ls"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1108
+#: en/git-fast-import.txt:1131
#, priority:100
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1109
+#: en/git-fast-import.txt:1132
#, no-wrap, priority:100
msgid "notes"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1114
+#: en/git-fast-import.txt:1137
#, priority:100
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1138
#, fuzzy, no-wrap, priority:100
msgid "done"
msgstr "none"
#. type: Plain text
-#: en/git-fast-import.txt:1122
+#: en/git-fast-import.txt:1145
#, priority:100
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1129
+#: en/git-fast-import.txt:1152
#, priority:100
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1132
+#: en/git-fast-import.txt:1155
#, no-wrap, priority:100
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1137
+#: en/git-fast-import.txt:1160
#, priority:100
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1141
+#: en/git-fast-import.txt:1164
#, priority:100
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1144
+#: en/git-fast-import.txt:1167
#, priority:100
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1149
+#: en/git-fast-import.txt:1172
#, priority:100
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1178
#, priority:100
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1159
+#: en/git-fast-import.txt:1182
#, priority:100
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1161
+#: en/git-fast-import.txt:1184
#, no-wrap, priority:100
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1168
+#: en/git-fast-import.txt:1191
#, priority:100
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1175
+#: en/git-fast-import.txt:1198
#, priority:100
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1203
#, no-wrap, priority:100
msgid ""
"\tmkfifo fast-import-output\n"
@@ -21664,49 +21729,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1184
+#: en/git-fast-import.txt:1207
#, priority:100
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1188
+#: en/git-fast-import.txt:1211
#, priority:100
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1213
#, no-wrap, priority:100
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1196
+#: en/git-fast-import.txt:1219
#, priority:100
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1203
+#: en/git-fast-import.txt:1226
#, priority:100
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1211
+#: en/git-fast-import.txt:1234
#, priority:100
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1236
#, priority:100
msgid "An example crash:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1229
+#: en/git-fast-import.txt:1252
#, no-wrap, priority:100
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
@@ -21726,7 +21791,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1256
#, no-wrap, priority:100
msgid ""
"\t$ git fast-import <in\n"
@@ -21735,7 +21800,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1239
+#: en/git-fast-import.txt:1262
#, no-wrap, priority:100
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
@@ -21746,13 +21811,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1241
+#: en/git-fast-import.txt:1264
#, no-wrap, priority:100
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1251
+#: en/git-fast-import.txt:1274
#, no-wrap, priority:100
msgid ""
"\tMost Recent Commands Before Crash\n"
@@ -21767,13 +21832,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1252
+#: en/git-fast-import.txt:1275
#, no-wrap, priority:100
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1255
+#: en/git-fast-import.txt:1278
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
@@ -21781,25 +21846,25 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1256
+#: en/git-fast-import.txt:1279
#, no-wrap, priority:100
msgid "active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1259
+#: en/git-fast-import.txt:1282
#, priority:100
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1260
+#: en/git-fast-import.txt:1283
#, priority:100
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1264
+#: en/git-fast-import.txt:1287
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
@@ -21808,7 +21873,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1270
+#: en/git-fast-import.txt:1293
#, no-wrap, priority:100
msgid ""
"status : active loaded dirty\n"
@@ -21820,307 +21885,307 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1274
+#: en/git-fast-import.txt:1297
#, priority:100
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1277
+#: en/git-fast-import.txt:1300
#, no-wrap, priority:100
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1280
+#: en/git-fast-import.txt:1303
#, priority:100
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1282
+#: en/git-fast-import.txt:1305
#, no-wrap, priority:100
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1290
+#: en/git-fast-import.txt:1313
#, priority:100
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1294
+#: en/git-fast-import.txt:1317
#, priority:100
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1296
+#: en/git-fast-import.txt:1319
#, no-wrap, priority:100
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1301
+#: en/git-fast-import.txt:1324
#, priority:100
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1305
+#: en/git-fast-import.txt:1328
#, priority:100
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1307
+#: en/git-fast-import.txt:1330
#, no-wrap, priority:100
msgid "Handling Renames"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1312
+#: en/git-fast-import.txt:1335
#, priority:100
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1337
#, no-wrap, priority:100
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1341
#, priority:100
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1325
+#: en/git-fast-import.txt:1348
#, priority:100
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1331
+#: en/git-fast-import.txt:1354
#, priority:100
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1337
+#: en/git-fast-import.txt:1360
#, priority:100
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1363
#, priority:100
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1342
+#: en/git-fast-import.txt:1365
#, no-wrap, priority:100
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1346
+#: en/git-fast-import.txt:1369
#, priority:100
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1353
+#: en/git-fast-import.txt:1376
#, priority:100
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1358
+#: en/git-fast-import.txt:1381
#, priority:100
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1360
+#: en/git-fast-import.txt:1383
#, no-wrap, priority:100
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1367
+#: en/git-fast-import.txt:1390
#, priority:100
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1369
+#: en/git-fast-import.txt:1392
#, no-wrap, priority:100
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1399
#, priority:100
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1379
+#: en/git-fast-import.txt:1402
#, no-wrap, priority:100
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1385
+#: en/git-fast-import.txt:1408
#, priority:100
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1393
+#: en/git-fast-import.txt:1416
#, priority:100
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1423
#, priority:100
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1407
+#: en/git-fast-import.txt:1430
#, priority:100
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1415
+#: en/git-fast-import.txt:1438
#, priority:100
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1417
+#: en/git-fast-import.txt:1440
#, no-wrap, priority:100
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1423
+#: en/git-fast-import.txt:1446
#, priority:100
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1448
#, no-wrap, priority:100
msgid "per object"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1432
+#: en/git-fast-import.txt:1455
#, priority:100
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1438
+#: en/git-fast-import.txt:1461
#, priority:100
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1440
+#: en/git-fast-import.txt:1463
#, no-wrap, priority:100
msgid "per mark"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1446
+#: en/git-fast-import.txt:1469
#, priority:100
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1448
+#: en/git-fast-import.txt:1471
#, no-wrap, priority:100
msgid "per branch"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1474
#, priority:100
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1457
+#: en/git-fast-import.txt:1480
#, priority:100
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1464
+#: en/git-fast-import.txt:1487
#, priority:100
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1468
+#: en/git-fast-import.txt:1491
#, priority:100
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1496
#, priority:100
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1498
#, no-wrap, priority:100
msgid "per active tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1480
+#: en/git-fast-import.txt:1503
#, priority:100
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1482
+#: en/git-fast-import.txt:1505
#, no-wrap, priority:100
msgid "per active file entry"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1488
+#: en/git-fast-import.txt:1511
#, priority:100
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1493
+#: en/git-fast-import.txt:1516
#, priority:100
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1495
+#: en/git-fast-import.txt:1518
#, no-wrap, priority:100
msgid "SIGNALS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1501
+#: en/git-fast-import.txt:1524
#, priority:100
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -22319,7 +22384,7 @@ msgstr "git-fetch(1)"
#: en/git-fetch.txt:7
#, fuzzy, priority:220
msgid "git-fetch - Download objects and refs from another repository"
-msgstr "餓롥룱鸚뽨�訝や퍜佯볞툔饔썲�穩▼뭽凉뺟뵪"
+msgstr ""
#. type: Plain text
#: en/git-fetch.txt:16
@@ -22681,7 +22746,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1041
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -22696,7 +22761,7 @@ msgstr ""
#: en/git-fetch.txt:236 en/git-push.txt:477
#, no-wrap, priority:220
msgid "reason"
-msgstr "�잌썱"
+msgstr ""
#. type: Plain text
#: en/git-fetch.txt:240
@@ -22708,7 +22773,7 @@ msgstr ""
#: en/git-fetch.txt:245
#, fuzzy, priority:220
msgid "Update the remote-tracking branches:"
-msgstr "鵝쒐뵪雅롨퓶葉뗨퇎甕ゅ늽��"
+msgstr ""
#. type: delimited block -
#: en/git-fetch.txt:248
@@ -22797,20 +22862,32 @@ msgid ""
"\t[--state-branch <branch>] [--] [<rev-list options>...]\n"
msgstr ""
+#. type: Title -
+#: en/git-filter-branch.txt:20
+#, no-wrap, priority:100
+msgid "WARNING"
+msgstr ""
+
#. type: Plain text
-#: en/git-filter-branch.txt:27
+#: en/git-filter-branch.txt:31
+#, priority:100
+msgid "'git filter-branch' has a plethora of pitfalls that can produce non-obvious manglings of the intended history rewrite (and can leave you with little time to investigate such problems since it has such abysmal performance). These safety and performance issues cannot be backward compatibly fixed and as such, its use is not recommended. Please use an alternative history filtering tool such as https://github.com/newren/git-filter-repo/[git filter-repo]. If you still need to use 'git filter-branch', please carefully read <<SAFETY>> (and <<PERFORMANCE>>) to learn about the land mines of filter-branch, and then vigilantly avoid as many of the hazards listed there as reasonably possible."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:40
#, priority:100
msgid "Lets you rewrite Git revision history by rewriting the branches mentioned in the <rev-list options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge information) will be preserved."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:34
+#: en/git-filter-branch.txt:47
#, priority:100
msgid "The command will only rewrite the _positive_ refs mentioned in the command line (e.g. if you pass 'a..b', only 'b' will be rewritten). If you specify no filters, the commits will be recommitted without any changes, which would normally have no effect. Nevertheless, this may be useful in the future for compensating for some Git bugs or such, therefore such a usage is permitted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:39
+#: en/git-filter-branch.txt:52
#, no-wrap, priority:100
msgid ""
"*NOTE*: This command honors `.git/info/grafts` file and refs in\n"
@@ -22820,7 +22897,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:48
+#: en/git-filter-branch.txt:61
#, no-wrap, priority:100
msgid ""
"*WARNING*! The rewritten history will have different object names for all\n"
@@ -22834,337 +22911,337 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:52
+#: en/git-filter-branch.txt:65
#, priority:100
msgid "Always verify that the rewritten version is correct: The original refs, if different from the rewritten ones, will be stored in the namespace 'refs/original/'."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:56
+#: en/git-filter-branch.txt:69
#, priority:100
msgid "Note that since this operation is very I/O expensive, it might be a good idea to redirect the temporary directory off-disk with the `-d` option, e.g. on tmpfs. Reportedly the speedup is very noticeable."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:59
+#: en/git-filter-branch.txt:72
#, no-wrap, priority:100
msgid "Filters"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:71
+#: en/git-filter-branch.txt:84
#, priority:100
msgid "The filters are applied in the order as listed below. The <command> argument is always evaluated in the shell context using the 'eval' command (with the notable exception of the commit filter, for technical reasons). Prior to that, the `$GIT_COMMIT` environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, and GIT_COMMITTER_DATE are taken from the current commit and exported to the environment, in order to affect the author and committer identities of the replacement commit created by linkgit:git-commit-tree[1] after the filters have run."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:74
+#: en/git-filter-branch.txt:87
#, priority:100
msgid "If any evaluation of <command> returns a non-zero exit status, the whole operation will be aborted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:80
+#: en/git-filter-branch.txt:93
#, priority:100
msgid "A 'map' function is available that takes an \"original sha1 id\" argument and outputs a \"rewritten sha1 id\" if the commit has been already rewritten, and \"original sha1 id\" otherwise; the 'map' function can return several ids on separate lines if your commit filter emitted multiple commits."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:85
+#: en/git-filter-branch.txt:98
#, no-wrap, priority:100
msgid "--setup <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:91
+#: en/git-filter-branch.txt:104
#, priority:100
msgid "This is not a real filter executed for each commit but a one time setup just before the loop. Therefore no commit-specific variables are defined yet. Functions or variables defined here can be used or modified in the following filter steps except the commit filter, for technical reasons."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:92
+#: en/git-filter-branch.txt:105
#, no-wrap, priority:100
msgid "--subdirectory-filter <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:96
+#: en/git-filter-branch.txt:109
#, priority:100
msgid "Only look at the history which touches the given subdirectory. The result will contain that directory (and only that) as its project root. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:97
+#: en/git-filter-branch.txt:110
#, no-wrap, priority:100
msgid "--env-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:102
+#: en/git-filter-branch.txt:115
#, priority:100
msgid "This filter may be used if you only need to modify the environment in which the commit will be performed. Specifically, you might want to rewrite the author/committer name/email/time environment variables (see linkgit:git-commit-tree[1] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:103
+#: en/git-filter-branch.txt:116
#, no-wrap, priority:100
msgid "--tree-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:110
+#: en/git-filter-branch.txt:123
#, priority:100
msgid "This is the filter for rewriting the tree and its contents. The argument is evaluated in shell with the working directory set to the root of the checked out tree. The new tree is then used as-is (new files are auto-added, disappeared files are auto-removed - neither .gitignore files nor any other ignore rules *HAVE ANY EFFECT*!)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:111
+#: en/git-filter-branch.txt:124
#, no-wrap, priority:100
msgid "--index-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:117
+#: en/git-filter-branch.txt:130
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the index. It is similar to the tree filter but does not check out the tree, which makes it much faster. Frequently used with `git rm --cached --ignore-unmatch ...`, see EXAMPLES below. For hairy cases, see linkgit:git-update-index[1]."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:118
+#: en/git-filter-branch.txt:131
#, no-wrap, priority:100
msgid "--parent-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:125
+#: en/git-filter-branch.txt:138
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the commit's parent list. It will receive the parent string on stdin and shall output the new parent string on stdout. The parent string is in the format described in linkgit:git-commit-tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and \"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:126
+#: en/git-filter-branch.txt:139
#, no-wrap, priority:100
msgid "--msg-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:131
+#: en/git-filter-branch.txt:144
#, priority:100
msgid "This is the filter for rewriting the commit messages. The argument is evaluated in the shell with the original commit message on standard input; its standard output is used as the new commit message."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:132
+#: en/git-filter-branch.txt:145
#, no-wrap, priority:100
msgid "--commit-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:138
+#: en/git-filter-branch.txt:151
#, ignore-ellipsis, priority:100
msgid "This is the filter for performing the commit. If this filter is specified, it will be called instead of the 'git commit-tree' command, with arguments of the form \"<TREE_ID> [(-p <PARENT_COMMIT_ID>)...]\" and the log message on stdin. The commit id is expected on stdout."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:142
+#: en/git-filter-branch.txt:155
#, priority:100
msgid "As a special extension, the commit filter may emit multiple commit ids; in that case, the rewritten children of the original commit will have all of them as parents."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:147
+#: en/git-filter-branch.txt:160
#, priority:100
msgid "You can use the 'map' convenience function in this filter, and other convenience functions, too. For example, calling 'skip_commit \"$@\"' will leave out the current commit (but not its changes! If you want that, use 'git rebase' instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:151
+#: en/git-filter-branch.txt:164
#, priority:100
msgid "You can also use the `git_commit_non_empty_tree \"$@\"` instead of `git commit-tree \"$@\"` if you don't wish to keep commits with a single parent and that makes no change to the tree."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:152
+#: en/git-filter-branch.txt:165
#, no-wrap, priority:100
msgid "--tag-name-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:158
+#: en/git-filter-branch.txt:171
#, priority:100
msgid "This is the filter for rewriting tag names. When passed, it will be called for every tag ref that points to a rewritten object (or to a tag object which points to a rewritten object). The original tag name is passed via standard input, and the new tag name is expected on standard output."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:163
+#: en/git-filter-branch.txt:176
#, priority:100
msgid "The original tags are not deleted, but can be overwritten; use \"--tag-name-filter cat\" to simply update the tags. In this case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:174
+#: en/git-filter-branch.txt:187
#, priority:100
msgid "Nearly proper rewriting of tag objects is supported. If the tag has a message attached, a new tag object will be created with the same message, author, and timestamp. If the tag has a signature attached, the signature will be stripped. It is by definition impossible to preserve signatures. The reason this is \"nearly\" proper, is because ideally if the tag did not change (points to the same object, has the same name, etc.) it should retain any signature. That is not the case, signatures will always be removed, buyer beware. There is also no support for changing the author or timestamp (or the tag message for that matter). Tags which point to other tags will be rewritten to point to the underlying commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:175
+#: en/git-filter-branch.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--prune-empty"
msgstr "--prune-empty"
#. type: Plain text
-#: en/git-filter-branch.txt:182
+#: en/git-filter-branch.txt:195
#, priority:100
msgid "Some filters will generate empty commits that leave the tree untouched. This option instructs git-filter-branch to remove such commits if they have exactly one or zero non-pruned parents; merge commits will therefore remain intact. This option cannot be used together with `--commit-filter`, though the same effect can be achieved by using the provided `git_commit_non_empty_tree` function in a commit filter."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:183
+#: en/git-filter-branch.txt:196
#, no-wrap, priority:100
msgid "--original <namespace>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:186
+#: en/git-filter-branch.txt:199
#, priority:100
msgid "Use this option to set the namespace where the original commits will be stored. The default value is 'refs/original'."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:187
+#: en/git-filter-branch.txt:200
#, no-wrap, priority:100
msgid "-d <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:194
+#: en/git-filter-branch.txt:207
#, priority:100
msgid "Use this option to set the path to the temporary directory used for rewriting. When applying a tree filter, the command needs to temporarily check out the tree to some directory, which may consume considerable space in case of large projects. By default it does this in the `.git-rewrite/` directory but you can override that choice by this parameter."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:200
+#: en/git-filter-branch.txt:213
#, priority:100
msgid "'git filter-branch' refuses to start with an existing temporary directory or when there are already refs starting with 'refs/original/', unless forced."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:201
+#: en/git-filter-branch.txt:214
#, no-wrap, priority:100
msgid "--state-branch <branch>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:206
+#: en/git-filter-branch.txt:219
#, priority:100
msgid "This option will cause the mapping from old to new objects to be loaded from named branch upon startup and saved as a new commit to that branch upon exit, enabling incremental of large trees. If '<branch>' does not exist it will be created."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:207
+#: en/git-filter-branch.txt:220
#, ignore-ellipsis, no-wrap, priority:100
msgid "<rev-list options>..."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:212
+#: en/git-filter-branch.txt:225
#, priority:100
msgid "Arguments for 'git rev-list'. All positive refs included by these options are rewritten. You may also specify options such as `--all`, but you must use `--` to separate them from the 'git filter-branch' options. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:216
+#: en/git-filter-branch.txt:229
#, no-wrap, priority:100
msgid "Remap to ancestor"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:223
+#: en/git-filter-branch.txt:236
#, priority:100
msgid "By using linkgit:git-rev-list[1] arguments, e.g., path limiters, you can limit the set of revisions which get rewritten. However, positive refs on the command line are distinguished: we don't let them be excluded by such limiters. For this purpose, they are instead rewritten to point at the nearest ancestor that was not excluded."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:231
+#: en/git-filter-branch.txt:244
#, priority:100
msgid "On success, the exit status is `0`. If the filter can't find any commits to rewrite, the exit status is `2`. On any other error, the exit status may be any other non-zero value."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:238
+#: en/git-filter-branch.txt:251
#, priority:100
msgid "Suppose you want to remove a file (containing confidential information or copyright violation) from all commits:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:241
+#: en/git-filter-branch.txt:254
#, no-wrap, priority:100
msgid "git filter-branch --tree-filter 'rm filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:246
+#: en/git-filter-branch.txt:259
#, priority:100
msgid "However, if the file is absent from the tree of some commit, a simple `rm filename` will fail for that tree and commit. Thus you may instead want to use `rm -f filename` as the script."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:252
+#: en/git-filter-branch.txt:265
#, priority:100
msgid "Using `--index-filter` with 'git rm' yields a significantly faster version. Like with using `rm filename`, `git rm --cached filename` will fail if the file is absent from the tree of a commit. If you want to \"completely forget\" a file, it does not matter when it entered history, so we also add `--ignore-unmatch`:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:255
+#: en/git-filter-branch.txt:268
#, no-wrap, priority:100
msgid "git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:258
+#: en/git-filter-branch.txt:271
#, priority:100
msgid "Now, you will get the rewritten history saved in HEAD."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:261
+#: en/git-filter-branch.txt:274
#, priority:100
msgid "To rewrite the repository to look as if `foodir/` had been its project root, and discard all other history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:264
+#: en/git-filter-branch.txt:277
#, no-wrap, priority:100
msgid "git filter-branch --subdirectory-filter foodir -- --all\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:269
+#: en/git-filter-branch.txt:282
#, priority:100
msgid "Thus you can, e.g., turn a library subdirectory into a repository of its own. Note the `--` that separates 'filter-branch' options from revision options, and the `--all` to rewrite all branches and tags."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:273
+#: en/git-filter-branch.txt:286
#, priority:100
msgid "To set a commit (which typically is at the tip of another history) to be the parent of the current initial commit, in order to paste the other history behind the current history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:276
+#: en/git-filter-branch.txt:289
#, no-wrap, priority:100
msgid "git filter-branch --parent-filter 'sed \"s/^\\$/-p <graft-id>/\"' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:282
+#: en/git-filter-branch.txt:295
#, priority:100
msgid "(if the parent string is empty - which happens when we are dealing with the initial commit - add graftcommit as a parent). Note that this assumes history with a single root (that is, no merge without common ancestors happened). If this is not the case, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:286
+#: en/git-filter-branch.txt:299
#, no-wrap, priority:100
msgid ""
"git filter-branch --parent-filter \\\n"
@@ -23172,13 +23249,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:289
+#: en/git-filter-branch.txt:302
#, priority:100
msgid "or even simpler:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:293
+#: en/git-filter-branch.txt:306
#, no-wrap, priority:100
msgid ""
"git replace --graft $commit-id $graft-id\n"
@@ -23186,13 +23263,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:296
+#: en/git-filter-branch.txt:309
#, priority:100
msgid "To remove commits authored by \"Darl McBribe\" from the history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:305
+#: en/git-filter-branch.txt:318
#, no-wrap, priority:100
msgid ""
"git filter-branch --commit-filter '\n"
@@ -23205,13 +23282,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:308
+#: en/git-filter-branch.txt:321
#, priority:100
msgid "The function 'skip_commit' is defined as follows:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:320
+#: en/git-filter-branch.txt:333
#, no-wrap, priority:100
msgid ""
"skip_commit()\n"
@@ -23227,13 +23304,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:327
+#: en/git-filter-branch.txt:340
#, priority:100
msgid "The shift magic first throws away the tree id and then the -p parameters. Note that this handles merges properly! In case Darl committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 as their parents instead of the merge commit."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:332
+#: en/git-filter-branch.txt:345
#, no-wrap, priority:100
msgid ""
"*NOTE* the changes introduced by the commits, and which are not reverted\n"
@@ -23243,13 +23320,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:336
+#: en/git-filter-branch.txt:349
#, priority:100
msgid "You can rewrite the commit log messages using `--msg-filter`. For example, 'git svn-id' strings in a repository created by 'git svn' can be removed this way:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:341
+#: en/git-filter-branch.txt:354
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23258,13 +23335,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:345
+#: en/git-filter-branch.txt:358
#, priority:100
msgid "If you need to add 'Acked-by' lines to, say, the last 10 commits (none of which is a merge), use this command:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:351
+#: en/git-filter-branch.txt:364
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -23274,13 +23351,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:357
+#: en/git-filter-branch.txt:370
#, priority:100
msgid "The `--env-filter` option can be used to modify committer and/or author identity. For example, if you found out that your commits have the wrong identity due to a misconfigured user.email, you can make a correction, before publishing the project, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:369
+#: en/git-filter-branch.txt:382
#, no-wrap, priority:100
msgid ""
"git filter-branch --env-filter '\n"
@@ -23296,19 +23373,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:375
+#: en/git-filter-branch.txt:388
#, priority:100
msgid "To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will point to the top-most revision that a 'git rev-list' of this range will print."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:377
+#: en/git-filter-branch.txt:390
#, priority:100
msgid "Consider this history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:382
+#: en/git-filter-branch.txt:395
#, no-wrap, priority:100
msgid ""
" D--E--F--G--H\n"
@@ -23317,25 +23394,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:385
+#: en/git-filter-branch.txt:398
#, priority:100
msgid "To rewrite only commits D,E,F,G,H, but leave A, B and C alone, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:388
+#: en/git-filter-branch.txt:401
#, ignore-ellipsis, no-wrap, priority:100
msgid "git filter-branch ... C..H\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:391
+#: en/git-filter-branch.txt:404
#, priority:100
msgid "To rewrite commits E,F,G,H, use one of these:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:395
+#: en/git-filter-branch.txt:408
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"git filter-branch ... C..H --not D\n"
@@ -23343,13 +23420,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:398
+#: en/git-filter-branch.txt:411
#, priority:100
msgid "To move the whole tree into a subdirectory, or remove it from there:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:405
+#: en/git-filter-branch.txt:418
#, no-wrap, priority:100
msgid ""
"git filter-branch --index-filter \\\n"
@@ -23360,87 +23437,279 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-filter-branch.txt:410
+#: en/git-filter-branch.txt:423
#, no-wrap, priority:100
msgid "CHECKLIST FOR SHRINKING A REPOSITORY"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:418
+#: en/git-filter-branch.txt:431
#, priority:100
msgid "git-filter-branch can be used to get rid of a subset of files, usually with some combination of `--index-filter` and `--subdirectory-filter`. People expect the resulting repository to be smaller than the original, but you need a few more steps to actually make it smaller, because Git tries hard not to lose your objects until you tell it to. First make sure that:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:422
+#: en/git-filter-branch.txt:435
#, priority:100
msgid "You really removed all variants of a filename, if a blob was moved over its lifetime. `git log --name-only --follow --all -- filename` can help you find renames."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:425
+#: en/git-filter-branch.txt:438
#, priority:100
msgid "You really filtered all refs: use `--tag-name-filter cat -- --all` when calling git-filter-branch."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:428
+#: en/git-filter-branch.txt:441
#, priority:100
msgid "Then there are two ways to get a smaller repository. A safer way is to clone, that keeps your original intact."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:432
+#: en/git-filter-branch.txt:445
#, priority:100
msgid "Clone it with `git clone file:///path/to/repo`. The clone will not have the removed objects. See linkgit:git-clone[1]. (Note that cloning with a plain path just hardlinks everything!)"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:437
+#: en/git-filter-branch.txt:450
#, priority:100
msgid "If you really don't want to clone it, for whatever reasons, check the following points instead (in this order). This is a very destructive approach, so *make a backup* or go back to cloning it. You have been warned."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:441
+#: en/git-filter-branch.txt:454
#, priority:100
msgid "Remove the original refs backed up by git-filter-branch: say `git for-each-ref --format=\"%(refname)\" refs/original/ | xargs -n 1 git update-ref -d`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:443
+#: en/git-filter-branch.txt:456
#, priority:100
msgid "Expire all reflogs with `git reflog expire --expire=now --all`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:447
+#: en/git-filter-branch.txt:460
#, priority:100
msgid "Garbage collect all unreferenced objects with `git gc --prune=now` (or if your git-gc is not new enough to support arguments to `--prune`, use `git repack -ad; git prune` instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:459
+#: en/git-filter-branch.txt:467
#, priority:100
-msgid "git-filter-branch allows you to make complex shell-scripted rewrites of your Git history, but you probably don't need this flexibility if you're simply _removing unwanted data_ like large files or passwords. For those operations you may want to consider http://rtyley.github.io/bfg-repo-cleaner/[The BFG Repo-Cleaner], a JVM-based alternative to git-filter-branch, typically at least 10-50x faster for those use-cases, and with quite different characteristics:"
+msgid "The performance of git-filter-branch is glacially slow; its design makes it impossible for a backward-compatible implementation to ever be fast:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:467
+#: en/git-filter-branch.txt:473
#, priority:100
-msgid "Any particular version of a file is cleaned exactly _once_. The BFG, unlike git-filter-branch, does not give you the opportunity to handle a file differently based on where or when it was committed within your history. This constraint gives the core performance benefit of The BFG, and is well-suited to the task of cleansing bad data - you don't care _where_ the bad data is, you just want it _gone_."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:473
+#: en/git-filter-branch.txt:476
+#, priority:100
+msgid "If you try and cheat and try to make git-filter-branch only work on files modified in a commit, then two things happen"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:482
+#, priority:100
+msgid "you run into problems with deletions whenever the user is simply trying to rename files (because attempting to delete files that don't exist looks like a no-op; it takes some chicanery to remap deletes across file renames when the renames happen via arbitrary user-provided shell)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:488
+#, priority:100
+msgid "even if you succeed at the map-deletes-for-renames chicanery, you still technically violate backward compatibility because users are allowed to filter files in ways that depend upon topology of commits instead of filtering solely based on file contents or names (though this has not been observed in the wild)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:494
+#, priority:100
+msgid "Even if you don't need to edit files but only want to e.g. rename or remove some and thus can avoid checking out each file (i.e. you can use --index-filter), you still are passing shell snippets for your filters. This means that for every commit, you have to have a prepared git repo where those filters can be run. That's a significant setup."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:505
+#, priority:100
+msgid "Further, several additional files are created or updated per commit by git-filter-branch. Some of these are for supporting the convenience functions provided by git-filter-branch (such as map()), while others are for keeping track of internal state (but could have also been accessed by user filters; one of git-filter-branch's regression tests does so). This essentially amounts to using the filesystem as an IPC mechanism between git-filter-branch and the user-provided filters. Disks tend to be a slow IPC mechanism, and writing these files also effectively represents a forced synchronization point between separate processes that we hit with every commit."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:511
+#, priority:100
+msgid "The user-provided shell commands will likely involve a pipeline of commands, resulting in the creation of many processes per commit. Creating and running another process takes a widely varying amount of time between operating systems, but on any platform it is very slow relative to invoking a function."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:517
+#, priority:100
+msgid "git-filter-branch itself is written in shell, which is kind of slow. This is the one performance issue that could be backward-compatibly fixed, but compared to the above problems that are intrinsic to the design of git-filter-branch, the language of the tool itself is a relatively minor issue."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:528
+#, priority:100
+msgid "Side note: Unfortunately, people tend to fixate on the written-in-shell aspect and periodically ask if git-filter-branch could be rewritten in another language to fix the performance issues. Not only does that ignore the bigger intrinsic problems with the design, it'd help less than you'd expect: if git-filter-branch itself were not shell, then the convenience functions (map(), skip_commit(), etc) and the `--setup` argument could no longer be executed once at the beginning of the program but would instead need to be prepended to every user filter (and thus re-executed with every commit)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:539
+#, priority:100
+msgid "The https://github.com/newren/git-filter-repo/[git filter-repo] tool is an alternative to git-filter-branch which does not suffer from these performance problems or the safety problems (mentioned below). For those with existing tooling which relies upon git-filter-branch, 'git repo-filter' also provides https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], a drop-in git-filter-branch replacement (with a few caveats). While filter-lamely suffers from all the same safety issues as git-filter-branch, it at least ameloriates the performance issues a little."
+msgstr ""
+
+#. type: Title -
+#: en/git-filter-branch.txt:542
+#, no-wrap, priority:100
+msgid "SAFETY"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:547
+#, priority:100
+msgid "git-filter-branch is riddled with gotchas resulting in various ways to easily corrupt repos or end up with a mess worse than what you started with:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:560
+#, priority:100
+msgid "Someone can have a set of \"working and tested filters\" which they document or provide to a coworker, who then runs them on a different OS where the same commands are not working/tested (some examples in the git-filter-branch manpage are also affected by this). BSD vs. GNU userland differences can really bite. If lucky, error messages are spewed. But just as likely, the commands either don't do the filtering requested, or silently corrupt by making some unwanted change. The unwanted change may only affect a few commits, so it's not necessarily obvious either. (The fact that problems won't necessarily be obvious means they are likely to go unnoticed until the rewritten history is in use for quite a while, at which point it's really hard to justify another flag-day for another rewrite.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:570
+#, priority:100
+msgid "Filenames with spaces are often mishandled by shell snippets since they cause problems for shell pipelines. Not everyone is familiar with find -print0, xargs -0, git-ls-files -z, etc. Even people who are familiar with these may assume such flags are not relevant because someone else renamed any such files in their repo back before the person doing the filtering joined the project. And often, even those familiar with handling arguments with spaces may not do so just because they aren't in the mindset of thinking about everything that could possibly go wrong."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:580
+#, priority:100
+msgid "Non-ascii filenames can be silently removed despite being in a desired directory. Keeping only wanted paths is often done using pipelines like `git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`. ls-files will only quote filenames if needed, so folks may not notice that one of the files didn't match the regex (at least not until it's much too late). Yes, someone who knows about core.quotePath can avoid this (unless they have other special characters like \\t, \\n, or \"), and people who use ls-files -z with something other than grep can avoid this, but that doesn't mean they will."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:586
#, priority:100
-msgid "By default The BFG takes full advantage of multi-core machines, cleansing commit file-trees in parallel. git-filter-branch cleans commits sequentially (i.e. in a single-threaded manner), though it _is_ possible to write filters that include their own parallelism, in the scripts executed against each commit."
+msgid "Similarly, when moving files around, one can find that filenames with non-ascii or special characters end up in a different directory, one that includes a double quote character. (This is technically the same issue as above with quoting, but perhaps an interesting different way that it can and has manifested as a problem.)"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:478
+#: en/git-filter-branch.txt:594
#, priority:100
-msgid "The http://rtyley.github.io/bfg-repo-cleaner/#examples[command options] are much more restrictive than git-filter branch, and dedicated just to the tasks of removing unwanted data- e.g: `--strip-blobs-bigger-than 1M`."
+msgid "It's far too easy to accidentally mix up old and new history. It's still possible with any tool, but git-filter-branch almost invites it. If lucky, the only downside is users getting frustrated that they don't know how to shrink their repo and remove the old stuff. If unlucky, they merge old and new history and end up with multiple \"copies\" of each commit, some of which have unwanted or sensitive files and others which don't. This comes about in multiple different ways:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:597
+#, priority:100
+msgid "the default to only doing a partial history rewrite ('--all' is not the default and few examples show it)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:599
+#, priority:100
+msgid "the fact that there's no automatic post-run cleanup"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:602
+#, priority:100
+msgid "the fact that --tag-name-filter (when used to rename tags) doesn't remove the old tags but just adds new ones with the new name"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:611
+#, priority:100
+msgid "the fact that little educational information is provided to inform users of the ramifications of a rewrite and how to avoid mixing old and new history. For example, this man page discusses how users need to understand that they need to rebase their changes for all their branches on top of new history (or delete and reclone), but that's only one of multiple concerns to consider. See the \"DISCUSSION\" section of the git filter-repo manual page for more details."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:614
+#, priority:100
+msgid "Annotated tags can be accidentally converted to lightweight tags, due to either of two issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:619
+#, priority:100
+msgid "Someone can do a history rewrite, realize they messed up, restore from the backups in refs/original/, and then redo their git-filter-branch command. (The backup in refs/original/ is not a real backup; it dereferences tags first.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:624
+#, priority:100
+msgid "Running git-filter-branch with either --tags or --all in your <rev-list options>. In order to retain annotated tags as annotated, you must use --tag-name-filter (and must not have restored from refs/original/ in a previously botched rewrite)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:629
+#, priority:100
+msgid "Any commit messages that specify an encoding will become corrupted by the rewrite; git-filter-branch ignores the encoding, takes the original bytes, and feeds it to commit-tree without telling it the proper encoding. (This happens whether or not --msg-filter is used.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:633
+#, priority:100
+msgid "Commit messages (even if they are all UTF-8) by default become corrupted due to not being updated -- any references to other commit hashes in commit messages will now refer to no-longer-extant commits."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:644
+#, priority:100
+msgid "There are no facilities for helping users find what unwanted crud they should delete, which means they are much more likely to have incomplete or partial cleanups that sometimes result in confusion and people wasting time trying to understand. (For example, folks tend to just look for big files to delete instead of big directories or extensions, and once they do so, then sometime later folks using the new repository who are going through history will notice a build artifact directory that has some files but not others, or a cache of dependencies (node_modules or similar) which couldn't have ever been functional since it's missing some files.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:647
+#, priority:100
+msgid "If --prune-empty isn't specified, then the filtering process can create hoards of confusing empty commits"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:651
+#, priority:100
+msgid "If --prune-empty is specified, then intentionally placed empty commits from before the filtering operation are also pruned instead of just pruning commits that became empty due to filtering rules."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:654
+#, ignore-ellipsis, priority:100
+msgid "If --prune empty is specified, sometimes empty commits are missed and left around anyway (a somewhat rare bug, but it happens...)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:658
+#, priority:100
+msgid "A minor issue, but users who have a goal to update all names and emails in a repository may be led to --env-filter which will only update authors and committers, missing taggers."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:664
+#, priority:100
+msgid "If the user provides a --tag-name-filter that maps multiple tags to the same name, no warning or error is provided; git-filter-branch simply overwrites each tag in some undocumented pre-defined order resulting in only one tag at the end. (A git-filter-branch regression test requires this surprising behavior.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:667
+#, priority:100
+msgid "Also, the poor performance of git-filter-branch often leads to safety issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:683
+#, priority:100
+msgid "Coming up with the correct shell snippet to do the filtering you want is sometimes difficult unless you're just doing a trivial modification such as deleting a couple files. Unfortunately, people often learn if the snippet is right or wrong by trying it out, but the rightness or wrongness can vary depending on special circumstances (spaces in filenames, non-ascii filenames, funny author names or emails, invalid timezones, presence of grafts or replace objects, etc.), meaning they may have to wait a long time, hit an error, then restart. The performance of git-filter-branch is so bad that this cycle is painful, reducing the time available to carefully re-check (to say nothing about what it does to the patience of the person doing the rewrite even if they do technically have more time available). This problem is extra compounded because errors from broken filters may not be shown for a long time and/or get lost in a sea of output. Even worse, broken filters often just result in silent incorrect rewrites."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:691
+#, priority:100
+msgid "To top it all off, even when users finally find working commands, they naturally want to share them. But they may be unaware that their repo didn't have some special cases that someone else's does. So, when someone else with a different repository runs the same commands, they get hit by the problems above. Or, the user just runs commands that really were vetted for special cases, but they run it on a different OS where it doesn't work, as noted above."
msgstr ""
#. type: Title =
@@ -23476,7 +23745,7 @@ msgid "This command is intended mostly for internal use by scripts automatically
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:64
+#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:68
#, no-wrap, priority:240
msgid "--log[=<n>]"
msgstr ""
@@ -23488,7 +23757,7 @@ msgid "In addition to branch names, populate the log message with one-line descr
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:65
+#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:69
#, ignore-same, no-wrap, priority:240
msgid "--no-log"
msgstr "--no-log"
@@ -23678,7 +23947,7 @@ msgstr ""
#: en/git-for-each-ref.txt:76
#, fuzzy, priority:100
msgid "Only list refs which points at the given object."
-msgstr "�ゆ돀�경뙁�묊퍢若싧�穩←쉪凉뺟뵪"
+msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:77
@@ -23732,7 +24001,7 @@ msgstr ""
#: en/git-for-each-ref.txt:97
#, fuzzy, priority:100
msgid "Sorting and filtering refs are case insensitive."
-msgstr "�믣틣�뚩퓝譯ㅵ콪雅롥ㄷ弱뤷넍訝띷븦��"
+msgstr ""
#. type: Title -
#: en/git-for-each-ref.txt:99
@@ -23756,7 +24025,7 @@ msgstr ""
#: en/git-for-each-ref.txt:107
#, fuzzy, no-wrap, priority:100
msgid "refname"
-msgstr "�띶뫝��"
+msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:123
@@ -23822,7 +24091,7 @@ msgstr ""
#: en/git-for-each-ref.txt:144
#, no-wrap, priority:100
msgid "upstream"
-msgstr "訝딀만"
+msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:154
@@ -24158,9 +24427,9 @@ msgid ""
"\t\t [--signature-file=<file>]\n"
"\t\t [-n | --numbered | -N | --no-numbered]\n"
"\t\t [--start-number <n>] [--numbered-files]\n"
-"\t\t [--in-reply-to=Message-Id] [--suffix=.<sfx>]\n"
+"\t\t [--in-reply-to=<message id>] [--suffix=.<sfx>]\n"
"\t\t [--ignore-if-in-upstream]\n"
-"\t\t [--rfc] [--subject-prefix=Subject-Prefix]\n"
+"\t\t [--rfc] [--subject-prefix=<subject prefix>]\n"
"\t\t [(--reroll-count|-v) <n>]\n"
"\t\t [--to=<email>] [--cc=<email>]\n"
"\t\t [--[no-]cover-letter] [--quiet]\n"
@@ -24209,523 +24478,524 @@ msgid "By default, each output file is numbered sequentially from 1, and uses th
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:70
+#: en/git-format-patch.txt:71
#, priority:100
-msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`."
+msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`. All directory components will be created."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:74
+#: en/git-format-patch.txt:75
#, priority:100
msgid "By default, the subject of a single patch is \"[PATCH] \" followed by the concatenation of lines from the commit message up to the first blank line (see the DISCUSSION section of linkgit:git-commit[1])."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:78
+#: en/git-format-patch.txt:79
#, priority:100
msgid "When multiple patches are output, the subject prefix will instead be \"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. To omit patch numbers from the subject, use `-N`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:83
+#: en/git-format-patch.txt:84
#, priority:100
msgid "If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a `Message-Id` header to reference."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:89
+#: en/git-format-patch.txt:90
#, fuzzy, no-wrap, priority:100
msgid "-<n>"
msgstr "<n>"
#. type: Plain text
-#: en/git-format-patch.txt:91
+#: en/git-format-patch.txt:92
#, priority:100
msgid "Prepare patches from the topmost <n> commits."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:92
+#: en/git-format-patch.txt:93
#, no-wrap, priority:100
msgid "-o <dir>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:93
+#: en/git-format-patch.txt:94
#, no-wrap, priority:100
msgid "--output-directory <dir>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:96
+#: en/git-format-patch.txt:97
#, priority:100
msgid "Use <dir> to store the resulting files, instead of the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:98 en/git-shortlog.txt:30
+#: en/git-format-patch.txt:99 en/git-shortlog.txt:30
#, ignore-same, no-wrap, priority:260
msgid "--numbered"
msgstr "--numbered"
#. type: Plain text
-#: en/git-format-patch.txt:100
+#: en/git-format-patch.txt:101
#, priority:100
msgid "Name output in '[PATCH n/m]' format, even with a single patch."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:102
+#: en/git-format-patch.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-numbered"
msgstr "--no-numbered"
#. type: Plain text
-#: en/git-format-patch.txt:104
+#: en/git-format-patch.txt:105
#, priority:100
msgid "Name output in '[PATCH]' format."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:105
+#: en/git-format-patch.txt:106
#, no-wrap, priority:100
msgid "--start-number <n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:107
+#: en/git-format-patch.txt:108
#, fuzzy, priority:100
msgid "Start numbering the patches at <n> instead of 1."
-msgstr "烏δ툈餓� <n> 凉�冶뗧폋�뤄펽�뚥툖��1"
+msgstr " <n> 1"
#. type: Labeled list
-#: en/git-format-patch.txt:108
+#: en/git-format-patch.txt:109
#, ignore-same, no-wrap, priority:100
msgid "--numbered-files"
msgstr "--numbered-files"
#. type: Plain text
-#: en/git-format-patch.txt:111
+#: en/git-format-patch.txt:112
#, priority:100
msgid "Output file names will be a simple number sequence without the default first line of the commit appended."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:113
+#: en/git-format-patch.txt:114
#, ignore-same, no-wrap, priority:100
msgid "--keep-subject"
msgstr "--keep-subject"
#. type: Plain text
-#: en/git-format-patch.txt:116
+#: en/git-format-patch.txt:117
#, priority:100
msgid "Do not strip/add '[PATCH]' from the first line of the commit log message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:122
+#: en/git-format-patch.txt:123
#, priority:100
msgid "Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:123 en/git-pack-objects.txt:59
+#: en/git-format-patch.txt:124 en/git-pack-objects.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--stdout"
msgstr "--stdout"
#. type: Plain text
-#: en/git-format-patch.txt:126
+#: en/git-format-patch.txt:127
#, priority:100
msgid "Print all commits to the standard output in mbox format, instead of creating a file for each one."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:127
+#: en/git-format-patch.txt:128
#, no-wrap, priority:100
msgid "--attach[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:131
+#: en/git-format-patch.txt:132
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: attachment`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:132
+#: en/git-format-patch.txt:133
#, ignore-same, no-wrap, priority:100
msgid "--no-attach"
msgstr "--no-attach"
#. type: Plain text
-#: en/git-format-patch.txt:135
+#: en/git-format-patch.txt:136
#, priority:100
msgid "Disable the creation of an attachment, overriding the configuration setting."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:136
+#: en/git-format-patch.txt:137
#, no-wrap, priority:100
msgid "--inline[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:140
+#: en/git-format-patch.txt:141
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: inline`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:141
+#: en/git-format-patch.txt:142
#, no-wrap, priority:100
msgid "--thread[=<style>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:142
+#: en/git-format-patch.txt:143
#, ignore-same, no-wrap, priority:100
msgid "--no-thread"
msgstr "--no-thread"
#. type: Plain text
-#: en/git-format-patch.txt:147
+#: en/git-format-patch.txt:148
#, priority:100
msgid "Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the first. Also controls generation of the `Message-Id` header to reference."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:153
+#: en/git-format-patch.txt:154
#, priority:100
msgid "The optional <style> argument can be either `shallow` or `deep`. 'shallow' threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order. 'deep' threading makes every mail a reply to the previous one."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:157
+#: en/git-format-patch.txt:158
#, priority:100
msgid "The default is `--no-thread`, unless the `format.thread` configuration is set. If `--thread` is specified without a style, it defaults to the style specified by `format.thread` if any, or else `shallow`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:161
+#: en/git-format-patch.txt:162
#, priority:100
msgid "Beware that the default for 'git send-email' is to thread emails itself. If you want `git format-patch` to take care of threading, you will want to ensure that threading is disabled for `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:162
-#, no-wrap, priority:100
-msgid "--in-reply-to=Message-Id"
-msgstr ""
+#: en/git-format-patch.txt:163
+#, fuzzy, no-wrap, priority:100
+#| msgid "--no-message-id"
+msgid "--in-reply-to=<message id>"
+msgstr "--no-message-id"
#. type: Plain text
-#: en/git-format-patch.txt:166
+#: en/git-format-patch.txt:167
#, priority:100
-msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given Message-Id, which avoids breaking threads to provide a new patch series."
+msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given <message id>, which avoids breaking threads to provide a new patch series."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:167
+#: en/git-format-patch.txt:168
#, ignore-same, no-wrap, priority:100
msgid "--ignore-if-in-upstream"
msgstr "--ignore-if-in-upstream"
#. type: Plain text
-#: en/git-format-patch.txt:173
+#: en/git-format-patch.txt:174
#, priority:100
msgid "Do not include a patch that matches a commit in <until>..<since>. This will examine all patches reachable from <since> but not from <until> and compare them with the patches being generated, and any patch that matches is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:174
+#: en/git-format-patch.txt:175
#, no-wrap, priority:100
-msgid "--subject-prefix=<Subject-Prefix>"
+msgid "--subject-prefix=<subject prefix>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:179
+#: en/git-format-patch.txt:180
#, priority:100
-msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<Subject-Prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
+msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<subject prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:180
+#: en/git-format-patch.txt:181
#, ignore-same, no-wrap, priority:100
msgid "--rfc"
msgstr "--rfc"
#. type: Plain text
-#: en/git-format-patch.txt:184
+#: en/git-format-patch.txt:185
#, priority:100
msgid "Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For Comments\"; use this when sending an experimental patch for discussion rather than application."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:185
+#: en/git-format-patch.txt:186
#, no-wrap, priority:100
msgid "-v <n>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:186
+#: en/git-format-patch.txt:187
#, no-wrap, priority:100
msgid "--reroll-count=<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:193
+#: en/git-format-patch.txt:194
#, priority:100
msgid "Mark the series as the <n>-th iteration of the topic. The output filenames have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default, but configurable via the `--subject-prefix` option) has ` v<n>` appended to it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:194
+#: en/git-format-patch.txt:195
#, no-wrap, priority:100
msgid "--to=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:199
+#: en/git-format-patch.txt:200
#, priority:100
msgid "Add a `To:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-to` discards all `To:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:200
+#: en/git-format-patch.txt:201
#, no-wrap, priority:100
msgid "--cc=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:205
+#: en/git-format-patch.txt:206
#, priority:100
msgid "Add a `Cc:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-cc` discards all `Cc:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:206
+#: en/git-format-patch.txt:207
#, ignore-same, no-wrap, priority:100
msgid "--from"
msgstr "--from"
#. type: Labeled list
-#: en/git-format-patch.txt:207
+#: en/git-format-patch.txt:208
#, no-wrap, priority:100
msgid "--from=<ident>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:213
+#: en/git-format-patch.txt:214
#, priority:100
msgid "Use `ident` in the `From:` header of each commit email. If the author ident of the commit is not textually identical to the provided `ident`, place a `From:` header in the body of the message with the original author. If no `ident` is given, use the committer ident."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:220
+#: en/git-format-patch.txt:221
#, priority:100
msgid "Note that this option is only useful if you are actually sending the emails and want to identify yourself as the sender, but retain the original author (and `git am` will correctly pick up the in-body header). Note also that `git send-email` already handles this transformation for you, and this option should not be used if you are feeding the result to `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:221
+#: en/git-format-patch.txt:222
#, no-wrap, priority:100
msgid "--add-header=<header>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:228
+#: en/git-format-patch.txt:229
#, priority:100
msgid "Add an arbitrary header to the email headers. This is in addition to any configured headers, and may be used multiple times. For example, `--add-header=\"Organization: git-foo\"`. The negated form `--no-add-header` discards *all* (`To:`, `Cc:`, and custom) headers added so far from config or command line."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:229
+#: en/git-format-patch.txt:230
#, ignore-same, no-wrap, priority:100
msgid "--[no-]cover-letter"
msgstr "--[no-]cover-letter"
#. type: Plain text
-#: en/git-format-patch.txt:233
+#: en/git-format-patch.txt:234
#, priority:100
msgid "In addition to the patches, generate a cover letter file containing the branch description, shortlog and the overall diffstat. You can fill in a description in the file before sending it out."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:234
+#: en/git-format-patch.txt:235
#, no-wrap, priority:100
msgid "--interdiff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:242
+#: en/git-format-patch.txt:243
#, priority:100
msgid "As a reviewer aid, insert an interdiff into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` is a single revision naming the tip of the previous series which shares a common base with the series being formatted (for example `git format-patch --cover-letter --interdiff=feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:243
+#: en/git-format-patch.txt:244
#, no-wrap, priority:100
msgid "--range-diff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:254
+#: en/git-format-patch.txt:255
#, priority:100
msgid "As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1]) into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` can be a single revision naming the tip of the previous series if it shares a common base with the series being formatted (for example `git format-patch --cover-letter --range-diff=feature/v1 -3 feature/v2`), or a revision range if the two versions of the series are disjoint (for example `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:259
+#: en/git-format-patch.txt:260
#, priority:100
msgid "Note that diff options passed to the command affect how the primary product of `format-patch` is generated, and they are not passed to the underlying `range-diff` machinery used to generate the cover-letter material (this may change in the future)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:260
+#: en/git-format-patch.txt:261
#, no-wrap, priority:100
msgid "--creation-factor=<percent>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:265
+#: en/git-format-patch.txt:266
#, priority:100
msgid "Used with `--range-diff`, tweak the heuristic which matches up commits between the previous and current series of patches by adjusting the creation/deletion cost fudge factor. See linkgit:git-range-diff[1]) for details."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:266
+#: en/git-format-patch.txt:267
#, no-wrap, priority:100
msgid "--notes[=<ref>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:267 en/pretty-options.txt:81
+#: en/git-format-patch.txt:268 en/pretty-options.txt:81
#, ignore-same, no-wrap, priority:260
msgid "--no-notes"
msgstr "--no-notes"
#. type: Plain text
-#: en/git-format-patch.txt:270
+#: en/git-format-patch.txt:271
#, priority:100
msgid "Append the notes (see linkgit:git-notes[1]) for the commit after the three-dash line."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:278
+#: en/git-format-patch.txt:279
#, priority:100
msgid "The expected use case of this is to write supporting explanation for the commit that does not belong to the commit log message proper, and include it with the patch submission. While one can simply write these explanations after `format-patch` has run but before sending, keeping them as Git notes allows them to be maintained between versions of the patch series (but see the discussion of the `notes.rewrite` configuration options in linkgit:git-notes[1] to use this workflow)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:281
+#: en/git-format-patch.txt:282
#, priority:100
msgid "The default is `--no-notes`, unless the `format.notes` configuration is set."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:282
+#: en/git-format-patch.txt:283
#, no-wrap, priority:100
msgid "--[no-]signature=<signature>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:287
+#: en/git-format-patch.txt:288
#, priority:100
msgid "Add a signature to each message produced. Per RFC 3676 the signature is separated from the body by a line with '-- ' on it. If the signature option is omitted the signature defaults to the Git version number."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:288
+#: en/git-format-patch.txt:289
#, no-wrap, priority:100
msgid "--signature-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:290
+#: en/git-format-patch.txt:291
#, priority:100
msgid "Works just like --signature except the signature is read from a file."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:291
+#: en/git-format-patch.txt:292
#, no-wrap, priority:100
msgid "--suffix=.<sfx>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:296
+#: en/git-format-patch.txt:297
#, priority:100
msgid "Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is `--suffix=.txt`. Leaving this empty will remove the `.patch` suffix."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:299
+#: en/git-format-patch.txt:300
#, priority:100
msgid "Note that the leading character does not have to be a dot; for example, you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:303
+#: en/git-format-patch.txt:304
#, priority:100
msgid "Do not print the names of the generated files to standard output."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:304
+#: en/git-format-patch.txt:305
#, ignore-same, no-wrap, priority:100
msgid "--no-binary"
msgstr "--no-binary"
#. type: Plain text
-#: en/git-format-patch.txt:309
+#: en/git-format-patch.txt:310
#, priority:100
msgid "Do not output contents of changes in binary files, instead display a notice that those files changed. Patches generated using this option cannot be applied properly, but they are still useful for code review."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:310
+#: en/git-format-patch.txt:311
#, ignore-same, no-wrap, priority:100
msgid "--zero-commit"
msgstr "--zero-commit"
#. type: Plain text
-#: en/git-format-patch.txt:313
+#: en/git-format-patch.txt:314
#, priority:100
msgid "Output an all-zero hash in each patch's From header instead of the hash of the commit."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:314
+#: en/git-format-patch.txt:315
#, no-wrap, priority:100
msgid "--base=<commit>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:318
+#: en/git-format-patch.txt:320
#, priority:100
-msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details."
+msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details. If <commit> is \"auto\", a base commit is automatically chosen."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:325
+#: en/git-format-patch.txt:327
#, priority:100
msgid "Treat the revision argument as a <revision range>, even if it is just a single commit (that would normally be treated as a <since>). Note that root commits included in the specified range are always formatted as creation patches, independently of this flag."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:328
+#: en/git-format-patch.txt:330
#, priority:100
msgid "Show progress reports on stderr as patches are generated."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:335
+#: en/git-format-patch.txt:338
#, priority:100
-msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To\" or \"Cc:\" headers, configure attachments, and sign off patches with configuration variables."
+msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To:\" or \"Cc:\" headers, configure attachments, change the patch output directory, and sign off patches with configuration variables."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:347
+#: en/git-format-patch.txt:351
#, no-wrap, priority:100
msgid ""
"[format]\n"
@@ -24737,17 +25007,18 @@ msgid ""
"\tcc = <email>\n"
"\tattach [ = mime-boundary-string ]\n"
"\tsignOff = true\n"
-"\tcoverletter = auto\n"
+"\toutputDirectory = <directory>\n"
+"\tcoverLetter = auto\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:356
+#: en/git-format-patch.txt:360
#, priority:100
msgid "The patch produced by 'git format-patch' is in UNIX mailbox format, with a fixed \"magic\" time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:366
+#: en/git-format-patch.txt:370
#, no-wrap, priority:100
msgid ""
"From 8f72bad1baf19a53459661343e21d6491c3908d3 Mon Sep 17 00:00:00 2001\n"
@@ -24761,7 +25032,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:369
+#: en/git-format-patch.txt:373
#, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -24769,7 +25040,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:372
+#: en/git-format-patch.txt:376
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"Do the same for ia64 so we can have sleek & trim looking\n"
@@ -24777,19 +25048,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:380
+#: en/git-format-patch.txt:384
#, ignore-ellipsis, priority:100
msgid "Typically it will be placed in a MUA's drafts folder, edited to add timely commentary that should not go in the changelog after the three dashes, and then sent as a message whose body, in our example, starts with \"arch/arm config files were...\". On the receiving end, readers can save interesting patches in a UNIX mailbox and apply them with linkgit:git-am[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:386
+#: en/git-format-patch.txt:390
#, priority:100
msgid "When a patch is part of an ongoing discussion, the patch generated by 'git format-patch' can be tweaked to take advantage of the 'git am --scissors' feature. After your response to the discussion comes a line that consists solely of \"`-- >8 --`\" (scissors and perforation), followed by the patch with unnecessary header fields removed:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:390
+#: en/git-format-patch.txt:394
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"...\n"
@@ -24797,21 +25068,21 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:392
+#: en/git-format-patch.txt:396
#, no-wrap, priority:100
msgid "Makes sense to me. How about this patch?\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:395
+#: en/git-format-patch.txt:399
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-Knig diet\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:398
+#: en/git-format-patch.txt:402
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -24819,61 +25090,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:406
+#: en/git-format-patch.txt:410
#, priority:100
msgid "When sending a patch this way, most often you are sending your own patch, so in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit `From:` and `Date:` lines from the patch file. The patch title is likely to be different from the subject of the discussion the patch is in response to, so it is likely that you would want to keep the Subject: line, like the example above."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:408
+#: en/git-format-patch.txt:412
#, no-wrap, priority:100
msgid "Checking for patch corruption"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:411
+#: en/git-format-patch.txt:415
#, priority:100
msgid "Many mailers if not set up properly will corrupt whitespace. Here are two common types of corruption:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:413
+#: en/git-format-patch.txt:417
#, priority:100
msgid "Empty context lines that do not have _any_ whitespace."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:416
+#: en/git-format-patch.txt:420
#, priority:100
msgid "Non-empty context lines that have one extra whitespace at the beginning."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:418
+#: en/git-format-patch.txt:422
#, priority:100
msgid "One way to test if your MUA is set up correctly is:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:422
+#: en/git-format-patch.txt:426
#, priority:100
msgid "Send the patch to yourself, exactly the way you would, except with To: and Cc: lines that do not contain the list and maintainer address."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:425
+#: en/git-format-patch.txt:429
#, priority:100
msgid "Save that patch to a file in UNIX mailbox format. Call it a.patch, say."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:427
+#: en/git-format-patch.txt:431
#, priority:100
msgid "Apply it:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:432
+#: en/git-format-patch.txt:436
#, no-wrap, priority:100
msgid ""
"$ git fetch <project> master:test-apply\n"
@@ -24883,175 +25154,175 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:434
+#: en/git-format-patch.txt:438
#, priority:100
msgid "If it does not apply correctly, there can be various reasons."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:439
+#: en/git-format-patch.txt:443
#, priority:100
msgid "The patch itself does not apply cleanly. That is _bad_ but does not have much to do with your MUA. You might want to rebase the patch with linkgit:git-rebase[1] before regenerating it in this case."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:444
+#: en/git-format-patch.txt:448
#, priority:100
msgid "The MUA corrupted your patch; \"am\" would complain that the patch does not apply. Look in the .git/rebase-apply/ subdirectory and see what 'patch' file contains and check for the common corruption patterns mentioned above."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:452
+#: en/git-format-patch.txt:456
#, priority:100
msgid "While at it, check the 'info' and 'final-commit' files as well. If what is in 'final-commit' is not exactly what you would want to see in the commit log message, it is very likely that the receiver would end up hand editing the log message when applying your patch. Things like \"Hi, this is my first patch.\\n\" in the patch e-mail should come after the three-dash line that signals the end of the commit message."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:454
+#: en/git-format-patch.txt:458
#, no-wrap, priority:100
msgid "MUA-SPECIFIC HINTS"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:457
+#: en/git-format-patch.txt:461
#, priority:100
msgid "Here are some hints on how to successfully submit patches inline using various mailers."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:459
+#: en/git-format-patch.txt:463
#, no-wrap, priority:100
msgid "GMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:465
+#: en/git-format-patch.txt:469
#, priority:100
msgid "GMail does not have any way to turn off line wrapping in the web interface, so it will mangle any emails that you send. You can however use \"git send-email\" and send your patches through the GMail SMTP server, or use any IMAP email client to connect to the google IMAP server and forward the emails through that."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:468
+#: en/git-format-patch.txt:472
#, priority:100
msgid "For hints on using 'git send-email' to send your patches through the GMail SMTP server, see the EXAMPLE section of linkgit:git-send-email[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:471
+#: en/git-format-patch.txt:475
#, priority:100
msgid "For hints on submission using the IMAP interface, see the EXAMPLE section of linkgit:git-imap-send[1]."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:473
+#: en/git-format-patch.txt:477
#, no-wrap, priority:100
msgid "Thunderbird"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:477
+#: en/git-format-patch.txt:481
#, priority:100
msgid "By default, Thunderbird will both wrap emails as well as flag them as being 'format=flowed', both of which will make the resulting email unusable by Git."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:481
+#: en/git-format-patch.txt:485
#, priority:100
msgid "There are three different approaches: use an add-on to turn off line wraps, configure Thunderbird to not mangle patches, or use an external editor to keep Thunderbird from mangling the patches."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:483
+#: en/git-format-patch.txt:487
#, no-wrap, priority:100
msgid "Approach #1 (add-on)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:491
+#: en/git-format-patch.txt:495
#, priority:100
msgid "Install the Toggle Word Wrap add-on that is available from https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you can tick off. Now you can compose the message as you otherwise do (cut + paste, 'git format-patch' | 'git imap-send', etc), but you have to insert line breaks manually in any text that you type."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:493
+#: en/git-format-patch.txt:497
#, no-wrap, priority:100
msgid "Approach #2 (configuration)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:495
+#: en/git-format-patch.txt:499
#, priority:100
msgid "Three steps:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:499
+#: en/git-format-patch.txt:503
#, ignore-ellipsis, priority:100
msgid "Configure your mail server composition as plain text: Edit...Account Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:501
+#: en/git-format-patch.txt:505
#, priority:100
msgid "Configure your general composition window to not wrap."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:504
+#: en/git-format-patch.txt:508
#, priority:100
msgid "In Thunderbird 2: Edit..Preferences..Composition, wrap plain text messages at 0"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:510
+#: en/git-format-patch.txt:514
#, priority:100
msgid "In Thunderbird 3: Edit..Preferences..Advanced..Config Editor. Search for \"mail.wrap_long_lines\". Toggle it to make sure it is set to `false`. Also, search for \"mailnews.wraplength\" and set the value to 0."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:515
+#: en/git-format-patch.txt:519
#, priority:100
msgid "Disable the use of format=flowed: Edit..Preferences..Advanced..Config Editor. Search for \"mailnews.send_plaintext_flowed\". Toggle it to make sure it is set to `false`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:519
+#: en/git-format-patch.txt:523
#, priority:100
msgid "After that is done, you should be able to compose email as you otherwise would (cut + paste, 'git format-patch' | 'git imap-send', etc), and the patches will not be mangled."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:521
+#: en/git-format-patch.txt:525
#, no-wrap, priority:100
msgid "Approach #3 (external editor)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:526
+#: en/git-format-patch.txt:530
#, priority:100
msgid "The following Thunderbird extensions are needed: AboutConfig from http://aboutconfig.mozdev.org/ and External Editor from http://globs.org/articles.php?lng=en&pg=8"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:528
+#: en/git-format-patch.txt:532
#, priority:100
msgid "Prepare the patch as a text file using your method of choice."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:533
+#: en/git-format-patch.txt:537
#, priority:100
msgid "Before opening a compose window, use Edit->Account Settings to uncheck the \"Compose messages in HTML format\" setting in the \"Composition & Addressing\" panel of the account to be used to send the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:537
+#: en/git-format-patch.txt:541
#, priority:100
msgid "In the main Thunderbird window, 'before' you open the compose window for the patch, use Tools->about:config to set the following to the indicated values:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:541
+#: en/git-format-patch.txt:545
#, no-wrap, priority:100
msgid ""
"\tmailnews.send_plaintext_flowed => false\n"
@@ -25059,25 +25330,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:544
+#: en/git-format-patch.txt:548
#, priority:100
msgid "Open a compose window and click the external editor icon."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:547
+#: en/git-format-patch.txt:551
#, priority:100
msgid "In the external editor window, read in the patch file and exit the editor normally."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:550
+#: en/git-format-patch.txt:554
#, priority:100
msgid "Side note: it may be possible to do step 2 with about:config and the following settings but no one's tried yet."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:555
+#: en/git-format-patch.txt:559
#, no-wrap, priority:100
msgid ""
"\tmail.html_compose => false\n"
@@ -25086,91 +25357,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:560
+#: en/git-format-patch.txt:564
#, priority:100
msgid "There is a script in contrib/thunderbird-patch-inline which can help you include patches with Thunderbird in an easy way. To use it, do the steps above and then use the script as the external editor."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:562
+#: en/git-format-patch.txt:566
#, no-wrap, priority:100
msgid "KMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:564
+#: en/git-format-patch.txt:568
#, priority:100
msgid "This should help you to submit patches inline using KMail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:566
+#: en/git-format-patch.txt:570
#, priority:100
msgid "Prepare the patch as a text file."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:568
+#: en/git-format-patch.txt:572
#, priority:100
msgid "Click on New Mail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:571
+#: en/git-format-patch.txt:575
#, priority:100
msgid "Go under \"Options\" in the Composer window and be sure that \"Word wrap\" is not set."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:573
+#: en/git-format-patch.txt:577
#, ignore-ellipsis, priority:100
msgid "Use Message -> Insert file... and insert the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:576
+#: en/git-format-patch.txt:580
#, priority:100
msgid "Back in the compose window: add whatever other text you wish to the message, complete the addressing and subject fields, and press send."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:578
+#: en/git-format-patch.txt:582
#, no-wrap, priority:100
msgid "BASE TREE INFORMATION"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:587
+#: en/git-format-patch.txt:591
#, priority:100
msgid "The base tree information block is used for maintainers or third party testers to know the exact state the patch series applies to. It consists of the 'base commit', which is a well-known commit that is part of the stable part of the project history everybody else works off of, and zero or more 'prerequisite patches', which are well-known patches in flight that is not yet part of the 'base commit' that need to be applied on top of 'base commit' in topological order before the patches can be applied."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:593
+#: en/git-format-patch.txt:597
#, priority:100
msgid "The 'base commit' is shown as \"base-commit: \" followed by the 40-hex of the commit object name. A 'prerequisite patch' is shown as \"prerequisite-patch-id: \" followed by the 40-hex 'patch id', which can be obtained by passing the patch through the `git patch-id --stable` command."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:597
+#: en/git-format-patch.txt:601
#, priority:100
msgid "Imagine that on top of the public commit P, you applied well-known patches X, Y and Z from somebody else, and then built your three-patch series A, B, C, the history would be like:"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:600
+#: en/git-format-patch.txt:604
#, no-wrap, priority:100
msgid "---P---X---Y---Z---A---B---C\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:607
+#: en/git-format-patch.txt:611
#, priority:100
msgid "With `git format-patch --base=P -3 C` (or variants thereof, e.g. with `--cover-letter` or using `Z..C` instead of `-3 C` to specify the range), the base tree information block is shown at the end of the first message the command outputs (either the first patch, or the cover letter), like this:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:613
+#: en/git-format-patch.txt:617
#, no-wrap, priority:100
msgid ""
"base-commit: P\n"
@@ -25180,13 +25451,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:616
+#: en/git-format-patch.txt:620
#, priority:100
msgid "For non-linear topology, such as"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:621
+#: en/git-format-patch.txt:625
#, no-wrap, priority:100
msgid ""
"---P---X---A---M---C\n"
@@ -25195,91 +25466,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:626
+#: en/git-format-patch.txt:630
#, priority:100
msgid "You can also use `git format-patch --base=P -3 C` to generate patches for A, B and C, and the identifiers for P, X, Y, Z are appended at the end of the first message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:632
+#: en/git-format-patch.txt:636
#, priority:100
msgid "If set `--base=auto` in cmdline, it will track base commit automatically, the base commit will be the merge base of tip commit of the remote-tracking branch and revision-range specified in cmdline. For a local branch, you need to track a remote branch by `git branch --set-upstream-to` before using this option."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:638
+#: en/git-format-patch.txt:642
#, priority:100
msgid "Extract commits between revisions R1 and R2, and apply them on top of the current branch using 'git am' to cherry-pick them:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:641
+#: en/git-format-patch.txt:645
#, no-wrap, priority:100
msgid "$ git format-patch -k --stdout R1..R2 | git am -3 -k\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:645
+#: en/git-format-patch.txt:649
#, priority:100
msgid "Extract all commits which are in the current branch but not in the origin branch:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:648
+#: en/git-format-patch.txt:652
#, no-wrap, priority:100
msgid "$ git format-patch origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:651
+#: en/git-format-patch.txt:655
#, priority:100
msgid "For each commit a separate file is created in the current directory."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:654
+#: en/git-format-patch.txt:658
#, priority:100
msgid "Extract all commits that lead to 'origin' since the inception of the project:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:657
+#: en/git-format-patch.txt:661
#, no-wrap, priority:100
msgid "$ git format-patch --root origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:660
+#: en/git-format-patch.txt:664
#, priority:100
msgid "The same as the previous one:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:663
+#: en/git-format-patch.txt:667
#, no-wrap, priority:100
msgid "$ git format-patch -M -B origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:670
+#: en/git-format-patch.txt:674
#, priority:100
msgid "Additionally, it detects and handles renames and complete rewrites intelligently to produce a renaming patch. A renaming patch reduces the amount of text output, and generally makes it easier to review. Note that non-Git \"patch\" programs won't understand renaming patches, so use it only when you know the recipient uses Git to apply your patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:673
+#: en/git-format-patch.txt:677
#, priority:100
msgid "Extract three topmost commits from the current branch and format them as e-mailable patches:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:676
+#: en/git-format-patch.txt:680
#, no-wrap, priority:100
msgid "$ git format-patch -3\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:681
+#: en/git-format-patch.txt:685
#, ignore-same, priority:100
msgid "linkgit:git-am[1], linkgit:git-send-email[1]"
msgstr "linkgit:git-am[1], linkgit:git-send-email[1]"
@@ -25294,7 +25565,7 @@ msgstr "git-fsck-objects(1)"
#: en/git-fsck-objects.txt:7
#, fuzzy, priority:100
msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
-msgstr "謠뚩칮餓볟틩訝��穩←쉪瓦욇�싨�㎩뭽�됪븞��"
+msgstr ""
#. type: Plain text
#: en/git-fsck-objects.txt:13
@@ -25318,7 +25589,7 @@ msgstr "git-fsck(1)"
#: en/git-fsck.txt:7
#, fuzzy, priority:100
msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
-msgstr "謠뚩칮餓볟틩訝��穩←쉪瓦욇�싨�㎩뭽�됪븞��"
+msgstr ""
#. type: Plain text
#: en/git-fsck.txt:16
@@ -25370,13 +25641,13 @@ msgstr ""
#: en/git-fsck.txt:40
#, fuzzy, priority:100
msgid "Report root nodes."
-msgstr "�ε몜�배뒄��"
+msgstr ""
#. type: Plain text
#: en/git-fsck.txt:43
#, fuzzy, priority:100
msgid "Report tags."
-msgstr "�ε몜�뉒�"
+msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:44
@@ -25628,7 +25899,7 @@ msgstr "git-gc(1)"
#: en/git-gc.txt:7
#, fuzzy, priority:100
msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
-msgstr "歷낂솮訝띶퓚誤곭쉪�뉏뻑�뚥폍�뽪쑍�겻퍜佯�"
+msgstr ""
#. type: Plain text
#: en/git-gc.txt:13
@@ -25775,43 +26046,43 @@ msgid "The below documentation is the same as what's found in linkgit:git-config
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:127
+#: en/git-gc.txt:126
#, priority:100
-msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, refs saved by 'git filter-branch' in refs/original/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
+msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, notes saved by 'git notes' under refs/notes/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:134
+#: en/git-gc.txt:133
#, priority:100
msgid "On the other hand, when 'git gc' runs concurrently with another process, there is a risk of it deleting an object that the other process is using but hasn't created a reference to. This may just cause the other process to fail or may corrupt the repository if the other process later adds a reference to the deleted object. Git has two features that significantly mitigate this problem:"
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:137
+#: en/git-gc.txt:136
#, priority:100
msgid "Any object with modification time newer than the `--prune` date is kept, along with everything reachable from it."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:141
+#: en/git-gc.txt:140
#, priority:100
msgid "Most operations that add an object to the database update the modification time of the object if it is already present so that #1 applies."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:145
+#: en/git-gc.txt:144
#, priority:100
msgid "However, these features fall short of a complete solution, so users who run commands concurrently have to live with some risk of corruption (which seems to be low in practice)."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:151
+#: en/git-gc.txt:150
#, priority:100
msgid "The 'git gc --auto' command will run the 'pre-auto-gc' hook. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:159
+#: en/git-gc.txt:158
#, ignore-same, priority:100
msgid "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
msgstr "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
@@ -26062,7 +26333,7 @@ msgstr ""
#: en/git-grep.txt:119
#, fuzzy, priority:100
msgid "Don't match the pattern in binary files."
-msgstr "訝띶쑉雅뚩퓵�뜻뻼餓뜸릎�백뀓與▼폀"
+msgstr ""
#. type: Labeled list
#: en/git-grep.txt:120
@@ -26077,7 +26348,7 @@ msgid "For each <pathspec> given on command line, descend at most <depth> levels
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:399
+#: en/git-grep.txt:128 en/git-submodule.txt:400
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
@@ -26293,7 +26564,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:951
+#: en/git-grep.txt:217 en/rev-list-options.txt:967
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -26326,7 +26597,7 @@ msgstr "--break"
#: en/git-grep.txt:232
#, fuzzy, priority:100
msgid "Print an empty line between matches from different files."
-msgstr "�ⓧ툖�뚧뻼餓띄쉪�백뀓窈밥퉳�닸돀�곁㈉烏�"
+msgstr ""
#. type: Labeled list
#: en/git-grep.txt:233
@@ -26443,127 +26714,151 @@ msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:280
+#: en/git-grep.txt:277
+#, priority:100
+msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:282
+#, priority:100
+msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:287
+#, priority:100
+msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:291
+#, priority:100
+msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:297
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:281
+#: en/git-grep.txt:298
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:282
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:283 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:284
+#: en/git-grep.txt:301
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:289
+#: en/git-grep.txt:306
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:290 en/rev-list-options.txt:65
+#: en/git-grep.txt:307 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:294
+#: en/git-grep.txt:311
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:299
+#: en/git-grep.txt:316
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:300
+#: en/git-grep.txt:317
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:303
+#: en/git-grep.txt:320
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:307
+#: en/git-grep.txt:324
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:328
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:318
+#: en/git-grep.txt:335
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:321
+#: en/git-grep.txt:338
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:322
+#: en/git-grep.txt:339
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:325
+#: en/git-grep.txt:342
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:326
+#: en/git-grep.txt:343
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:329
+#: en/git-grep.txt:346
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:330
+#: en/git-grep.txt:347
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:332
+#: en/git-grep.txt:349
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
@@ -26578,7 +26873,7 @@ msgstr "git-gui(1)"
#: en/git-gui.txt:7
#, fuzzy, priority:100
msgid "git-gui - A portable graphical interface to Git"
-msgstr "訝�訝や씩�븀쉪 Git �얍숱若€댎塋�"
+msgstr " Git "
#. type: Plain text
#: en/git-gui.txt:12
@@ -26770,7 +27065,7 @@ msgstr ""
#: en/git-gui.txt:110
#, no-wrap, priority:100
msgid "Other"
-msgstr "�뜹츆"
+msgstr ""
#. type: Plain text
#: en/git-gui.txt:114
@@ -26781,25 +27076,13 @@ msgstr ""
#. type: Plain text
#: en/git-gui.txt:116
#, priority:100
-msgid "A 'git gui' development repository can be obtained from:"
+msgid "The official repository of the 'git gui' project can be found at:"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:118
#, no-wrap, priority:100
-msgid " git clone git://repo.or.cz/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:122
-#, no-wrap, priority:100
-msgid " git clone http://repo.or.cz/r/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:124
-#, priority:100
-msgid "or browsed online at http://repo.or.cz/w/git-gui.git/[]."
+msgid " https://github.com/prati0100/git-gui.git/\n"
msgstr ""
#. type: Title =
@@ -26812,7 +27095,7 @@ msgstr "git-hash-object(1)"
#: en/git-hash-object.txt:7
#, fuzzy, priority:100
msgid "git-hash-object - Compute object ID and optionally creates a blob from a file"
-msgstr "餓롣�訝ゆ뻼餓띈�嶸쀥�穩� ID竊뚦뭉��빳�쎾뻠 blob �경뜮野배괌"
+msgstr " ID blob "
#. type: Plain text
#: en/git-hash-object.txt:14
@@ -26844,7 +27127,7 @@ msgstr ""
#: en/git-hash-object.txt:31
#, fuzzy, priority:100
msgid "Actually write the object into the object database."
-msgstr "弱녶�穩▼넍�ε�穩→빊��틩"
+msgstr ""
#. type: Plain text
#: en/git-hash-object.txt:34
@@ -26904,7 +27187,7 @@ msgstr "git-help(1)"
#: en/git-help.txt:7
#, fuzzy, priority:100
msgid "git-help - Display help information about Git"
-msgstr "�양ㅊ Git �꾢리�⒳에��"
+msgstr " Git "
#. type: Plain text
#: en/git-help.txt:13
@@ -27703,7 +27986,7 @@ msgstr ""
#: en/git-http-fetch.txt:17
#, fuzzy, priority:100
msgid "Downloads a remote Git repository via HTTP."
-msgstr "�싪퓝 HTTP 餓롨퓶葉� Git 餓볟틩訝뗨슬"
+msgstr " HTTP Git "
#. type: Plain text
#: en/git-http-fetch.txt:21
@@ -27787,7 +28070,7 @@ msgstr "git-http-push(1)"
#: en/git-http-push.txt:7
#, fuzzy, priority:100
msgid "git-http-push - Push objects over HTTP/DAV to another repository"
-msgstr "�싪퓝 HTTP/DAV �③�곩�穩▼룱訝�訝や퍜佯�"
+msgstr " HTTP/DAV "
#. type: Plain text
#: en/git-http-push.txt:13
@@ -27940,7 +28223,7 @@ msgstr "git-imap-send(1)"
#: en/git-imap-send.txt:7
#, fuzzy, priority:100
msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
-msgstr "餓롦젃�녻풏�ε컛訝�瀯꾥‥訝곩룕�곩댆IMAP�뉏뻑鸚�"
+msgstr "IMAP"
#. type: Plain text
#: en/git-imap-send.txt:13
@@ -27970,7 +28253,7 @@ msgstr ""
#: en/git-imap-send.txt:39
#, fuzzy, priority:100
msgid "Be quiet."
-msgstr "�숅퍡與▼폀"
+msgstr ""
#. type: Labeled list
#: en/git-imap-send.txt:40
@@ -28132,7 +28415,7 @@ msgstr "git-index-pack(1)"
#: en/git-index-pack.txt:7
#, fuzzy, priority:100
msgid "git-index-pack - Build pack index file for an existing packed archive"
-msgstr "餓롣�訝ょ렟耶섊쉪�끻춼旅ｆ뻼餓뜹닗兩뷴똿榮℡폊"
+msgstr ""
#. type: Plain text
#: en/git-index-pack.txt:15
@@ -28315,7 +28598,7 @@ msgstr "git-init(1)"
#: en/git-init.txt:7
#, fuzzy, priority:300
msgid "git-init - Create an empty Git repository or reinitialize an existing one"
-msgstr "�쎾뻠訝�訝ょ㈉�� Git 餓볟틩�뽭뇥�겼닜冶뗥뙑訝�訝ゅ럴耶섇쑉�꾡퍜佯�"
+msgstr " Git "
#. type: Plain text
#: en/git-init.txt:15
@@ -28562,7 +28845,7 @@ msgstr "git-instaweb(1)"
#: en/git-instaweb.txt:7
#, fuzzy, priority:100
msgid "git-instaweb - Instantly browse your working repository in gitweb"
-msgstr "�� gitweb 訝�뜵�뜻탲鰲덃궓�꾢램鵝쒍퍜佯�"
+msgstr " gitweb "
#. type: Plain text
#: en/git-instaweb.txt:14
@@ -28807,7 +29090,7 @@ msgstr "--in-place"
#: en/git-interpret-trailers.txt:76
#, fuzzy, priority:100
msgid "Edit the files in place."
-msgstr "�ⓨ렅鵝띸폋渦묉뻼餓�"
+msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:77
@@ -29203,7 +29486,7 @@ msgstr ""
#: en/git-interpret-trailers.txt:271 en/git-interpret-trailers.txt:283 en/git-interpret-trailers.txt:290 en/git-interpret-trailers.txt:354
#, fuzzy, no-wrap, priority:100
msgid "message\n"
-msgstr "瑥닸삇"
+msgstr ""
#. type: delimited block -
#: en/git-interpret-trailers.txt:274
@@ -29397,7 +29680,7 @@ msgstr ""
#: en/git-log.txt:13
#, fuzzy, ignore-ellipsis, no-wrap, priority:260
msgid "'git log' [<options>] [<revision range>] [[--] <path>...]\n"
-msgstr "git log [<�됮」>] [<�덃쑍�껃쎍>] [[--] <瓮�푶>...]"
+msgstr "git log [<>] [<>] [[--] <>...]"
#. type: Plain text
#: en/git-log.txt:17
@@ -29817,7 +30100,7 @@ msgstr "git-ls-files(1)"
#: en/git-ls-files.txt:7
#, fuzzy, priority:100
msgid "git-ls-files - Show information about files in the index and the working tree"
-msgstr "�양ㅊ榮℡폊�뚦램鵝쒎뙷訝�뻼餓띄쉪岳→겘"
+msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:23
@@ -29852,7 +30135,7 @@ msgstr ""
#: en/git-ls-files.txt:38
#, fuzzy, priority:100
msgid "Show cached files in the output (default)"
-msgstr "�양ㅊ煐볟춼�꾣뻼餓띰펷容섋�竊�"
+msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:40
@@ -29864,7 +30147,7 @@ msgstr "--deleted"
#: en/git-ls-files.txt:42
#, fuzzy, priority:100
msgid "Show deleted files in the output"
-msgstr "�양ㅊ藥꿨닠�ㅷ쉪�뉏뻑"
+msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:44
@@ -29876,7 +30159,7 @@ msgstr "--modified"
#: en/git-ls-files.txt:46
#, fuzzy, priority:100
msgid "Show modified files in the output"
-msgstr "�양ㅊ藥꿜엶�밭쉪�뉏뻑"
+msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:48
@@ -30134,7 +30417,7 @@ msgstr ""
#: en/git-ls-files.txt:132 en/git.txt:535
#, fuzzy, no-wrap, priority:100
msgid "other"
-msgstr "�뜹츆"
+msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:138
@@ -30200,7 +30483,7 @@ msgstr ""
#: en/git-ls-files.txt:185 en/git.txt:353 en/git-update-index.txt:224
#, no-wrap, priority:100
msgid "<file>"
-msgstr "<�뉏뻑>"
+msgstr "<>"
#. type: Plain text
#: en/git-ls-files.txt:188
@@ -30310,7 +30593,7 @@ msgid ""
msgstr ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<餓볟틩> [<凉뺟뵪>...]]"
+" [--symref] [<> [<>...]]"
#. type: Plain text
#: en/git-ls-remote.txt:20
@@ -30414,29 +30697,29 @@ msgstr ""
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
-#. type: Plain text
-#: en/git-ls-remote.txt:110
+#. type: delimited block -
+#: en/git-ls-remote.txt:111
#, no-wrap, priority:100
msgid ""
-"\t$ git ls-remote --tags ./.\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"\t$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
-"\t5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"\tc781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
-"\t$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
-"\t$ git ls-remote --tags korg v\\*\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"$ git ls-remote --tags ./.\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
+"$ git ls-remote --tags korg v\\*\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:114
+#: en/git-ls-remote.txt:116
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -30496,7 +30779,7 @@ msgstr ""
#: en/git-ls-tree.txt:46
#, fuzzy, priority:100
msgid "Recurse into sub-trees."
-msgstr "�믣퐩�겼춴��"
+msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:50
@@ -30592,7 +30875,7 @@ msgstr "git-mailinfo(1)"
#: en/git-mailinfo.txt:7
#, fuzzy, priority:100
msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
-msgstr "餓롥뜒訝ょ뵷耶먬궙餓뜸릎�먨룚烏δ툈�뚥퐳�낁벴餓�"
+msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:13
@@ -30864,7 +31147,7 @@ msgstr "git-merge-base(1)"
#: en/git-merge-base.txt:7
#, fuzzy, priority:100
msgid "git-merge-base - Find as good common ancestors as possible for a merge"
-msgstr "訝뷰틙�덂뭉�ζ돻弱썲룾�썲��꾢뀶�긺쪝�덃룓雅�"
+msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:17
@@ -30944,7 +31227,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:358
+#: en/git-merge-base.txt:60 en/git-rebase.txt:376
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -30973,235 +31256,235 @@ msgstr ""
msgid "For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:86
+#. type: delimited block .
+#: en/git-merge-base.txt:87
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---B\n"
-"\t /\n"
-"\t---o---1---o---o---o---A\n"
+"\t o---o---o---B\n"
+"\t/\n"
+"---o---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:88
+#: en/git-merge-base.txt:90
#, priority:100
msgid "the merge base between 'A' and 'B' is '1'."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:92
+#: en/git-merge-base.txt:94
#, priority:100
msgid "Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the merge base between 'A' and a hypothetical commit 'M', which is a merge between 'B' and 'C'. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:98
+#. type: delimited block .
+#: en/git-merge-base.txt:101
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---C\n"
-"\t /\n"
-"\t / o---o---o---B\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---C\n"
+" /\n"
+" / o---o---o---B\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:101
+#: en/git-merge-base.txt:105
#, priority:100
msgid "the result of `git merge-base A B C` is '1'. This is because the equivalent topology with a merge commit 'M' between 'B' and 'C' is:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:108
+#. type: delimited block .
+#: en/git-merge-base.txt:113
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---o\n"
-"\t / \\\n"
-"\t / o---o---o---o---M\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---o\n"
+" / \\\n"
+" / o---o---o---o---M\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:112
+#: en/git-merge-base.txt:118
#, priority:100
msgid "and the result of `git merge-base A M` is '1'. Commit '2' is also a common ancestor between 'A' and 'M', but '1' is a better common ancestor, because '2' is an ancestor of '1'. Hence, '2' is not a merge base."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:115
+#: en/git-merge-base.txt:121
#, priority:100
msgid "The result of `git merge-base --octopus A B C` is '2', because '2' is the best common ancestor of all commits."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:118
+#: en/git-merge-base.txt:124
#, priority:100
msgid "When the history involves criss-cross merges, there can be more than one 'best' common ancestor for two commits. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:124
+#. type: delimited block .
+#: en/git-merge-base.txt:131
#, no-wrap, priority:100
msgid ""
-"\t---1---o---A\n"
-"\t \\ /\n"
-"\t X\n"
-"\t / \\\n"
-"\t---2---o---o---B\n"
+"---1---o---A\n"
+" \\ /\n"
+" X\n"
+" / \\\n"
+"---2---o---o---B\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:128
+#: en/git-merge-base.txt:136
#, priority:100
msgid "both '1' and '2' are merge-bases of A and B. Neither one is better than the other (both are 'best' merge bases). When the `--all` option is not given, it is unspecified which best one is output."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:133
+#: en/git-merge-base.txt:141
#, priority:100
msgid "A common idiom to check \"fast-forward-ness\" between two commits A and B is (or at least used to be) to compute the merge base between A and B, and check if it is the same as A, in which case, A is an ancestor of B. You will see this idiom used often in older scripts."
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:139
+#. type: delimited block .
+#: en/git-merge-base.txt:148
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tA=$(git rev-parse --verify A)\n"
-"\tif test \"$A\" = \"$(git merge-base A B)\"\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"A=$(git rev-parse --verify A)\n"
+"if test \"$A\" = \"$(git merge-base A B)\"\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:141
+#: en/git-merge-base.txt:151
#, priority:100
msgid "In modern git, you can say this in a more direct way:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:146
+#. type: delimited block .
+#: en/git-merge-base.txt:157
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tif git merge-base --is-ancestor A B\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"if git merge-base --is-ancestor A B\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:148
+#: en/git-merge-base.txt:160
#, priority:100
msgid "instead."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:150
+#: en/git-merge-base.txt:162
#, no-wrap, priority:100
msgid "Discussion on fork-point mode"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:156
+#: en/git-merge-base.txt:168
#, priority:100
msgid "After working on the `topic` branch created with `git switch -c topic origin/master`, the history of remote-tracking branch `origin/master` may have been rewound and rebuilt, leading to a history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:164
+#. type: delimited block .
+#: en/git-merge-base.txt:177
#, no-wrap, priority:100
msgid ""
-"\t o---B2\n"
-"\t /\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t \\\n"
-"\t B0\n"
-"\t \\\n"
-"\t D0---D1---D (topic)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\\n"
+"\t B0\n"
+"\t \\\n"
+"\t D0---D1---D (topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:170
+#: en/git-merge-base.txt:184
#, priority:100
msgid "where `origin/master` used to point at commits B0, B1, B2 and now it points at B, and your `topic` branch was started on top of it back when `origin/master` was at B0, and you built three commits, D0, D1, and D, on top of it. Imagine that you now want to rebase the work you did on the topic on top of the updated origin/master."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:176
+#: en/git-merge-base.txt:190
#, priority:100
msgid "In such a case, `git merge-base origin/master topic` would return the parent of B0 in the above picture, but B0^..D is *not* the range of commits you would want to replay on top of B (it includes B0, which is not what you wrote; it is a commit the other side discarded when it moved its tip from B0 to B1)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:184
+#: en/git-merge-base.txt:198
#, priority:100
msgid "`git merge-base --fork-point origin/master topic` is designed to help in such a case. It takes not only B but also B0, B1, and B2 (i.e. old tips of the remote-tracking branches your repository's reflog knows about) into account to see on which commit your topic branch was built and finds B0, allowing you to replay only the commits on your topic, excluding the commits the other side later discarded."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:186
+#: en/git-merge-base.txt:200
#, priority:100
msgid "Hence"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:188
+#: en/git-merge-base.txt:202
#, no-wrap, priority:100
msgid " $ fork_point=$(git merge-base --fork-point origin/master topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:190
+#: en/git-merge-base.txt:204
#, priority:100
msgid "will find B0, and"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:192
+#: en/git-merge-base.txt:206
#, no-wrap, priority:100
msgid " $ git rebase --onto origin/master $fork_point topic\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:195
+#: en/git-merge-base.txt:209
#, priority:100
msgid "will replay D0, D1 and D on top of B to create a new history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:203
+#. type: delimited block .
+#: en/git-merge-base.txt:218
#, no-wrap, priority:100
msgid ""
-"\t\t\t o---B2\n"
-"\t\t\t/\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t\t\\ \\\n"
-"\t\t B0 D0'--D1'--D' (topic - updated)\n"
-"\t\t \\\n"
-"\t\t D0---D1---D (topic - old)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\ \\\n"
+"\t B0 D0'--D1'--D' (topic - updated)\n"
+"\t \\\n"
+"\t D0---D1---D (topic - old)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:210
+#: en/git-merge-base.txt:226
#, priority:100
msgid "A caveat is that older reflog entries in your repository may be expired by `git gc`. If B0 no longer appears in the reflog of the remote-tracking branch `origin/master`, the `--fork-point` mode obviously cannot find it and fails, avoiding to give a random and useless result (such as the parent of B0, like the same command without the `--fork-point` option gives)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:221
+#: en/git-merge-base.txt:237
#, priority:100
msgid "Also, the remote-tracking branch you use the `--fork-point` mode with must be the one your topic forked from its tip. If you forked from an older commit than the tip, this mode would not find the fork point (imagine in the above sample history B0 did not exist, origin/master started at B1, moved to B2 and then B, and you forked your topic at origin/master^ when origin/master was B1; the shape of the history would be the same as above, without B0, and the parent of B1 is what `git merge-base origin/master topic` correctly finds, but the `--fork-point` mode will not, because it is not one of the commits that used to be at the tip of origin/master)."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:224
+#: en/git-merge-base.txt:240
#, no-wrap, priority:100
msgid "See also"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:228
+#: en/git-merge-base.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
msgstr "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
@@ -31290,7 +31573,7 @@ msgstr ""
#: en/git-merge-file.txt:69
#, fuzzy, priority:100
msgid "Quiet; do not warn about conflicts."
-msgstr "訝띹쫨鈺�몜�꿰챳"
+msgstr ""
#. type: Labeled list
#: en/git-merge-file.txt:70
@@ -31412,31 +31695,31 @@ msgstr ""
msgid "Examples:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:62
+#. type: delimited block -
+#: en/git-merge-index.txt:63
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
-" This is MM from the original tree.\t\t\t# original\n"
-" This is modified MM in the branch A.\t\t\t# merge1\n"
-" This is modified MM in the branch B.\t\t\t# merge2\n"
-" This is modified MM in the branch B.\t\t\t# current contents\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
+"This is MM from the original tree.\t\t# original\n"
+"This is modified MM in the branch A.\t\t# merge1\n"
+"This is modified MM in the branch B.\t\t# merge2\n"
+"This is modified MM in the branch B.\t\t# current contents\n"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:71
+#. type: delimited block -
+#: en/git-merge-index.txt:74
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
-" cat: : No such file or directory\n"
-" This is added AA in the branch A.\n"
-" This is added AA in the branch B.\n"
-" This is added AA in the branch B.\n"
-" fatal: merge program failed\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
+"cat: : No such file or directory\n"
+"This is added AA in the branch A.\n"
+"This is added AA in the branch B.\n"
+"This is added AA in the branch B.\n"
+"fatal: merge program failed\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-index.txt:76
+#: en/git-merge-index.txt:80
#, priority:100
msgid "where the latter example shows how 'git merge-index' will stop trying to merge once anything has returned an error (i.e., `cat` returned an error for the AA file, because it didn't exist in the original, and thus 'git merge-index' didn't even try to merge the MM thing)."
msgstr ""
@@ -31565,7 +31848,7 @@ msgstr "git-mergetool(1)"
#: en/git-mergetool.txt:7
#, fuzzy, priority:240
msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
-msgstr "瓦먫죱�덂뭉�꿰챳鰲ｅ넶藥ε끁餓θ㎗�녑릦亮뜹넳囹�"
+msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:12
@@ -31625,7 +31908,7 @@ msgstr ""
#: en/git-mergetool.txt:69
#, fuzzy, priority:240
msgid "Print a list of merge tools that may be used with `--tool`."
-msgstr "�양ㅊ��빳�ⓨ쑉 `--tool` �귝빊�롧쉪藥�펰藥ε끁�쀨〃"
+msgstr " `--tool` "
#. type: Plain text
#: en/git-mergetool.txt:77
@@ -31727,14 +32010,14 @@ msgstr "git-merge(1)"
#: en/git-merge.txt:7
#, fuzzy, priority:240
msgid "git-merge - Join two or more development histories together"
-msgstr "�덂뭉訝ㅴ릉�뽪쎍鸚싧��묈럣��"
+msgstr ""
#. type: Plain text
#: en/git-merge.txt:17
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n"
-"\t[-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
+"\t[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
"\t[--[no-]allow-unrelated-histories]\n"
"\t[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]\n"
"'git merge' (--continue | --abort | --quit)\n"
@@ -32272,7 +32555,7 @@ msgstr "git-mktree(1)"
#: en/git-mktree.txt:7
#, fuzzy, priority:100
msgid "git-mktree - Build a tree-object from ls-tree formatted text"
-msgstr "�뷰틢 ls-tree �꾣졏凉뤷뙑�뉑쑍�쎾뻠訝�訝ゆ젒野배괌"
+msgstr " ls-tree "
#. type: Plain text
#: en/git-mktree.txt:13
@@ -32320,7 +32603,7 @@ msgstr "git-mv(1)"
#: en/git-mv.txt:7
#, fuzzy, priority:280
msgid "git-mv - Move or rename a file, a directory, or a symlink"
-msgstr "燁삣뒯�뽭뇥�썲릫訝�訝ゆ뻼餓뜰�곭쎅壤뺞닑寧�뤇�얏렏"
+msgstr ""
#. type: Plain text
#: en/git-mv.txt:13
@@ -32332,7 +32615,7 @@ msgstr ""
#: en/git-mv.txt:17
#, fuzzy, priority:280
msgid "Move or rename a file, directory or symlink."
-msgstr "燁삣뒯�뽭뇥�썲릫訝�訝ゆ뻼餓뜰�곭쎅壤뺞닑寧�뤇�얏렏"
+msgstr ""
#. type: Plain text
#: en/git-mv.txt:20
@@ -32444,7 +32727,7 @@ msgstr ""
#: en/git-name-rev.txt:44
#, fuzzy, priority:100
msgid "List all commits reachable from all refs"
-msgstr "�쀥눣��빳餓롦��됧폊�②���쉪�먧벡"
+msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:50
@@ -32815,7 +33098,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:281 en/merge-options.txt:108
+#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -33139,7 +33422,7 @@ msgstr "git-p4(1)"
#: en/git-p4.txt:7
#, fuzzy, priority:100
msgid "git-p4 - Import from and submit to Perforce repositories"
-msgstr "野쇔뀯�뚧룓雅ㅵ댆 Perforce 餓볟틩訝�"
+msgstr " Perforce "
#. type: Plain text
#: en/git-p4.txt:16
@@ -33448,7 +33731,7 @@ msgstr ""
#: en/git-p4.txt:202
#, no-wrap, priority:100
msgid "General options"
-msgstr "�싩뵪�됮」"
+msgstr ""
#. type: Plain text
#: en/git-p4.txt:204
@@ -33795,7 +34078,7 @@ msgid "Conflicts can occur when applying a commit to p4. When this happens, the
msgstr ""
#. type: Labeled list
-#: en/git-p4.txt:359 en/git-submodule.txt:270
+#: en/git-p4.txt:359 en/git-submodule.txt:271
#, no-wrap, priority:220
msgid "--branch <branch>"
msgstr ""
@@ -34931,7 +35214,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:263 en/rev-list-options.txt:760
+#: en/git-pack-objects.txt:263 en/rev-list-options.txt:776
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -34943,13 +35226,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:266 en/rev-list-options.txt:767
+#: en/git-pack-objects.txt:266 en/rev-list-options.txt:783
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:269 en/rev-list-options.txt:770
+#: en/git-pack-objects.txt:269 en/rev-list-options.txt:786
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -34961,7 +35244,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:276 en/rev-list-options.txt:777
+#: en/git-pack-objects.txt:276 en/rev-list-options.txt:793
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -34973,7 +35256,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:281 en/rev-list-options.txt:785
+#: en/git-pack-objects.txt:281 en/rev-list-options.txt:801
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -35211,7 +35494,7 @@ msgstr "git-pack-refs(1)"
#: en/git-pack-refs.txt:7
#, fuzzy, priority:100
msgid "git-pack-refs - Pack heads and tags for efficient repository access"
-msgstr "�볟똿鸚닷뭽�뉒�餓ε츩�곈쳵�덄쉪餓볟틩溫욥뿮"
+msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:12
@@ -35271,7 +35554,7 @@ msgstr "git-parse-remote(1)"
#: en/git-parse-remote.txt:7
#, fuzzy, priority:100
msgid "git-parse-remote - Routines to help parsing remote repository access parameters"
-msgstr "躍�뒰鰲ｆ옄瓦쒐쮮餓볟틩溫욥뿮�귝빊�꾡풃葉�"
+msgstr ""
#. type: Plain text
#: en/git-parse-remote.txt:13
@@ -35445,13 +35728,13 @@ msgstr "git-prune(1)"
#: en/git-prune.txt:7
#, fuzzy, priority:100
msgid "git-prune - Prune all unreachable objects from the object database"
-msgstr "�좈솮野배괌佯볞릎���됦툖��씨野배괌"
+msgstr ""
#. type: Plain text
#: en/git-prune.txt:13
#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
-msgstr "git prune [-n] [-v] [--progress] [--expire <�띌뿴>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--progress] [--expire <>] [--] [<head>...]"
#. type: Plain text
#: en/git-prune.txt:19
@@ -35487,7 +35770,7 @@ msgstr ""
#: en/git-prune.txt:47
#, fuzzy, priority:100
msgid "Show progress."
-msgstr "�양ㅊ瓦쎾벧"
+msgstr ""
#. type: Labeled list
#: en/git-prune.txt:48 en/git-worktree.txt:192
@@ -35553,13 +35836,13 @@ msgstr "git-pull(1)"
#: en/git-pull.txt:7
#, fuzzy, priority:220
msgid "git-pull - Fetch from and integrate with another repository or a local branch"
-msgstr "�룟룚亮뜻빐�덂룱鸚뽫쉪餓볟틩�뽨�訝ゆ쑍�겼늽��"
+msgstr ""
#. type: Plain text
#: en/git-pull.txt:13
#, fuzzy, ignore-ellipsis, no-wrap, priority:220
msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
-msgstr "git pull [<�됮」>] [<餓볟틩> [<凉뺟뵪鰲꾣졏>...]]"
+msgstr "git pull [<>] [<> [<>...]]"
#. type: Plain text
#: en/git-pull.txt:21
@@ -35669,7 +35952,7 @@ msgstr ""
#: en/git-pull.txt:97
#, no-wrap, priority:220
msgid "Options related to merging"
-msgstr "�뚦릦亮띄쎑�녕쉪�됮」"
+msgstr ""
#. type: Labeled list
#: en/git-pull.txt:104
@@ -35732,13 +36015,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:502
+#: en/git-pull.txt:136 en/git-rebase.txt:524
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:503
+#: en/git-pull.txt:137 en/git-rebase.txt:525
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -35759,7 +36042,7 @@ msgstr ""
#: en/git-pull.txt:146
#, no-wrap, priority:220
msgid "Options related to fetching"
-msgstr "�뚩렩�뽫쎑�녕쉪�귝빊"
+msgstr ""
#. type: Title -
#: en/git-pull.txt:157
@@ -35901,7 +36184,7 @@ msgstr "git-push(1)"
#: en/git-push.txt:7
#, fuzzy, priority:220
msgid "git-push - Update remote refs along with associated objects"
-msgstr "�닸뼭瓦쒐쮮凉뺟뵪�뚨쎑�녕쉪野배괌"
+msgstr ""
#. type: Plain text
#: en/git-push.txt:18
@@ -36465,7 +36748,7 @@ msgstr ""
#: en/git-push.txt:449
#, fuzzy, no-wrap, priority:220
msgid "rejected"
-msgstr "[藥꿩땼瀯�]"
+msgstr "[]"
#. type: Plain text
#: en/git-push.txt:452
@@ -36918,7 +37201,7 @@ msgid ""
"\t\t[-u [--exclude-per-directory=<gitignore>] | -i]]\n"
"\t\t[--index-output=<file>] [--no-sparse-checkout]\n"
"\t\t(--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])\n"
-msgstr "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<�띸�>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<�뉏뻑>] (--empty | <�묈�穩�1> [<�묈�穩�2> [<�묈�穩�3>]])"
+msgstr "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<>] (--empty | <1> [<2> [<3>]])"
#. type: Plain text
#: en/git-read-tree.txt:23
@@ -37525,14 +37808,14 @@ msgstr "git-rebase(1)"
#: en/git-rebase.txt:7
#, fuzzy, priority:100
msgid "git-rebase - Reapply commits on top of another base tip"
-msgstr "�ⓨ룱訝�訝ゅ늽��툓�띷뼭佯붺뵪�먧벡"
+msgstr ""
#. type: Plain text
#: en/git-rebase.txt:16
#, no-wrap, priority:100
msgid ""
-"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
-"\t[<upstream> [<branch>]]\n"
+"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>]\n"
+"\t[--onto <newbase> | --keep-base] [<upstream> [<branch>]]\n"
"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
"\t--root [<branch>]\n"
"'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch)\n"
@@ -37851,512 +38134,542 @@ msgstr ""
msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:220
+#, ignore-same, no-wrap, priority:100
+msgid "--keep-base"
+msgstr "--keep-base"
+
+#. type: Plain text
+#: en/git-rebase.txt:225
+#, ignore-ellipsis, priority:100
+msgid "Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running 'git rebase --keep-base <upstream> <branch>' is equivalent to running 'git rebase --onto <upstream>... <upstream>'."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:230
+#, priority:100
+msgid "This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:235
+#, priority:100
+msgid "Although both this option and --fork-point find the merge base between <upstream> and <branch>, this option uses the merge base as the _starting point_ on which new commits will be created, whereas --fork-point uses the merge base to determine the _set of commits_ which will be rebased."
+msgstr ""
+
#. type: Plain text
-#: en/git-rebase.txt:224
+#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#, priority:100
+msgid "See also INCOMPATIBLE OPTIONS below."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:242
#, priority:100
msgid "Upstream branch to compare against. May be any valid commit, not just an existing branch name. Defaults to the configured upstream for the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:230
+#: en/git-rebase.txt:248
#, priority:100
msgid "Restart the rebasing process after having resolved a merge conflict."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237
+#: en/git-rebase.txt:255
#, priority:100
msgid "Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:242
+#: en/git-rebase.txt:260
#, priority:100
msgid "Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:243 en/git-rebase.txt:538
+#: en/git-rebase.txt:261 en/git-rebase.txt:560
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:246
+#: en/git-rebase.txt:264
#, priority:100
msgid "Keep the commits that do not change anything from its parents in the result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:248 en/git-rebase.txt:255 en/git-rebase.txt:280 en/git-rebase.txt:293 en/git-rebase.txt:302 en/git-rebase.txt:344 en/git-rebase.txt:379 en/git-rebase.txt:386 en/git-rebase.txt:393 en/git-rebase.txt:405 en/git-rebase.txt:445 en/git-rebase.txt:470 en/git-rebase.txt:482 en/git-rebase.txt:501
-#, priority:100
-msgid "See also INCOMPATIBLE OPTIONS below."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rebase.txt:253
+#: en/git-rebase.txt:271
#, priority:100
msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:258
+#: en/git-rebase.txt:276
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:259 en/git-rebase.txt:539
+#: en/git-rebase.txt:277 en/git-rebase.txt:561
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:261
+#: en/git-rebase.txt:279
#, fuzzy, priority:100
msgid "Edit the todo list during an interactive rebase."
-msgstr "�ⓧ벡雅믣폀�섇읃訝�폋渦묈푷�욃닓烏�"
+msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:266
+#: en/git-rebase.txt:284
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:272
+#: en/git-rebase.txt:290
#, priority:100
msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:278
+#: en/git-rebase.txt:296
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:286
+#: en/git-rebase.txt:304
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:291
+#: en/git-rebase.txt:309
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:294
+#: en/git-rebase.txt:312
#, fuzzy, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr "--strategy-option"
#. type: Labeled list
-#: en/git-rebase.txt:295
+#: en/git-rebase.txt:313
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:300
+#: en/git-rebase.txt:318
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:317
+#: en/git-rebase.txt:335
#, fuzzy, priority:100
msgid "Be quiet. Implies --no-stat."
-msgstr "若됮쓾�귝슅鹽� --no-stat"
+msgstr " --no-stat"
#. type: Plain text
-#: en/git-rebase.txt:321
+#: en/git-rebase.txt:339
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:325
+#: en/git-rebase.txt:343
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:329
+#: en/git-rebase.txt:347
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:332
+#: en/git-rebase.txt:350
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:333 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:336
+#: en/git-rebase.txt:354
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:345 en/merge-options.txt:47
+#: en/git-rebase.txt:363 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:346
+#: en/git-rebase.txt:364
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:351
+#: en/git-rebase.txt:369
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:357
+#: en/git-rebase.txt:375
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:359
+#: en/git-rebase.txt:377
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:363
+#: en/git-rebase.txt:381
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:387
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:372
+#: en/git-rebase.txt:390
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:394
+#, priority:100
+msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:399
#, priority:100
msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:384
+#: en/git-rebase.txt:406
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:391
+#: en/git-rebase.txt:413
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:421
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:403
+#: en/git-rebase.txt:425
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:407
+#: en/git-rebase.txt:429
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:415
+#: en/git-rebase.txt:437
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:422
+#: en/git-rebase.txt:444
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:426
+#: en/git-rebase.txt:448
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges`, but in contrast to that option works well in interactive rebases: commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:430
+#: en/git-rebase.txt:452
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:432
+#: en/git-rebase.txt:454
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:434 en/git-rebase.txt:535 en/git-svn.txt:680
+#: en/git-rebase.txt:456 en/git-rebase.txt:557 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:439
+#: en/git-rebase.txt:461
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:443
+#: en/git-rebase.txt:465
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:446
+#: en/git-rebase.txt:468
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:447
+#: en/git-rebase.txt:469
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:474
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:455
+#: en/git-rebase.txt:477
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:457
+#: en/git-rebase.txt:479
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:459
+#: en/git-rebase.txt:481
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:483
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:487
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:490
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:480
+#: en/git-rebase.txt:502
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:505
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:484
+#: en/git-rebase.txt:506
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:495
+#: en/git-rebase.txt:517
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:499
+#: en/git-rebase.txt:521
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:509
+#: en/git-rebase.txt:531
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:510
+#: en/git-rebase.txt:532
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:511
+#: en/git-rebase.txt:533
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:514
+#: en/git-rebase.txt:536
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:516
+#: en/git-rebase.txt:538
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:519
+#: en/git-rebase.txt:541
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:523
+#: en/git-rebase.txt:545
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:527
+#: en/git-rebase.txt:549
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:530
+#: en/git-rebase.txt:552
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:553
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:555
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Plain text
-#: en/git-rebase.txt:534
+#: en/git-rebase.txt:556
#, ignore-same, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:537
+#: en/git-rebase.txt:559
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:540
+#: en/git-rebase.txt:562
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:542
+#: en/git-rebase.txt:564
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:544
+#: en/git-rebase.txt:566
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:567
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:546
+#: en/git-rebase.txt:568
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:547
+#: en/git-rebase.txt:569
#, priority:100
-msgid "--rebase-merges and --strategy"
+msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:548
+#: en/git-rebase.txt:570
#, priority:100
-msgid "--rebase-merges and --strategy-option"
+msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:550
+#: en/git-rebase.txt:572
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:575
#, no-wrap, priority:100
msgid "There are some subtle differences how the backends behave.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:556
+#: en/git-rebase.txt:578
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38364,7 +38677,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:561
+#: en/git-rebase.txt:583
#, no-wrap, priority:100
msgid ""
"The am backend drops any \"empty\" commits, regardless of whether the\n"
@@ -38374,7 +38687,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:588
#, no-wrap, priority:100
msgid ""
"The interactive backend drops commits by default that\n"
@@ -38384,7 +38697,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:591
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38392,7 +38705,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:573
+#: en/git-rebase.txt:595
#, no-wrap, priority:100
msgid ""
"Directory rename heuristics are enabled in the merge and interactive\n"
@@ -38401,145 +38714,145 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:597
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:577
+#: en/git-rebase.txt:599
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:582
+#: en/git-rebase.txt:604
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:587
+#: en/git-rebase.txt:609
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:589
+#: en/git-rebase.txt:611
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:596
+#: en/git-rebase.txt:618
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:598
+#: en/git-rebase.txt:620
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:600
+#: en/git-rebase.txt:622
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:601
+#: en/git-rebase.txt:623
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:602
+#: en/git-rebase.txt:624
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:603
+#: en/git-rebase.txt:625
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:605
+#: en/git-rebase.txt:627
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:607
+#: en/git-rebase.txt:629
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:631
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:610
+#: en/git-rebase.txt:632
#, fuzzy, priority:100
msgid "commit"
msgstr "`commit`"
#. type: Plain text
-#: en/git-rebase.txt:612
+#: en/git-rebase.txt:634
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:614
+#: en/git-rebase.txt:636
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:615
+#: en/git-rebase.txt:637
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:616
+#: en/git-rebase.txt:638
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:644
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:646
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:626
+#: en/git-rebase.txt:648
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:653
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:658
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -38548,73 +38861,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:641
+#: en/git-rebase.txt:663
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:668
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:649
+#: en/git-rebase.txt:671
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:652
+#: en/git-rebase.txt:674
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:655
+#: en/git-rebase.txt:677
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:685
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:667
+#: en/git-rebase.txt:689
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:693
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:696
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:699
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:680
+#: en/git-rebase.txt:702
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:687
+#: en/git-rebase.txt:709
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -38625,25 +38938,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:691
+#: en/git-rebase.txt:713
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:694
+#: en/git-rebase.txt:716
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:701
+#: en/git-rebase.txt:723
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:710
+#: en/git-rebase.txt:732
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -38656,31 +38969,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:715
+#: en/git-rebase.txt:737
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:720
+#: en/git-rebase.txt:742
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:745
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:727
+#: en/git-rebase.txt:749
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:759
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -38694,85 +39007,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:740
+#: en/git-rebase.txt:762
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:746
+#: en/git-rebase.txt:768
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:750
+#: en/git-rebase.txt:772
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:752
+#: en/git-rebase.txt:774
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:756
+#: en/git-rebase.txt:778
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:760
+#: en/git-rebase.txt:782
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:763
+#: en/git-rebase.txt:785
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:765
+#: en/git-rebase.txt:787
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:767
+#: en/git-rebase.txt:789
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:794
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:775
+#: en/git-rebase.txt:797
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:804
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:809
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:816
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38783,13 +39096,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:819
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:826
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38800,13 +39113,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:808
+#: en/git-rebase.txt:830
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:815
+#: en/git-rebase.txt:837
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38817,73 +39130,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:822
+#: en/git-rebase.txt:844
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:824
+#: en/git-rebase.txt:846
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:825
+#: en/git-rebase.txt:847
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:829
+#: en/git-rebase.txt:851
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:836
+#: en/git-rebase.txt:859
#, priority:100
-msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or `filter-branch`."
+msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:839
+#: en/git-rebase.txt:862
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:867
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:848
+#: en/git-rebase.txt:871
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:850
+#: en/git-rebase.txt:873
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:875
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:858
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38894,19 +39207,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:885
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:866
+#: en/git-rebase.txt:889
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:894
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -38916,67 +39229,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:876
+#: en/git-rebase.txt:899
#, priority:100
-msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge-base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
+msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:880
+#: en/git-rebase.txt:903
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:883
+#: en/git-rebase.txt:906
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:886
+#: en/git-rebase.txt:909
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:888
+#: en/git-rebase.txt:911
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:893
+#: en/git-rebase.txt:916
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:895
+#: en/git-rebase.txt:918
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:926
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:907
+#: en/git-rebase.txt:930
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:912
+#: en/git-rebase.txt:935
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:922
+#: en/git-rebase.txt:945
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -38990,25 +39303,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:929
+#: en/git-rebase.txt:952
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:932
+#: en/git-rebase.txt:955
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:935 en/git-rebase.txt:1012
+#: en/git-rebase.txt:958 en/git-rebase.txt:1035
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:941
+#: en/git-rebase.txt:964
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39019,7 +39332,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:946
+#: en/git-rebase.txt:969
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39029,7 +39342,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:950
+#: en/git-rebase.txt:973
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39038,55 +39351,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:954
+#: en/git-rebase.txt:977
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:962
+#: en/git-rebase.txt:985
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:992
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:975
+#: en/git-rebase.txt:998
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:978
+#: en/git-rebase.txt:1001
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1008
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:989
+#: en/git-rebase.txt:1012
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:996
+#: en/git-rebase.txt:1019
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1003
+#: en/git-rebase.txt:1026
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39097,13 +39410,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1009
+#: en/git-rebase.txt:1032
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1015
+#: en/git-rebase.txt:1038
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39111,7 +39424,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1022
+#: en/git-rebase.txt:1045
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39123,7 +39436,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1049
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39132,37 +39445,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1035
+#: en/git-rebase.txt:1058
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1037
+#: en/git-rebase.txt:1060
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1039
+#: en/git-rebase.txt:1062
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1043
+#: en/git-rebase.txt:1066
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1068
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1072
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -39470,117 +39783,117 @@ msgstr ""
msgid "Using this hook, it is easy to generate mails describing the updates to the repository. This example script sends one mail message per ref listing the commits pushed to the repository, and logs the push certificates of signed pushes with good signatures to a logger service:"
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:191
+#. type: delimited block -
+#: en/git-receive-pack.txt:192
#, no-wrap, priority:100
msgid ""
-"\t#!/bin/sh\n"
-"\t# mail out commit update information.\n"
-"\twhile read oval nval ref\n"
-"\tdo\n"
-"\t\tif expr \"$oval\" : '0*$' >/dev/null\n"
-"\t\tthen\n"
-"\t\t\techo \"Created a new ref, with the following commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\"\n"
-"\t\telse\n"
-"\t\t\techo \"New commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
-"\t\tfi |\n"
-"\t\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
-"\tdone\n"
-"\t# log signed push certificate, if any\n"
-"\tif test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"#!/bin/sh\n"
+"# mail out commit update information.\n"
+"while read oval nval ref\n"
+"do\n"
+"\tif expr \"$oval\" : '0*$' >/dev/null\n"
"\tthen\n"
-"\t\t(\n"
-"\t\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
-"\t\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
-"\t\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
-"\tfi\n"
-"\texit 0\n"
+"\t\techo \"Created a new ref, with the following commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\"\n"
+"\telse\n"
+"\t\techo \"New commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
+"\tfi |\n"
+"\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
+"done\n"
+"# log signed push certificate, if any\n"
+"if test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"then\n"
+"\t(\n"
+"\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
+"\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
+"\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
+"fi\n"
+"exit 0\n"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:194
+#: en/git-receive-pack.txt:196
#, priority:100
msgid "The exit code from this hook invocation is ignored, however a non-zero exit code will generate an error message."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:200
+#: en/git-receive-pack.txt:202
#, priority:100
msgid "Note that it is possible for refname to not have sha1-new when this hook runs. This can easily occur if another user modifies the ref after it was updated by 'git-receive-pack', but before the hook was able to evaluate it. It is recommended that hooks rely on sha1-new rather than the current value of refname."
msgstr ""
#. type: Title -
-#: en/git-receive-pack.txt:202
+#: en/git-receive-pack.txt:204
#, no-wrap, priority:100
msgid "POST-UPDATE HOOK"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:207
+#: en/git-receive-pack.txt:209
#, priority:100
msgid "After all other processing, if at least one ref was updated, and if $GIT_DIR/hooks/post-update file exists and is executable, then post-update will be called with the list of refs that have been updated. This can be used to implement any repository wide cleanup tasks."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:211
+#: en/git-receive-pack.txt:213
#, priority:100
msgid "The exit code from this hook invocation is ignored; the only thing left for 'git-receive-pack' to do at that point is to exit itself anyway."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:214
+#: en/git-receive-pack.txt:216
#, priority:100
msgid "This hook can be used, for example, to run `git update-server-info` if the repository is packed and is served via a dumb transport."
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:217
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/git-receive-pack.txt:220
+#, fuzzy, no-wrap, priority:100
msgid ""
-"\t#!/bin/sh\n"
-"\texec git update-server-info\n"
-msgstr ""
+"#!/bin/sh\n"
+"exec git update-server-info\n"
+msgstr "git-update-server-info(1)"
#. type: Title -
-#: en/git-receive-pack.txt:220
+#: en/git-receive-pack.txt:224
#, no-wrap, priority:100
msgid "QUARANTINE ENVIRONMENT"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:227
+#: en/git-receive-pack.txt:231
#, priority:100
msgid "When `receive-pack` takes in objects, they are placed into a temporary \"quarantine\" directory within the `$GIT_DIR/objects` directory and migrated into the main object store only after the `pre-receive` hook has completed. If the push fails before then, the temporary directory is removed entirely."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:229
+#: en/git-receive-pack.txt:233
#, priority:100
msgid "This has a few user-visible effects and caveats:"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:235
+#: en/git-receive-pack.txt:239
#, priority:100
msgid "Pushes which fail due to problems with the incoming pack, missing objects, or due to the `pre-receive` hook will not leave any on-disk data. This is usually helpful to prevent repeated failed pushes from filling up your disk, but can make debugging more challenging."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:238
+#: en/git-receive-pack.txt:242
#, priority:100
msgid "Any objects created by the `pre-receive` hook will be created in the quarantine directory (and migrated only if it succeeds)."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:244
+#: en/git-receive-pack.txt:248
#, priority:100
msgid "The `pre-receive` hook MUST NOT update any refs to point to quarantined objects. Other programs accessing the repository will not be able to see the objects (and if the pre-receive hook fails, those refs would become corrupted). For safety, any ref updates from within `pre-receive` are automatically rejected."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:249
+#: en/git-receive-pack.txt:253
#, ignore-same, priority:100
msgid "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
msgstr "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
@@ -40681,7 +40994,7 @@ msgstr "git-replace(1)"
#: en/git-replace.txt:7
#, fuzzy, priority:100
msgid "git-replace - Create, list, delete refs to replace objects"
-msgstr "�쎾뻠�곩닓�뷩�곩닠�ㅵ�穩→쎘�℡폊��"
+msgstr ""
#. type: Plain text
#: en/git-replace.txt:17
@@ -40908,7 +41221,7 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:131
#, priority:100
-msgid "linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and linkgit:git-rebase[1], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
+msgid "linkgit:git-hash-object[1], linkgit:git-rebase[1], and https://github.com/newren/git-filter-repo[git-filter-repo], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
msgstr ""
#. type: Plain text
@@ -40931,9 +41244,10 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:158
-#, priority:100
-msgid "linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1]"
-msgstr ""
+#, fuzzy, priority:100
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] https://github.com/newren/git-filter-repo[git-filter-repo]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title =
#: en/git-request-pull.txt:2
@@ -41077,7 +41391,7 @@ msgstr "git-rerere(1)"
#: en/git-rerere.txt:7
#, fuzzy, priority:100
msgid "git-rerere - Reuse recorded resolution of conflicted merges"
-msgstr "�띸뵪�꿰챳�덂뭉�꾥㎗�녔뼶旅덅�壤�"
+msgstr ""
#. type: Plain text
#: en/git-rerere.txt:12
@@ -41366,7 +41680,7 @@ msgstr "git-reset(1)"
#: en/git-reset.txt:7
#, fuzzy, priority:280
msgid "git-reset - Reset current HEAD to the specified state"
-msgstr "�띸쉰壤볟뎺 HEAD �경뙁若싩듁��"
+msgstr " HEAD "
#. type: Plain text
#: en/git-reset.txt:14
@@ -41387,7 +41701,7 @@ msgstr ""
#: en/git-reset.txt:22
#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "'git reset' [-q] [<tree-ish>] [--] <paths>..."
-msgstr "git reset [-q] [<�묉닑�먧벡>] [--] <瓮�푶>..."
+msgstr "git reset [-q] [<>] [--] <>..."
#. type: Plain text
#: en/git-reset.txt:26
@@ -41411,7 +41725,7 @@ msgstr ""
#: en/git-reset.txt:38
#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...]"
-msgstr "git reset --patch [<�묉닑�먧벡>] [--] [<瓮�푶>...]"
+msgstr "git reset --patch [<>] [--] [<>...]"
#. type: Plain text
#: en/git-reset.txt:42
@@ -41725,7 +42039,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:228 en/git-stash.txt:229
+#: en/git-reset.txt:228 en/git-stash.txt:230
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -42449,105 +42763,52 @@ msgstr "git-rev-list(1)"
#: en/git-rev-list.txt:7
#, fuzzy, priority:100
msgid "git-rev-list - Lists commit objects in reverse chronological order"
-msgstr "�됪뿶�닻『佯뤷닓�뷸룓雅ㅵ�穩�"
+msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:65
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"'git rev-list' [ --max-count=<number> ]\n"
-"\t [ --skip=<number> ]\n"
-"\t [ --max-age=<timestamp> ]\n"
-"\t [ --min-age=<timestamp> ]\n"
-"\t [ --sparse ]\n"
-"\t [ --merges ]\n"
-"\t [ --no-merges ]\n"
-"\t [ --min-parents=<number> ]\n"
-"\t [ --no-min-parents ]\n"
-"\t [ --max-parents=<number> ]\n"
-"\t [ --no-max-parents ]\n"
-"\t [ --first-parent ]\n"
-"\t [ --remove-empty ]\n"
-"\t [ --full-history ]\n"
-"\t [ --not ]\n"
-"\t [ --all ]\n"
-"\t [ --branches[=<pattern>] ]\n"
-"\t [ --tags[=<pattern>] ]\n"
-"\t [ --remotes[=<pattern>] ]\n"
-"\t [ --glob=<glob-pattern> ]\n"
-"\t [ --ignore-missing ]\n"
-"\t [ --stdin ]\n"
-"\t [ --quiet ]\n"
-"\t [ --topo-order ]\n"
-"\t [ --parents ]\n"
-"\t [ --timestamp ]\n"
-"\t [ --left-right ]\n"
-"\t [ --left-only ]\n"
-"\t [ --right-only ]\n"
-"\t [ --cherry-mark ]\n"
-"\t [ --cherry-pick ]\n"
-"\t [ --encoding=<encoding> ]\n"
-"\t [ --(author|committer|grep)=<pattern> ]\n"
-"\t [ --regexp-ignore-case | -i ]\n"
-"\t [ --extended-regexp | -E ]\n"
-"\t [ --fixed-strings | -F ]\n"
-"\t [ --date=<format>]\n"
-"\t [ [ --objects | --objects-edge | --objects-edge-aggressive ]\n"
-"\t [ --unpacked ]\n"
-"\t [ --object-names | --no-object-names ]\n"
-"\t [ --filter=<filter-spec> [ --filter-print-omitted ] ] ]\n"
-"\t [ --missing=<missing-action> ]\n"
-"\t [ --pretty | --header ]\n"
-"\t [ --bisect ]\n"
-"\t [ --bisect-vars ]\n"
-"\t [ --bisect-all ]\n"
-"\t [ --merge ]\n"
-"\t [ --reverse ]\n"
-"\t [ --walk-reflogs ]\n"
-"\t [ --no-walk ] [ --do-walk ]\n"
-"\t [ --count ]\n"
-"\t [ --use-bitmap-index ]\n"
-"\t <commit>... [ \\-- <paths>... ]\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:73
+#: en/git-rev-list.txt:13
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
+msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n"
+msgstr "git difftool [<>] [<> [<>]] [--] [<>...]"
+
+#. type: Plain text
+#: en/git-rev-list.txt:21
#, priority:100
msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:80
+#: en/git-rev-list.txt:28
#, priority:100
msgid "You can think of this as a set operation. Commits given on the command line form a set of commits that are reachable from any of them, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:82
+#: en/git-rev-list.txt:30
#, priority:100
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:85
+#: en/git-rev-list.txt:33
#, no-wrap, priority:100
msgid "\t$ git rev-list foo bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:89
+#: en/git-rev-list.txt:37
#, priority:100
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:93
+#: en/git-rev-list.txt:41
#, priority:100
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:97
+#: en/git-rev-list.txt:45
#, no-wrap, priority:100
msgid ""
"\t$ git rev-list origin..HEAD\n"
@@ -42555,13 +42816,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:102
+#: en/git-rev-list.txt:50
#, ignore-ellipsis, priority:100
msgid "Another special notation is \"'<commit1>'...'<commit2>'\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:106
+#: en/git-rev-list.txt:54
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git rev-list A B --not $(git merge-base --all A B)\n"
@@ -42569,7 +42830,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:113
+#: en/git-rev-list.txt:61
#, priority:100
msgid "'rev-list' is a very essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For this reason, it has a lot of different options that enables it to be used by commands as different as 'git bisect' and 'git repack'."
msgstr ""
@@ -43494,7 +43755,7 @@ msgstr "git-rm(1)"
#: en/git-rm.txt:7
#, fuzzy, priority:280
msgid "git-rm - Remove files from the working tree and from the index"
-msgstr "餓롥램鵝쒎뙷�뚨뇨凉뺜릎�좈솮�뉏뻑"
+msgstr ""
#. type: Plain text
#: en/git-rm.txt:12
@@ -43518,7 +43779,7 @@ msgstr ""
#: en/git-rm.txt:42
#, fuzzy, priority:280
msgid "Override the up-to-date check."
-msgstr "恙썹븼�뉏뻑�닸뼭�뜻�곫���"
+msgstr ""
#. type: Plain text
#: en/git-rm.txt:48
@@ -43548,7 +43809,7 @@ msgstr "--ignore-unmatch"
#: en/git-rm.txt:65
#, fuzzy, priority:280
msgid "Exit with a zero status even if no files matched."
-msgstr "�념슴亦→쐣�백뀓竊뚥튋餓ι쎏�뜻�곲����"
+msgstr ""
#. type: Plain text
#: en/git-rm.txt:70
@@ -44691,31 +44952,31 @@ msgstr ""
msgid "To use 'git send-email' to send your patches through the GMail SMTP server, edit ~/.gitconfig to specify your account settings:"
msgstr ""
-#. type: Plain text
-#: en/git-send-email.txt:494
+#. type: delimited block -
+#: en/git-send-email.txt:495
#, no-wrap, priority:100
msgid ""
-"\t[sendemail]\n"
-"\t\tsmtpEncryption = tls\n"
-"\t\tsmtpServer = smtp.gmail.com\n"
-"\t\tsmtpUser = yourname@gmail.com\n"
-"\t\tsmtpServerPort = 587\n"
+"[sendemail]\n"
+"\tsmtpEncryption = tls\n"
+"\tsmtpServer = smtp.gmail.com\n"
+"\tsmtpUser = yourname@gmail.com\n"
+"\tsmtpServerPort = 587\n"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:498
+#: en/git-send-email.txt:500
#, priority:100
msgid "If you have multifactor authentication setup on your gmail account, you will need to generate an app-specific password for use with 'git send-email'. Visit https://security.google.com/settings/security/apppasswords to create it."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:501
+#: en/git-send-email.txt:503
#, priority:100
msgid "Once your commits are ready to be sent to the mailing list, run the following commands:"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:505
+#: en/git-send-email.txt:507
#, no-wrap, priority:100
msgid ""
"\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -44724,19 +44985,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:510
+#: en/git-send-email.txt:512
#, priority:100
msgid "The first time you run it, you will be prompted for your credentials. Enter the app-specific or your regular password as appropriate. If you have credential helper configured (see linkgit:git-credential[1]), the password will be saved in the credential store so you won't have to type it the next time."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:516
+#: en/git-send-email.txt:518
#, priority:100
msgid "Note: the following core Perl modules that may be installed with your distribution of Perl are required: MIME::Base64, MIME::QuotedPrint, Net::Domain and Net::SMTP. These additional Perl modules are also required: Authen::SASL and Mail::Address."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:521
+#: en/git-send-email.txt:523
#, priority:100
msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
msgstr ""
@@ -44751,7 +45012,7 @@ msgstr "git-send-pack(1)"
#: en/git-send-pack.txt:7
#, fuzzy, priority:100
msgid "git-send-pack - Push objects over Git protocol to another repository"
-msgstr "鵝욜뵪 Git �뤺��③�곩�穩▼댆�╊�訝や퍜佯�"
+msgstr " Git "
#. type: Plain text
#: en/git-send-pack.txt:16
@@ -44881,7 +45142,7 @@ msgstr "git-shell(1)"
#: en/git-shell.txt:7
#, fuzzy, priority:100
msgid "git-shell - Restricted login shell for Git-only SSH access"
-msgstr "�ゅ뀅溫� Git SSH 溫욥뿮�꾢룛�먪쇉壤븉hell"
+msgstr " Git SSH shell"
#. type: Plain text
#: en/git-shell.txt:15
@@ -45174,7 +45435,7 @@ msgstr "--email"
#: en/git-shortlog.txt:41
#, fuzzy, priority:260
msgid "Show the email address of each author."
-msgstr "�양ㅊ驪뤶릉鵝쒑�끿쉪�드춴��뻑�겼�"
+msgstr ""
#. type: Labeled list
#: en/git-shortlog.txt:42
@@ -45266,9 +45527,9 @@ msgid ""
"'git show-branch' (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]\n"
msgstr ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<鵝뺞뿶>] | --no-color] [--sparse]\n"
+"\t\t[--current] [--color[=<>] | --no-color] [--sparse]\n"
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<�덃쑍> | <�싮뀓寧�>)...]"
+"\t\t[--no-name | --sha1-name] [--topics] [(<> | <>)...]"
#. type: Plain text
#: en/git-show-branch.txt:24
@@ -45316,7 +45577,7 @@ msgstr ""
#: en/git-show-branch.txt:46
#, fuzzy, priority:100
msgid "Show the remote-tracking branches."
-msgstr "�양ㅊ瓦쒐쮮瓮잒릉�꾢늽��"
+msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:50
@@ -45382,7 +45643,7 @@ msgstr ""
#: en/git-show-branch.txt:82
#, fuzzy, priority:100
msgid "Synonym to `--more=-1`"
-msgstr "�� more=-1 �뚥퉱"
+msgstr " more=-1 "
#. type: Labeled list
#: en/git-show-branch.txt:83
@@ -45663,7 +45924,7 @@ msgstr "--head"
#: en/git-show-ref.txt:39
#, fuzzy, priority:100
msgid "Show the HEAD reference, even if it would normally be filtered out."
-msgstr "�양ㅊ HEAD 凉뺟뵪竊뚦뜵鵝욤˙瓦뉑빱��"
+msgstr " HEAD "
#. type: Plain text
#: en/git-show-ref.txt:46
@@ -45913,7 +46174,7 @@ msgstr ""
#: en/git-show.txt:13
#, fuzzy, ignore-ellipsis, no-wrap, priority:260
msgid "'git show' [<options>] [<object>...]\n"
-msgstr "git show [<�됮」>] <野배괌>..."
+msgstr "git show [<>] <>..."
#. type: Plain text
#: en/git-show.txt:17
@@ -46135,7 +46396,7 @@ msgstr "cd_to_toplevel"
#: en/git-sh-setup.txt:62
#, fuzzy, priority:100
msgid "runs chdir to the toplevel of the working tree."
-msgstr "訝띹꺗�뉑뜟��퐬�� $cdup竊뚦램鵝쒎뙷�꾦《瀛㎫쎅壤�"
+msgstr " $cdup"
#. type: Labeled list
#: en/git-sh-setup.txt:63
@@ -46213,7 +46474,7 @@ msgstr "git-stage(1)"
#: en/git-stage.txt:7
#, fuzzy, priority:100
msgid "git-stage - Add file contents to the staging area"
-msgstr "弱녷뻼餓뜹냵若방렌�졾댆榮℡폊"
+msgstr ""
#. type: Plain text
#: en/git-stage.txt:13
@@ -46237,7 +46498,7 @@ msgstr "git-stash(1)"
#: en/git-stash.txt:7
#, fuzzy, priority:240
msgid "git-stash - Stash the changes in a dirty working directory away"
-msgstr "兀�뿈�뤷램鵝쒎뙷訝�쉪岳�뵻"
+msgstr ""
#. type: Plain text
#: en/git-stash.txt:22
@@ -46329,25 +46590,25 @@ msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--a
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:92
+#: en/git-stash.txt:93
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs, and any non-option arguments form the message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:93
+#: en/git-stash.txt:94
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:100
+#: en/git-stash.txt:101
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:104
+#: en/git-stash.txt:105
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46355,139 +46616,139 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:108
+#: en/git-stash.txt:109
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:109
+#: en/git-stash.txt:110
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:119
+#: en/git-stash.txt:120
#, priority:240
msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:120
+#: en/git-stash.txt:121
#, fuzzy, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
#. type: Plain text
-#: en/git-stash.txt:126
+#: en/git-stash.txt:127
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:130
+#: en/git-stash.txt:131
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:135
+#: en/git-stash.txt:136
#, priority:240
msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:138
+#: en/git-stash.txt:139
#, priority:240
msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:139
+#: en/git-stash.txt:140
#, fuzzy, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
#. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:145
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:145
+#: en/git-stash.txt:146
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:153
+#: en/git-stash.txt:154
#, priority:240
msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:159
+#: en/git-stash.txt:160
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:160
+#: en/git-stash.txt:161
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:164
+#: en/git-stash.txt:165
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:165
+#: en/git-stash.txt:166
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:171
+#: en/git-stash.txt:172
#, priority:240
msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:172 en/git-update-ref.txt:100
+#: en/git-stash.txt:173 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:179
+#: en/git-stash.txt:180
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:180
+#: en/git-stash.txt:181
#, fuzzy, no-wrap, priority:240
msgid "store"
-msgstr "孃쀥늽"
+msgstr ""
#. type: Plain text
-#: en/git-stash.txt:186
+#: en/git-stash.txt:187
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:195
+#: en/git-stash.txt:196
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:199
+#: en/git-stash.txt:200
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46496,31 +46757,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:203
+#: en/git-stash.txt:204
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:208
+#: en/git-stash.txt:209
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:214
+#: en/git-stash.txt:215
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:219
+#: en/git-stash.txt:220
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:227
+#: en/git-stash.txt:228
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -46532,13 +46793,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:235
+#: en/git-stash.txt:236
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:246
+#: en/git-stash.txt:247
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46553,13 +46814,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:249
+#: en/git-stash.txt:250
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:257
+#: en/git-stash.txt:258
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46571,19 +46832,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:259
+#: en/git-stash.txt:260
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:264
+#: en/git-stash.txt:265
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:275
+#: en/git-stash.txt:276
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46598,19 +46859,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:277
+#: en/git-stash.txt:278
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:283
+#: en/git-stash.txt:284
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:288
+#: en/git-stash.txt:289
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -46619,7 +46880,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:298
+#: en/git-stash.txt:299
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -46640,7 +46901,7 @@ msgstr ""
#: en/git-status.txt:13
#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "'git status' [<options>...] [--] [<pathspec>...]\n"
-msgstr "git status [<�됮」>] [--] <瓮�푶鰲꾣졏>..."
+msgstr "git status [<>] [--] <>..."
#. type: Plain text
#: en/git-status.txt:23
@@ -46697,61 +46958,61 @@ msgid "In addition to the names of files that have been changed, also show the t
msgstr ""
#. type: Plain text
-#: en/git-status.txt:65
+#: en/git-status.txt:66
#, priority:280
msgid "The mode parameter is used to specify the handling of untracked files. It is optional: it defaults to 'all', and if specified, it must be stuck to the option (e.g. `-uno`, but not `-u no`)."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:69
+#: en/git-status.txt:70
#, no-wrap, priority:280
msgid "'no' - Show no untracked files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:70
+#: en/git-status.txt:71
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:81
+#: en/git-status.txt:82
#, priority:280
msgid "When `-u` option is not used, untracked files and directories are shown (i.e. the same as specifying `normal`), to help you avoid forgetting to add newly created files. Because it takes extra work to find untracked files in the filesystem, this mode may take some time in a large working tree. Consider enabling untracked cache and split index if supported (see `git update-index --untracked-cache` and `git update-index --split-index`), Otherwise you can use `no` to have `git status` return more quickly without showing untracked files."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:99
+#: en/git-status.txt:101
#, priority:280
msgid "Ignore changes to submodules when looking for changes. <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 before 1.7.0). Using \"all\" hides all changes to submodules (and suppresses the output of submodule summaries when the config option `status.submoduleSummary` is set)."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:100
+#: en/git-status.txt:102
#, no-wrap, priority:280
msgid "--ignored[=<mode>]"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:102
+#: en/git-status.txt:104
#, priority:280
msgid "Show ignored files as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:105
+#: en/git-status.txt:108
#, priority:280
msgid "The mode parameter is used to specify the handling of ignored files. It is optional: it defaults to 'traditional'."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:109
+#: en/git-status.txt:112
#, priority:280
msgid "'traditional' - Shows ignored files and directories, unless"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:112
+#: en/git-status.txt:115
#, no-wrap, priority:280
msgid ""
"--untracked-files=all is specified, in which case\n"
@@ -46760,109 +47021,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:113
+#: en/git-status.txt:116
#, no-wrap, priority:280
msgid "'no'\t - Show no ignored files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:114
+#: en/git-status.txt:117
#, no-wrap, priority:280
msgid "'matching' - Shows ignored files and directories matching an\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:115
+#: en/git-status.txt:118
#, no-wrap, priority:280
msgid "ignore pattern.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:121
+#: en/git-status.txt:124
#, priority:280
msgid "When 'matching' mode is specified, paths that explicitly match an ignored pattern are shown. If a directory matches an ignore pattern, then it is shown, but not paths contained in the ignored directory. If a directory does not match an ignore pattern, but all contents are ignored, then the directory is not shown, but all contents are shown."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:125
+#: en/git-status.txt:129
#, priority:280
msgid "Terminate entries with NUL, instead of LF. This implies the `--porcelain=v1` output format if no other format is given."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:132
+#: en/git-status.txt:136
#, priority:280
msgid "Display untracked files in columns. See configuration variable column.status for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:133
+#: en/git-status.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--ahead-behind"
msgstr "--ahead-behind"
#. type: Labeled list
-#: en/git-status.txt:134
+#: en/git-status.txt:138
#, ignore-same, no-wrap, priority:280
msgid "--no-ahead-behind"
msgstr "--no-ahead-behind"
#. type: Plain text
-#: en/git-status.txt:137
+#: en/git-status.txt:141
#, priority:280
msgid "Display or do not display detailed ahead/behind counts for the branch relative to its upstream branch. Defaults to true."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:138
+#: en/git-status.txt:142
#, ignore-same, no-wrap, priority:280
msgid "--renames"
msgstr "--renames"
#. type: Plain text
-#: en/git-status.txt:142
+#: en/git-status.txt:146
#, priority:280
msgid "Turn on/off rename detection regardless of user configuration. See also linkgit:git-diff[1] `--no-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:147
+#: en/git-status.txt:151
#, priority:280
msgid "Turn on rename detection, optionally setting the similarity threshold. See also linkgit:git-diff[1] `--find-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:150
+#: en/git-status.txt:154
#, priority:280
msgid "See the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:158
+#: en/git-status.txt:162
#, priority:280
msgid "The output from this command is designed to be used as a commit template comment. The default, long format, is designed to be human readable, verbose and descriptive. Its contents and format are subject to change at any time."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:163
+#: en/git-status.txt:167
#, priority:280
msgid "The paths mentioned in the output, unlike many other Git commands, are made relative to the current directory if you are working in a subdirectory (this is on purpose, to help cutting and pasting). See the status.relativePaths config option below."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:165
+#: en/git-status.txt:169
#, no-wrap, priority:280
msgid "Short Format"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:169
+#: en/git-status.txt:173
#, priority:280
msgid "In the short-format, the status of each path is shown as one of these forms"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:172
+#: en/git-status.txt:176
#, no-wrap, priority:280
msgid ""
"\tXY PATH\n"
@@ -46870,73 +47131,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:176
+#: en/git-status.txt:180
#, priority:280
msgid "where `ORIG_PATH` is where the renamed/copied contents came from. `ORIG_PATH` is only shown when the entry is renamed or copied. The `XY` is a two-letter status code."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:182
+#: en/git-status.txt:186
#, priority:280
msgid "The fields (including the `->`) are separated from each other by a single space. If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash-escaped."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:188
+#: en/git-status.txt:192
#, priority:280
msgid "For paths with merge conflicts, `X` and `Y` show the modification states of each side of the merge. For paths that do not have merge conflicts, `X` shows the status of the index, and `Y` shows the status of the work tree. For untracked paths, `XY` are `??`. Other status codes can be interpreted as follows:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:190
+#: en/git-status.txt:194
#, priority:280
msgid "' ' = unmodified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:191
+#: en/git-status.txt:195
#, priority:280
msgid "'M' = modified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:192
+#: en/git-status.txt:196
#, priority:280
msgid "'A' = added"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:193
+#: en/git-status.txt:197
#, priority:280
msgid "'D' = deleted"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:194
+#: en/git-status.txt:198
#, priority:280
msgid "'R' = renamed"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:195
+#: en/git-status.txt:199
#, priority:280
msgid "'C' = copied"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:196
+#: en/git-status.txt:200
#, priority:280
msgid "'U' = updated but unmerged"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:199
+#: en/git-status.txt:203
#, priority:280
msgid "Ignored files are not listed, unless `--ignored` option is in effect, in which case `XY` are `!!`."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:226
+#: en/git-status.txt:230
#, no-wrap, priority:280
msgid ""
"X Y Meaning\n"
@@ -46967,7 +47228,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:235
+#: en/git-status.txt:239
#, no-wrap, priority:280
msgid ""
"Submodules have more state and instead report\n"
@@ -46980,91 +47241,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:238
+#: en/git-status.txt:242
#, priority:280
msgid "'m' and '?' are applied recursively. For example if a nested submodule in a submodule contains an untracked file, this is reported as '?' as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:240
+#: en/git-status.txt:244
#, priority:280
msgid "If -b is used the short-format status is preceded by a line"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:242
+#: en/git-status.txt:246
#, no-wrap, priority:280
msgid " ## branchname tracking info\n"
msgstr ""
#. type: Title ~
-#: en/git-status.txt:244
+#: en/git-status.txt:248
#, no-wrap, priority:280
msgid "Porcelain Format Version 1"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:251
+#: en/git-status.txt:255
#, priority:280
msgid "Version 1 porcelain format is similar to the short format, but is guaranteed not to change in a backwards-incompatible way between Git versions or based on user configuration. This makes it ideal for parsing by scripts. The description of the short format above also describes the porcelain format, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:254
+#: en/git-status.txt:258
#, priority:280
msgid "The user's color.status configuration is not respected; color will always be off."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:257
+#: en/git-status.txt:261
#, priority:280
msgid "The user's status.relativePaths configuration is not respected; paths shown will always be relative to the repository root."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:267
+#: en/git-status.txt:271
#, priority:280
msgid "There is also an alternate -z format recommended for machine parsing. In that format, the status field is the same, but some other things change. First, the '\\->' is omitted from rename entries and the field order is reversed (e.g 'from \\-> to' becomes 'to from'). Second, a NUL (ASCII 0) follows each filename, replacing space as a field separator and the terminating newline (but a space still separates the status field from the first filename). Third, filenames containing special characters are not specially formatted; no quoting or backslash-escaping is performed."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:269
+#: en/git-status.txt:273
#, priority:280
msgid "Any submodule changes are reported as modified `M` instead of `m` or single `?`."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:271
+#: en/git-status.txt:275
#, no-wrap, priority:280
msgid "Porcelain Format Version 2"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:276
+#: en/git-status.txt:280
#, priority:280
msgid "Version 2 format adds more detailed information about the state of the worktree and changed items. Version 2 also defines an extensible set of easy to parse optional headers."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:280
+#: en/git-status.txt:284
#, priority:280
msgid "Header lines start with \"#\" and are added in response to specific command line arguments. Parsers should ignore headers they don't recognize."
msgstr ""
#. type: Title ^
-#: en/git-status.txt:282
+#: en/git-status.txt:286
#, no-wrap, priority:280
msgid "Branch Headers"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:286
+#: en/git-status.txt:290
#, priority:280
msgid "If `--branch` is given, a series of header lines are printed with information about the current branch."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:296
+#: en/git-status.txt:300
#, no-wrap, priority:280
msgid ""
"Line Notes\n"
@@ -47078,43 +47339,43 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:299
+#: en/git-status.txt:303
#, no-wrap, priority:280
msgid "Changed Tracked Entries"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:306
+#: en/git-status.txt:310
#, priority:280
msgid "Following the headers, a series of lines are printed for tracked entries. One of three different line formats may be used to describe an entry depending on the type of change. Tracked entries are printed in an undefined order; parsers should allow for a mixture of the 3 line types in any order."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:308
+#: en/git-status.txt:312
#, priority:280
msgid "Ordinary changed entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:310
+#: en/git-status.txt:314
#, no-wrap, priority:280
msgid " 1 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:312
+#: en/git-status.txt:316
#, priority:280
msgid "Renamed or copied entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:314
+#: en/git-status.txt:318
#, no-wrap, priority:280
msgid " 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:345
+#: en/git-status.txt:349
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47149,19 +47410,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:349
+#: en/git-status.txt:353
#, priority:280
msgid "Unmerged entries have the following format; the first character is a \"u\" to distinguish from ordinary changed entries."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:351
+#: en/git-status.txt:355
#, no-wrap, priority:280
msgid " u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:368
+#: en/git-status.txt:372
#, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -47182,85 +47443,85 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-status.txt:371
+#: en/git-status.txt:375
#, no-wrap, priority:280
msgid "Other Items"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:376
+#: en/git-status.txt:380
#, priority:280
msgid "Following the tracked entries (and if requested), a series of lines will be printed for untracked and then ignored items found in the worktree."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:378
+#: en/git-status.txt:382
#, priority:280
msgid "Untracked items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:380
+#: en/git-status.txt:384
#, no-wrap, priority:280
msgid " ? <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:382
+#: en/git-status.txt:386
#, priority:280
msgid "Ignored items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:384
+#: en/git-status.txt:388
#, no-wrap, priority:280
msgid " ! <path>\n"
msgstr ""
#. type: Title ^
-#: en/git-status.txt:386
+#: en/git-status.txt:390
#, no-wrap, priority:280
msgid "Pathname Format Notes and -z"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:391
+#: en/git-status.txt:395
#, priority:280
msgid "When the `-z` option is given, pathnames are printed as is and without any quoting and lines are terminated with a NUL (ASCII 0x00) byte."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:395
+#: en/git-status.txt:399
#, 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])."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:404
+#: en/git-status.txt:408
#, priority:280
msgid "The command honors `color.status` (or `status.color` -- they mean the same thing and the latter is kept for backward compatibility) and `color.status.<slot>` configuration variables to colorize its output."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:408
+#: en/git-status.txt:412
#, priority:280
msgid "If the config variable `status.relativePaths` is set to false, then all paths shown are relative to the repository root, not to the current directory."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:419
+#: en/git-status.txt:423
#, priority:280
msgid "If `status.submoduleSummary` is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). Please note that the summary output from the status command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings."
msgstr ""
#. type: Title -
-#: en/git-status.txt:421
+#: en/git-status.txt:425
#, no-wrap, priority:280
msgid "BACKGROUND REFRESH"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:432
+#: en/git-status.txt:436
#, priority:280
msgid "By default, `git status` will automatically refresh the index, updating the cached stat information from the working tree and writing out the result. Writing out the updated index is an optimization that isn't strictly necessary (`status` computes the values for itself, but writing them out is just to save subsequent programs from repeating our computation). When `status` is run in the background, the lock held during the write may conflict with other simultaneous processes, causing them to fail. Scripts running `status` in the background should consider using `git --no-optional-locks status` (see linkgit:git[1] for details)."
msgstr ""
@@ -47346,7 +47607,7 @@ msgstr "--strip-comments"
#: en/git-stripspace.txt:41
#, fuzzy, priority:100
msgid "Skip and remove all lines starting with comment character (default '#')."
-msgstr "瓮녘퓝�뚨㎉�ㅶ��됬쉪力③뇢烏�"
+msgstr ""
#. type: Labeled list
#: en/git-stripspace.txt:43
@@ -47704,281 +47965,287 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:176
#, no-wrap, priority:220
-msgid "set-branch ((-d|--default)|(-b|--branch <branch>)) [--] <path>"
+msgid "set-branch (-b|--branch) <branch> [--] <path>"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-submodule.txt:177
+#, no-wrap, priority:220
+msgid "set-branch (-d|--default) [--] <path>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:181
+#: en/git-submodule.txt:182
#, priority:220
msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:182
+#: en/git-submodule.txt:183
#, ignore-ellipsis, no-wrap, priority:220
msgid "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:191
+#: en/git-submodule.txt:192
#, priority:220
msgid "Show commit summary between the given commit (defaults to HEAD) and working tree/index. For a submodule in question, a series of commits in the submodule between the given super project commit and the index or working tree (switched by `--cached`) are shown. If the option `--files` is given, show the series of commits in the submodule between the index of the super project and the working tree of the submodule (this option doesn't allow to use the `--cached` option or to provide an explicit commit)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:194
+#: en/git-submodule.txt:195
#, priority:220
msgid "Using the `--submodule=log` option with linkgit:git-diff[1] will provide that information too."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:195
+#: en/git-submodule.txt:196
#, no-wrap, priority:220
msgid "foreach [--recursive] <command>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:216
+#: en/git-submodule.txt:217
#, priority:220
msgid "Evaluates an arbitrary shell command in each checked out submodule. The command has access to the variables $name, $sm_path, $displaypath, $sha1 and $toplevel: $name is the name of the relevant submodule section in `.gitmodules`, $sm_path is the path of the submodule as recorded in the immediate superproject, $displaypath contains the relative path from the current working directory to the submodules root directory, $sha1 is the commit as recorded in the immediate superproject, and $toplevel is the absolute path to the top-level of the immediate superproject. Note that to avoid conflicts with '$PATH' on Windows, the '$path' variable is now a deprecated synonym of '$sm_path' variable. Any submodules defined in the superproject but not checked out are ignored by this command. Unless given `--quiet`, foreach prints the name of each submodule before evaluating the command. If `--recursive` is given, submodules are traversed recursively (i.e. the given shell command is evaluated in nested submodules as well). A non-zero return from the command in any submodule causes the processing to terminate. This can be overridden by adding '|| :' to the end of the command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:219
+#: en/git-submodule.txt:220
#, priority:220
msgid "As an example, the command below will show the path and currently checked out commit for each submodule:"
msgstr ""
#. type: delimited block -
-#: en/git-submodule.txt:222
+#: en/git-submodule.txt:223
#, no-wrap, priority:220
msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:224
+#: en/git-submodule.txt:225
#, ignore-ellipsis, no-wrap, priority:220
msgid "sync [--recursive] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:231
+#: en/git-submodule.txt:232
#, priority:220
msgid "Synchronizes submodules' remote URL configuration setting to the value specified in `.gitmodules`. It will only affect those submodules which already have a URL entry in .git/config (that is the case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:234
+#: en/git-submodule.txt:235
#, priority:220
msgid "`git submodule sync` synchronizes all submodules while `git submodule sync -- A` synchronizes submodule \"A\" only."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:237
+#: en/git-submodule.txt:238
#, priority:220
msgid "If `--recursive` is specified, this command will recurse into the registered submodules, and sync any nested submodules within."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:238
+#: en/git-submodule.txt:239
#, no-wrap, priority:220
msgid "absorbgitdirs"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:245
+#: en/git-submodule.txt:246
#, priority:220
msgid "If a git directory of a submodule is inside the submodule, move the git directory of the submodule into its superprojects `$GIT_DIR/modules` path and then connect the git directory and its working directory by setting the `core.worktree` and adding a .git file pointing to the git directory embedded in the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:249
+#: en/git-submodule.txt:250
#, priority:220
msgid "A repository that was cloned independently and later added as a submodule or old setups have the submodules git directory inside the submodule instead of embedded into the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:251
+#: en/git-submodule.txt:252
#, priority:220
msgid "This command is recursive by default."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:257
+#: en/git-submodule.txt:258
#, priority:220
msgid "Only print error messages."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:264
+#: en/git-submodule.txt:265
#, priority:220
msgid "This option is only valid for add and update commands. Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:268
+#: en/git-submodule.txt:269
#, priority:220
msgid "This option is only valid for the deinit command. Unregister all submodules in the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:269
+#: en/git-submodule.txt:270
#, no-wrap, priority:220
msgid "-b <branch>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:277
+#: en/git-submodule.txt:278
#, priority:220
msgid "Branch of repository to add as submodule. The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository. If the option is not specified, it defaults to 'master'."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:290
+#: en/git-submodule.txt:291
#, priority:220
msgid "This option is only valid for add, deinit and update commands. When running add, allow adding an otherwise ignored submodule path. When running deinit the submodule working trees will be removed even if they contain local changes. When running update (only effective with the checkout procedure), throw away local changes in submodules when switching to a different commit; and always run a checkout operation in the submodule, even if the commit listed in the index of the containing repository matches the commit checked out in the submodule."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:295
+#: en/git-submodule.txt:296
#, priority:220
msgid "This option is only valid for status and summary commands. These commands typically use the commit found in the submodule HEAD, but with this option, the commit stored in the index is used instead."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:296
+#: en/git-submodule.txt:297
#, ignore-same, no-wrap, priority:220
msgid "--files"
msgstr "--files"
#. type: Plain text
-#: en/git-submodule.txt:300
+#: en/git-submodule.txt:301
#, priority:220
msgid "This option is only valid for the summary command. This command compares the commit in the index with that in the submodule HEAD when this option is used."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:302
+#: en/git-submodule.txt:303
#, ignore-same, no-wrap, priority:220
msgid "--summary-limit"
msgstr "--summary-limit"
#. type: Plain text
-#: en/git-submodule.txt:308
+#: en/git-submodule.txt:309
#, priority:220
msgid "This option is only valid for the summary command. Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:309
+#: en/git-submodule.txt:310
#, ignore-same, no-wrap, priority:220
msgid "--remote"
msgstr "--remote"
#. type: Plain text
-#: en/git-submodule.txt:318
+#: en/git-submodule.txt:319
#, priority:220
msgid "This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:324
+#: en/git-submodule.txt:325
#, priority:220
msgid "This works for any of the supported update procedures (`--checkout`, `--rebase`, etc.). The only change is the source of the target SHA-1. For example, `submodule update --remote --merge` will merge upstream submodule changes into the submodules, while `submodule update --merge` will merge superproject gitlink changes into the submodules."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:329
+#: en/git-submodule.txt:330
#, priority:220
msgid "In order to ensure a current tracking branch state, `update --remote` fetches the submodule's remote repository before calculating the SHA-1. If you don't want to fetch, you should use `submodule update --remote --no-fetch`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:339
+#: en/git-submodule.txt:340
#, priority:220
msgid "Use this option to integrate changes from the upstream subproject with your submodule's current HEAD. Alternatively, you can run `git pull` from the submodule, which is equivalent except for the remote branch name: `update --remote` uses the default upstream repository and `submodule.<name>.branch`, while `git pull` uses the submodule's `branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want to distribute the default upstream branch with the superproject and `branch.<name>.merge` if you want a more native feel while working in the submodule itself."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:341
+#: en/git-submodule.txt:342
#, ignore-same, no-wrap, priority:220
msgid "--no-fetch"
msgstr "--no-fetch"
#. type: Plain text
-#: en/git-submodule.txt:344
+#: en/git-submodule.txt:345
#, priority:220
msgid "This option is only valid for the update command. Don't fetch new objects from the remote site."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:345
+#: en/git-submodule.txt:346
#, ignore-same, no-wrap, priority:220
msgid "--checkout"
msgstr "--checkout"
#. type: Plain text
-#: en/git-submodule.txt:353
+#: en/git-submodule.txt:354
#, priority:220
msgid "This option is only valid for the update command. Checkout the commit recorded in the superproject on a detached HEAD in the submodule. This is the default behavior, the main use of this option is to override `submodule.$name.update` when set to a value other than `checkout`. If the key `submodule.$name.update` is either not explicitly set or set to `checkout`, this option is implicit."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:363
+#: en/git-submodule.txt:364
#, priority:220
msgid "This option is only valid for the update command. Merge the commit recorded in the superproject into the current branch of the submodule. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve the resulting conflicts within the submodule with the usual conflict resolution tools. If the key `submodule.$name.update` is set to `merge`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:364
+#: en/git-submodule.txt:365
#, ignore-same, no-wrap, priority:220
msgid "--rebase"
msgstr "--rebase"
#. type: Plain text
-#: en/git-submodule.txt:372
+#: en/git-submodule.txt:373
#, priority:220
msgid "This option is only valid for the update command. Rebase the current branch onto the commit recorded in the superproject. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve these failures with linkgit:git-rebase[1]. If the key `submodule.$name.update` is set to `rebase`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:373
+#: en/git-submodule.txt:374
#, ignore-same, no-wrap, priority:220
msgid "--init"
msgstr "--init"
#. type: Plain text
-#: en/git-submodule.txt:377
+#: en/git-submodule.txt:378
#, priority:220
msgid "This option is only valid for the update command. Initialize all submodules for which \"git submodule init\" has not been called so far before updating."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:378
+#: en/git-submodule.txt:379
#, ignore-same, no-wrap, priority:220
msgid "--name"
msgstr "--name"
#. type: Plain text
-#: en/git-submodule.txt:382
+#: en/git-submodule.txt:383
#, priority:220
msgid "This option is only valid for the add command. It sets the submodule's name to the given string instead of defaulting to its path. The name must be valid as a directory name and may not end with a '/'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:383
+#: en/git-submodule.txt:384
#, fuzzy, no-wrap, priority:220
msgid "--reference <repository>"
-msgstr "�귟�껂퍜佯�"
+msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:387 en/git-submodule.txt:396
+#: en/git-submodule.txt:388 en/git-submodule.txt:397
#, priority:220
msgid "This option is only valid for add and update commands. These commands sometimes need to clone a remote repository. In this case, this option will be passed to the linkgit:git-clone[1] command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:391
+#: en/git-submodule.txt:392
#, no-wrap, priority:220
msgid ""
"*NOTE*: Do *not* use this option unless you have read the note\n"
@@ -47987,61 +48254,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:398
+#: en/git-submodule.txt:399
#, no-wrap, priority:220
msgid "*NOTE*: see the NOTE for the `--reference` option.\n"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:404
+#: en/git-submodule.txt:405
#, priority:220
msgid "This option is only valid for foreach, update, status and sync commands. Traverse submodules recursively. The operation is performed not only in the submodules of the current repo, but also in any nested submodules inside those submodules (and so on)."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:405
+#: en/git-submodule.txt:406
#, ignore-same, no-wrap, priority:220
msgid "--depth"
msgstr "--depth"
#. type: Plain text
-#: en/git-submodule.txt:409
+#: en/git-submodule.txt:410
#, priority:220
msgid "This option is valid for add and update commands. Create a 'shallow' clone with a history truncated to the specified number of revisions. See linkgit:git-clone[1]"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:410
+#: en/git-submodule.txt:411
#, ignore-same, no-wrap, priority:220
msgid "--[no-]recommend-shallow"
msgstr "--[no-]recommend-shallow"
#. type: Plain text
-#: en/git-submodule.txt:415
+#: en/git-submodule.txt:416
#, priority:220
msgid "This option is only valid for the update command. The initial clone of a submodule will use the recommended `submodule.<name>.shallow` as provided by the `.gitmodules` file by default. To ignore the suggestions use `--no-recommend-shallow`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:421
+#: en/git-submodule.txt:422
#, priority:220
msgid "This option is only valid for the update command. Clone new submodules in parallel with as many jobs. Defaults to the `submodule.fetchJobs` option."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:426
+#: en/git-submodule.txt:427
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:434
+#: en/git-submodule.txt:435
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:438
+#: en/git-submodule.txt:439
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -48056,7 +48323,7 @@ msgstr "git-svn(1)"
#: en/git-svn.txt:7
#, fuzzy, priority:100
msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
-msgstr "Subersion 餓볟틩�� Git 阿뗩뿴�꾢룎�묉뱧鵝�"
+msgstr "Subersion Git "
#. type: Plain text
#: en/git-svn.txt:12
@@ -48673,7 +48940,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:889
+#: en/git-svn.txt:346 en/rev-list-options.txt:905
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -49486,7 +49753,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:777
#, priority:100
-msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider linkgit:git-filter-branch[1] instead. filter-branch also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
+msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports, and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider https://github.com/newren/git-filter-repo[git-filter-repo] instead. filter-repo also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
msgstr ""
#. type: Labeled list
@@ -50040,7 +50307,7 @@ msgstr ""
#: en/git-switch.txt:39
#, fuzzy, no-wrap, priority:100
msgid "<new-branch>"
-msgstr "�겼늽��"
+msgstr ""
#. type: Plain text
#: en/git-switch.txt:48
@@ -50388,7 +50655,7 @@ msgstr "git-tag(1)"
#: en/git-tag.txt:7
#, fuzzy, priority:240
msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
-msgstr "�쎾뻠�곩닓�뷩�곩닠�ㅶ닑�↓챿訝�訝� GPG 嶺얍릫�꾣젃嶺얍�穩�"
+msgstr " GPG "
#. type: Plain text
#: en/git-tag.txt:20
@@ -50564,7 +50831,7 @@ msgstr ""
#: en/git-tag.txt:133
#, fuzzy, priority:240
msgid "Sorting and filtering tags are case insensitive."
-msgstr "�믣틣�뚩퓝譯ㅵ콪雅롥ㄷ弱뤷넍訝띷븦��"
+msgstr ""
#. type: Plain text
#: en/git-tag.txt:139
@@ -50927,11 +51194,11 @@ msgid ""
" [--super-prefix=<path>]\n"
" <command> [<args>]\n"
msgstr ""
-"git [--version] [--help] [-C <瓮�푶>] [-c <�띸㎞>=<�뽩��>]\n"
-" [--exec-path[=<瓮�푶>]] [--html-path] [--man-path] [--info-path]\n"
+"git [--version] [--help] [-C <>] [-c <>=<>]\n"
+" [--exec-path[=<>]] [--html-path] [--man-path] [--info-path]\n"
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n"
-" [--git-dir=<瓮�푶>] [--work-tree=<瓮�푶>] [--namespace=<�띸㎞>]\n"
-" <�썰빱> [<�귝빊>]"
+" [--git-dir=<>] [--work-tree=<>] [--namespace=<>]\n"
+" <> [<>]"
#. type: Plain text
#: en/git.txt:24
@@ -51257,7 +51524,7 @@ msgstr ""
#: en/git.txt:192
#, fuzzy, no-wrap, priority:100
msgid "Main porcelain commands"
-msgstr "訝삭쫨�꾡툓掠귛뫝餓�"
+msgstr ""
#. type: Title ~
#: en/git.txt:197
@@ -51281,7 +51548,7 @@ msgstr ""
#: en/git.txt:208
#, no-wrap, priority:100
msgid "Interacting with Others"
-msgstr "訝롥끀若껆내瀯잋벡雅�"
+msgstr ""
#. type: Plain text
#: en/git.txt:212
@@ -51412,16 +51679,6 @@ msgid ""
"#\n"
msgstr ""
-#. type: delimited block -
-#: en/git.txt:310
-#, 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/git.txt:315
#, no-wrap, priority:100
@@ -53936,13 +54193,13 @@ msgstr "--[no-]strict"
#: en/git-upload-pack.txt:30
#, fuzzy, priority:100
msgid "Do not try <directory>/.git/ if <directory> is no Git directory."
-msgstr "倻귝옖 <��퐬> 訝띷삸訝�訝� Git ��퐬竊뚥툖誤곩컼瑥� <��퐬>/.git/"
+msgstr " <> Git <>/.git/"
#. type: Plain text
#: en/git-upload-pack.txt:33
#, fuzzy, priority:100
msgid "Interrupt transfer after <n> seconds of inactivity."
-msgstr "訝띷뉵�� <n> 燁믧뮓�롧퍑閭㏘폖渦�"
+msgstr " <n> "
#. type: Labeled list
#: en/git-upload-pack.txt:34
@@ -54002,7 +54259,7 @@ msgstr ""
#: en/git-var.txt:17
#, fuzzy, priority:100
msgid "Prints a Git logical variable."
-msgstr "�양ㅊ訝�訝찱it�삭풌�섌뇧"
+msgstr "Git"
#. type: Plain text
#: en/git-var.txt:25
@@ -54148,7 +54405,7 @@ msgstr ""
#: en/git-verify-pack.txt:13
#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid "'git verify-pack' [-v|--verbose] [-s|--stat-only] [--] <pack>.idx ...\n"
-msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <��>..."
+msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <>..."
#. type: Plain text
#: en/git-verify-pack.txt:20
@@ -55114,7 +55371,7 @@ msgstr ""
#: en/git-write-tree.txt:13
#, fuzzy, no-wrap, priority:100
msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
-msgstr "git write-tree [--missing-ok] [--prefix=<�띸�>/]"
+msgstr "git write-tree [--missing-ok] [--prefix=<>/]"
#. type: Plain text
#: en/git-write-tree.txt:18
@@ -55462,98 +55719,104 @@ msgstr ""
msgid "This option determines how the merge message will be cleaned up before commiting. See linkgit:git-commit[1] for more details. In addition, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on to the commit machinery in the case of a merge conflict."
msgstr ""
+#. type: Labeled list
+#: en/merge-options.txt:44
+#, ignore-same, no-wrap, priority:240
+msgid "--ff-only"
+msgstr "--ff-only"
+
#. type: Plain text
-#: en/merge-options.txt:46
+#: en/merge-options.txt:50
#, priority:240
-msgid "When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. This is the default behavior."
+msgid "Specifies how a merge is handled when the merged-in history is already a descendant of the current history. `--ff` is the default unless merging an annotated (and possibly signed) tag that is not stored in its natural place in the `refs/tags/` hierarchy, in which case `--no-ff` is assumed."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:52
+#: en/merge-options.txt:55
#, priority:240
-msgid "Create a merge commit even when the merge resolves as a fast-forward. This is the default behaviour when merging an annotated (and possibly signed) tag that is not stored in its natural place in 'refs/tags/' hierarchy."
+msgid "With `--ff`, when possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit."
msgstr ""
-#. type: Labeled list
-#: en/merge-options.txt:53
-#, ignore-same, no-wrap, priority:240
-msgid "--ff-only"
-msgstr "--ff-only"
+#. type: Plain text
+#: en/merge-options.txt:58
+#, priority:240
+msgid "With `--no-ff`, create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward."
+msgstr ""
#. type: Plain text
-#: en/merge-options.txt:57
+#: en/merge-options.txt:61
#, priority:240
-msgid "Refuse to merge and exit with a non-zero status unless the current `HEAD` is already up to date or the merge can be resolved as a fast-forward."
+msgid "With `--ff-only`, resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:63
+#: en/merge-options.txt:67
#, priority:240
msgid "GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:69
+#: en/merge-options.txt:73
#, priority:240
msgid "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also linkgit:git-fmt-merge-msg[1]."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:72
+#: en/merge-options.txt:76
#, priority:240
msgid "With --no-log do not list one-line descriptions from the actual commits being merged."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:74
+#: en/merge-options.txt:78
#, ignore-same, no-wrap, priority:240
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
-#: en/merge-options.txt:83
+#: en/merge-options.txt:87
#, priority:240
msgid "With --no-signoff do not add a Signed-off-by line."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:89
+#: en/merge-options.txt:93
#, priority:240
msgid "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:92
+#: en/merge-options.txt:96
#, priority:240
msgid "With -n or --no-stat do not show a diffstat at the end of the merge."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:93
+#: en/merge-options.txt:97
#, ignore-same, no-wrap, priority:240
msgid "--squash"
msgstr "--squash"
#. type: Labeled list
-#: en/merge-options.txt:94
+#: en/merge-options.txt:98
#, ignore-same, no-wrap, priority:240
msgid "--no-squash"
msgstr "--no-squash"
#. type: Plain text
-#: en/merge-options.txt:102
+#: en/merge-options.txt:106
#, priority:240
msgid "Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:105
+#: en/merge-options.txt:109
#, priority:240
msgid "With --no-squash perform the merge and commit the result. This option can be used to override --squash."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:107
+#: en/merge-options.txt:111
#, priority:240
msgid "With --squash, --commit is not allowed, and will fail."
msgstr ""
@@ -55561,71 +55824,77 @@ msgstr ""
#. type: Plain text
#: en/merge-options.txt:115
#, priority:240
+msgid "This option bypasses the pre-merge and commit-msg hooks. See also linkgit:githooks[5]."
+msgstr ""
+
+#. type: Plain text
+#: en/merge-options.txt:123
+#, priority:240
msgid "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise)."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:116
+#: en/merge-options.txt:124
#, no-wrap, priority:240
msgid "-X <option>"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:120
+#: en/merge-options.txt:128
#, priority:240
msgid "Pass merge strategy specific option through to the merge strategy."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:121
+#: en/merge-options.txt:129
#, ignore-same, no-wrap, priority:240
msgid "--verify-signatures"
msgstr "--verify-signatures"
#. type: Labeled list
-#: en/merge-options.txt:122
+#: en/merge-options.txt:130
#, ignore-same, no-wrap, priority:240
msgid "--no-verify-signatures"
msgstr "--no-verify-signatures"
#. type: Plain text
-#: en/merge-options.txt:128
+#: en/merge-options.txt:136
#, priority:240
msgid "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:130
+#: en/merge-options.txt:138
#, ignore-same, no-wrap, priority:240
msgid "--no-summary"
msgstr "--no-summary"
#. type: Plain text
-#: en/merge-options.txt:133
+#: en/merge-options.txt:141
#, priority:240
msgid "Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:138
+#: en/merge-options.txt:146
#, priority:240
msgid "Operate quietly. Implies --no-progress."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:149
+#: en/merge-options.txt:157
#, priority:240
msgid "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:152
+#: en/merge-options.txt:160
#, ignore-same, no-wrap, priority:240
msgid "--allow-unrelated-histories"
msgstr "--allow-unrelated-histories"
#. type: Plain text
-#: en/merge-options.txt:158
+#: en/merge-options.txt:166
#, priority:240
msgid "By default, `git merge` command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added."
msgstr ""
@@ -56948,7 +57217,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:215
#, priority:260
-msgid "minutes ago`}; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -57331,7 +57600,7 @@ msgstr ""
#: en/pull-fetch-param.txt:14
#, fuzzy, no-wrap, priority:220
msgid "<refspec>"
-msgstr "凉뺟뵪鰲꾣졏"
+msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:18
@@ -59326,263 +59595,281 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:762
#, priority:260
+msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:771
+#, ignore-ellipsis, priority:260
+msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:775
+#, priority:260
+msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:778
+#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:779
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:766
+#: en/rev-list-options.txt:782
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:773
+#: en/rev-list-options.txt:789
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:781
+#: en/rev-list-options.txt:797
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:800
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:791
+#: en/rev-list-options.txt:807
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:793
+#: en/rev-list-options.txt:809
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:801
+#: en/rev-list-options.txt:817
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:802
+#: en/rev-list-options.txt:818
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:804
+#: en/rev-list-options.txt:820
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:822
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:812
+#: en/rev-list-options.txt:828
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:832
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:818
+#: en/rev-list-options.txt:834
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:819
+#: en/rev-list-options.txt:835
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:826
+#: en/rev-list-options.txt:842
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:847
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:833
+#: en/rev-list-options.txt:849
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:852
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:838
+#: en/rev-list-options.txt:854
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:839
+#: en/rev-list-options.txt:855
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:840
+#: en/rev-list-options.txt:856
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:859
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:846
+#: en/rev-list-options.txt:862
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:864
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:873
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:864
+#: en/rev-list-options.txt:880
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:868
+#: en/rev-list-options.txt:884
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:875
+#: en/rev-list-options.txt:891
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:894
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:880
+#: en/rev-list-options.txt:896
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:882
+#: en/rev-list-options.txt:898
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:884
+#: en/rev-list-options.txt:900
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:887
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:892
+#: en/rev-list-options.txt:908
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:909
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:896
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:898
+#: en/rev-list-options.txt:914
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:902
+#: en/rev-list-options.txt:918
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:907
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:925
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:932
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -59593,19 +59880,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:919
+#: en/rev-list-options.txt:935
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:922
+#: en/rev-list-options.txt:938
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:929
+#: en/rev-list-options.txt:945
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -59617,85 +59904,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:931
+#: en/rev-list-options.txt:947
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:937
+#: en/rev-list-options.txt:953
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:939
+#: en/rev-list-options.txt:955
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:942
+#: en/rev-list-options.txt:958
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:943
+#: en/rev-list-options.txt:959
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:949
+#: en/rev-list-options.txt:965
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:959
+#: en/rev-list-options.txt:975
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:963
+#: en/rev-list-options.txt:979
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:984
#, priority:260
msgid "Listed below are options that control the formatting of diff output. Some of them are specific to linkgit:git-rev-list[1], however other diff options may be given. See linkgit:git-diff-files[1] for more options."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:991
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:981
+#: en/rev-list-options.txt:997
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:1012
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1015
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1018
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.zh_HANT.po b/po/documentation.zh_HANT.po
index 975d9e5ca08f319a2cae35a5448667e5c0451e4e..4e44439b2efba3277516f665603b5123de5b07e1 100644
--- a/po/documentation.zh_HANT.po
+++ b/po/documentation.zh_HANT.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Git Documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2019-02-13 20:53+0100\n"
+"POT-Creation-Date: 2019-12-08 16:35+0100\n"
"PO-Revision-Date: 2019-09-24 15:28+0000\n"
"Last-Translator: 泳�땟�� <appiedavid777@gmail.com>\n"
"Language-Team: French\n"
@@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Weblate 3.9-dev\n"
#. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:646 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31 en/git-submodule.txt:258
+#: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
#, ignore-same, no-wrap, priority:280
msgid "-b"
msgstr "-b"
@@ -29,7 +29,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:314 en/git-fsck.txt:38 en/git-rebase.txt:465
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:321 en/git-fsck.txt:38 en/git-rebase.txt:493
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -77,7 +77,7 @@ msgid "<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans f
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:157 en/git-checkout.txt:185 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:92 en/git-var.txt:20
+#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:198 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
#, ignore-same, no-wrap, priority:300
msgid "-l"
msgstr "-l"
@@ -89,7 +89,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:137 en/git-branch.txt:185 en/git-cat-file.txt:36 en/git-checkout.txt:166 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/rev-list-options.txt:974
+#: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1016
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -125,7 +125,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:91 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:253 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:428 en/git-request-pull.txt:29 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:99
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -203,8 +203,8 @@ msgid "Specifies the format used to output dates. If --date is not provided, the
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:73 en/git-checkout.txt:121 en/git-fsck.txt:92
-#, ignore-same, no-wrap, priority:240
+#: en/blame-options.txt:73 en/git-fsck.txt:100
+#, ignore-same, no-wrap, priority:100
msgid "--[no-]progress"
msgstr "--[no-]progress"
@@ -251,19 +251,45 @@ msgid "<num> is optional but it is the lower bound on the number of alphanumeric
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:113 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
+#: en/blame-options.txt:113
+#, fuzzy, no-wrap, priority:100
+#| msgid "--ignore-removal"
+msgid "--ignore-rev <rev>"
+msgstr "--ignore-removal"
+
+#. type: Plain text
+#: en/blame-options.txt:124
+#, priority:100
+msgid "Ignore changes made by the revision when assigning blame, as if the change never happened. Lines that were changed or added by an ignored commit will be blamed on the previous commit that changed that line or nearby lines. This option may be specified multiple times to ignore more than one revision. If the `blame.markIgnoredLines` config option is set, then lines that were changed by an ignored commit and attributed to another commit will be marked with a `?` in the blame output. If the `blame.markUnblamableLines` config option is set, then those lines touched by an ignored commit that we could not attribute to another revision are marked with a '*'."
+msgstr ""
+
+#. type: Labeled list
+#: en/blame-options.txt:125
+#, fuzzy, no-wrap, priority:100
+#| msgid "--ignore-removal"
+msgid "--ignore-revs-file <file>"
+msgstr "--ignore-removal"
+
+#. type: Plain text
+#: en/blame-options.txt:131
+#, priority:100
+msgid "Ignore revisions listed in `file`, which must be in the same format as an `fsck.skipList`. This option may be repeated, and these files will be processed after any files specified with the `blame.ignoreRevsFile` config option. An empty file name, `\"\"`, will clear the list of revs from previously processed files."
+msgstr ""
+
+#. type: Labeled list
+#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
#, ignore-same, no-wrap, priority:100
msgid "-h"
msgstr "-h"
#. type: Plain text
-#: en/blame-options.txt:114
+#: en/blame-options.txt:133
#, priority:100
msgid "Show help message."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:1 en/git-blame.txt:232
+#: en/cmds-ancillaryinterrogators.txt:1 en/git-blame.txt:233
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-annotate[1]"
msgstr "linkgit:git-annotate[1]"
@@ -431,7 +457,7 @@ msgid "Git web interface (web frontend to Git repositories)."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillarymanipulators.txt:1 en/git-difftool.txt:142
+#: en/cmds-ancillarymanipulators.txt:1 en/git-difftool.txt:144
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-config[1]"
msgstr "linkgit:git-config[1]"
@@ -443,7 +469,7 @@ msgid "Get and set repository or global options."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1489
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1528
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-export[1]"
msgstr "linkgit:git-fast-export[1]"
@@ -455,7 +481,7 @@ msgid "Git data exporter."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:236
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-import[1]"
msgstr "linkgit:git-fast-import[1]"
@@ -479,7 +505,7 @@ msgid "Rewrite branches."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillarymanipulators.txt:13 en/git-difftool.txt:139
+#: en/cmds-ancillarymanipulators.txt:13 en/git-difftool.txt:141
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-mergetool[1]"
msgstr "linkgit:git-mergetool[1]"
@@ -767,7 +793,7 @@ msgid "Switch branches or restore working tree files."
msgstr ""
#. type: Plain text
-#: en/cmds-mainporcelain.txt:22 en/git-revert.txt:126
+#: en/cmds-mainporcelain.txt:22 en/git-revert.txt:139
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-cherry-pick[1]"
msgstr "linkgit:git-cherry-pick[1]"
@@ -839,7 +865,7 @@ msgid "Give an object a human readable name based on an available ref."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:136
+#: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:138
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-diff[1]"
msgstr "linkgit:git-diff[1]"
@@ -1030,122 +1056,147 @@ msgstr "linkgit:git-reset[1]"
msgid "Reset current HEAD to the specified state."
msgstr ""
+#. type: Labeled list
+#: en/cmds-mainporcelain.txt:88
+#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-restore[1]"
+msgstr "linkgit:git-restore[1]"
+
+#. type: Plain text
+#: en/cmds-mainporcelain.txt:90
+#, priority:100
+msgid "Restore working tree files."
+msgstr ""
+
#. type: Plain text
-#: en/cmds-mainporcelain.txt:88 en/git-cherry-pick.txt:230
+#: en/cmds-mainporcelain.txt:91 en/git-cherry-pick.txt:240
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-revert[1]"
msgstr "linkgit:git-revert[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:90
+#: en/cmds-mainporcelain.txt:93
#, priority:100
msgid "Revert some existing commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:91
+#: en/cmds-mainporcelain.txt:94
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rm[1]"
msgstr "linkgit:git-rm[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:93
+#: en/cmds-mainporcelain.txt:96
#, priority:100
msgid "Remove files from the working tree and from the index."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:94
+#: en/cmds-mainporcelain.txt:97
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-shortlog[1]"
msgstr "linkgit:git-shortlog[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:96
+#: en/cmds-mainporcelain.txt:99
#, priority:100
msgid "Summarize 'git log' output."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:97
+#: en/cmds-mainporcelain.txt:100
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show[1]"
msgstr "linkgit:git-show[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:99
+#: en/cmds-mainporcelain.txt:102
#, priority:100
msgid "Show various types of objects."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:100
+#: en/cmds-mainporcelain.txt:103
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:102
+#: en/cmds-mainporcelain.txt:105
#, priority:100
msgid "Stash the changes in a dirty working directory away."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:103
+#: en/cmds-mainporcelain.txt:106
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:105
+#: en/cmds-mainporcelain.txt:108
#, priority:100
msgid "Show the working tree status."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:106
+#: en/cmds-mainporcelain.txt:109
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:108
+#: en/cmds-mainporcelain.txt:111
#, priority:100
msgid "Initialize, update or inspect submodules."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:109
+#: en/cmds-mainporcelain.txt:112
+#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-switch[1]"
+msgstr "linkgit:git-switch[1]"
+
+#. type: Plain text
+#: en/cmds-mainporcelain.txt:114
+#, fuzzy, priority:100
+#| msgid "--detect-branches"
+msgid "Switch branches."
+msgstr "--detect-branches"
+
+#. type: Labeled list
+#: en/cmds-mainporcelain.txt:115
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:111
+#: en/cmds-mainporcelain.txt:117
#, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:112
+#: en/cmds-mainporcelain.txt:118
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:114
+#: en/cmds-mainporcelain.txt:120
#, priority:100
msgid "Manage multiple working trees."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:115 en/git-gui.txt:104
+#: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:117
+#: en/cmds-mainporcelain.txt:123
#, priority:100
msgid "The Git repository browser."
msgstr ""
@@ -1343,7 +1394,7 @@ msgid "Show packed archive index."
msgstr ""
#. type: Plain text
-#: en/cmds-plumbinginterrogators.txt:49 en/git-for-each-ref.txt:386
+#: en/cmds-plumbinginterrogators.txt:49 en/git-for-each-ref.txt:391
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-ref[1]"
msgstr "linkgit:git-show-ref[1]"
@@ -1607,7 +1658,7 @@ msgid "Update the object name stored in a ref safely."
msgstr ""
#. type: Plain text
-#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:115
+#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:120
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -1735,7 +1786,7 @@ msgstr "linkgit:git-interpret-trailers[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:30
#, priority:100
-msgid "add or parse structured information in commit messages."
+msgid "Add or parse structured information in commit messages."
msgstr ""
#. type: Labeled list
@@ -2158,167 +2209,195 @@ msgstr ""
msgid "This is the same as `gitdir` except that matching is done case-insensitively (e.g. on case-insensitive file sytems)"
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:148
+#: 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:150
+#: en/config.txt:164
#, priority:100
msgid "Symlinks in `$GIT_DIR` are not resolved before matching."
msgstr ""
#. type: Plain text
-#: en/config.txt:155
+#: 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:160
+#: 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:163
+#: 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:165 en/git-rev-parse.txt:359 en/git-rev-parse.txt:415
+#: en/config.txt:179 en/git-rev-parse.txt:359 en/git-rev-parse.txt:415
#, no-wrap, priority:100
msgid "Example"
msgstr ""
-#. type: Plain text
-#: en/config.txt:171
+#. type: delimited block -
+#: en/config.txt:186
#, no-wrap, priority:100
msgid ""
-"\t# Core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"# Core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:176
+#. type: delimited block -
+#: en/config.txt:191
#, no-wrap, priority:100
msgid ""
-"\t# Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"# Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:180
+#. type: delimited block -
+#: en/config.txt:195
#, no-wrap, priority:100
msgid ""
-"\t[branch \"devel\"]\n"
-"\t\tremote = origin\n"
-"\t\tmerge = refs/heads/devel\n"
+"[branch \"devel\"]\n"
+"\tremote = origin\n"
+"\tmerge = refs/heads/devel\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:185
+#. type: delimited block -
+#: en/config.txt:200
#, no-wrap, priority:100
msgid ""
-"\t# Proxy settings\n"
-"\t[core]\n"
-"\t\tgitProxy=\"ssh\" for \"kernel.org\"\n"
-"\t\tgitProxy=default-proxy ; for the rest\n"
+"# Proxy settings\n"
+"[core]\n"
+"\tgitProxy=\"ssh\" for \"kernel.org\"\n"
+"\tgitProxy=default-proxy ; for the rest\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:190
+#. type: delimited block -
+#: en/config.txt:205
#, no-wrap, priority:100
msgid ""
-"\t[include]\n"
-"\t\tpath = /path/to/foo.inc ; include by absolute path\n"
-"\t\tpath = foo.inc ; find \"foo.inc\" relative to the current file\n"
-"\t\tpath = ~/foo.inc ; find \"foo.inc\" in your `$HOME` directory\n"
+"[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: Plain text
-#: en/config.txt:194
+#. type: delimited block -
+#: en/config.txt:209
#, no-wrap, priority:100
msgid ""
-"\t; include if $GIT_DIR is /path/to/foo/.git\n"
-"\t[includeIf \"gitdir:/path/to/foo/.git\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; 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: Plain text
-#: en/config.txt:198
+#. type: delimited block -
+#: en/config.txt:213
#, no-wrap, priority:100
msgid ""
-"\t; include for all repositories inside /path/to/group\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; include for all repositories inside /path/to/group\n"
+"[includeIf \"gitdir:/path/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
msgstr ""
-#. type: Plain text
-#: en/config.txt:202
+#. 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 ""
-"\t; include for all repositories inside $HOME/to/group\n"
-"\t[includeIf \"gitdir:~/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; 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:208
+#: en/config.txt:229
#, no-wrap, priority:100
msgid ""
-"\t; relative paths are always relative to the including\n"
-"\t; file (if the condition is true); their location is not\n"
-"\t; affected by the condition\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
+"\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:210
+#: en/config.txt:231
#, no-wrap, priority:100
msgid "Values"
msgstr ""
#. type: Plain text
-#: en/config.txt:215
+#: 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:216
+#: en/config.txt:237
#, no-wrap, priority:100
msgid "boolean"
msgstr ""
#. type: Plain text
-#: en/config.txt:221
+#: 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:222
+#: en/config.txt:243
#, no-wrap, priority:100
msgid "true"
msgstr ""
#. type: Plain text
-#: en/config.txt:223
+#: en/config.txt:244
#, priority:100
msgid "Boolean true literals are `yes`, `on`, `true`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:225
+#: en/config.txt:246
#, no-wrap, priority:100
msgid ""
"and `1`. Also, a variable defined without `= <value>`\n"
@@ -2326,113 +2405,317 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/config.txt:226
+#: en/config.txt:247
#, no-wrap, priority:100
msgid "false"
msgstr ""
#. type: Plain text
-#: en/config.txt:227
+#: en/config.txt:248
#, priority:100
msgid "Boolean false literals are `no`, `off`, `false`,"
msgstr ""
#. type: Plain text
-#: en/config.txt:228
+#: en/config.txt:249
#, no-wrap, priority:100
msgid "`0` and the empty string.\n"
msgstr ""
#. type: Plain text
-#: en/config.txt:232
+#: 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:233
+#: en/config.txt:254
#, no-wrap, priority:100
msgid "integer"
msgstr ""
#. type: Plain text
-#: en/config.txt:237
+#: 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:238 en/diff-options.txt:339 en/git-for-each-ref.txt:177
+#: 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:242
+#: 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:246
+#: en/config.txt:267
#, 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."
msgstr ""
#. type: Plain text
-#: en/config.txt:251
+#: en/config.txt:272
#, 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:258
+#: en/config.txt:279
#, 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:261
+#: en/config.txt:282
#, 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:270
+#: en/config.txt:291
#, 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:271
+#: en/config.txt:292
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:277
+#: en/config.txt:298
#, 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:280 en/git-imap-send.txt:58
+#: en/config.txt:301 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:285
+#: en/config.txt:306
#, 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:290
+#: en/config.txt:311
#, 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
@@ -2734,7 +3017,7 @@ msgid "<sha1> is shown as all 0's if a file is new on the filesystem and it is o
msgstr ""
#. type: Labeled list
-#: en/diff-format.txt:76 en/diff-format.txt:101 en/git-svn.txt:499 en/git-svn.txt:539
+#: en/diff-format.txt:76 en/git-svn.txt:499 en/git-svn.txt:539
#, no-wrap, priority:280
msgid "Example:"
msgstr ""
@@ -2746,7 +3029,7 @@ msgid ":100644 100644 5be4a4a 0000000 M file.c\n"
msgstr ""
#. type: Plain text
-#: en/diff-format.txt:85 en/git-ls-files.txt:210 en/git-ls-tree.txt:101
+#: en/diff-format.txt:85 en/git-ls-files.txt:212 en/git-ls-tree.txt:101
#, 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 ""
@@ -2790,53 +3073,83 @@ msgstr ""
#. type: Plain text
#: en/diff-format.txt:99
#, priority:280
-msgid "single path, only for \"dst\""
+msgid "tab-separated pathname(s) of the file"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/diff-format.txt:104
+#, 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 ""
+
+#. type: Plain text
+#: en/diff-format.txt:106
+#, priority:280
+msgid "Examples for `-c` and `--cc` without `--combined-all-paths`:"
+msgstr ""
+
+#. 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 ""
+
+#. type: Plain text
+#: en/diff-format.txt:113
+#, priority:280
+msgid "Examples when `--combined-all-paths` added to either `-c` or `--cc`:"
+msgstr ""
+
+#. type: delimited block -
+#: en/diff-format.txt:118
#, no-wrap, priority:280
-msgid "::100644 100644 100644 fabadb8 cc95eb0 4866510 MM\tdescribe.c\n"
+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 ""
#. type: Plain text
-#: en/diff-format.txt:108
+#: en/diff-format.txt:122
#, priority:280
msgid "Note that 'combined diff' lists only files which were modified from all parents."
msgstr ""
#. type: Title -
-#: en/diff-format.txt:114
+#: en/diff-format.txt:128
#, no-wrap, priority:280
msgid "other diff formats"
msgstr ""
#. type: Plain text
-#: en/diff-format.txt:120
+#: 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 ""
#. type: Plain text
-#: en/diff-format.txt:125
+#: 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 ""
#. type: delimited block -
-#: en/diff-format.txt:128
+#: en/diff-format.txt:142
#, no-wrap, priority:280
msgid "arch/{i386 => x86}/Makefile | 4 +--\n"
msgstr ""
#. type: Plain text
-#: en/diff-format.txt:133
+#: 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 ""
#. type: delimited block -
-#: en/diff-format.txt:137
+#: en/diff-format.txt:151
#, no-wrap, priority:280
msgid ""
"1\t2\tREADME\n"
@@ -2844,49 +3157,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-format.txt:140
+#: en/diff-format.txt:154
#, priority:280
msgid "That is, from left to right:"
msgstr ""
#. type: Plain text
-#: en/diff-format.txt:142 en/diff-format.txt:158
+#: 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:143 en/diff-format.txt:145 en/diff-format.txt:159 en/diff-format.txt:161
+#: 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:144 en/diff-format.txt:160
+#: 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:146
+#: en/diff-format.txt:160
#, priority:280
msgid "pathname (possibly with rename/copy information);"
msgstr ""
#. type: Plain text
-#: en/diff-format.txt:147
+#: en/diff-format.txt:161
#, priority:280
msgid "a newline."
msgstr ""
#. type: Plain text
-#: en/diff-format.txt:149
+#: en/diff-format.txt:163
#, priority:280
msgid "When `-z` output option is in effect, the output is formatted this way:"
msgstr ""
#. type: delimited block -
-#: en/diff-format.txt:153
+#: en/diff-format.txt:167
#, no-wrap, priority:280
msgid ""
"1\t2\tREADME NUL\n"
@@ -2894,37 +3207,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-format.txt:156
+#: en/diff-format.txt:170
#, priority:280
msgid "That is:"
msgstr ""
#. type: Plain text
-#: en/diff-format.txt:162 en/diff-format.txt:164
+#: en/diff-format.txt:176 en/diff-format.txt:178
#, priority:280
msgid "a NUL (only exists if renamed/copied);"
msgstr ""
#. type: Plain text
-#: en/diff-format.txt:163
+#: en/diff-format.txt:177
#, priority:280
msgid "pathname in preimage;"
msgstr ""
#. type: Plain text
-#: en/diff-format.txt:165
+#: en/diff-format.txt:179
#, priority:280
msgid "pathname in postimage (only exists if renamed/copied);"
msgstr ""
#. type: Plain text
-#: en/diff-format.txt:166
+#: en/diff-format.txt:180
#, priority:280
msgid "a NUL."
msgstr ""
#. type: Plain text
-#: en/diff-format.txt:171
+#: en/diff-format.txt:185
#, 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 ""
@@ -2932,53 +3245,53 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
#, no-wrap, priority:260
-msgid "Generating patches with -p"
+msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:10
+#: en/diff-generate-patch.txt:14
#, priority:260
-msgid "When \"git-diff-index\", \"git-diff-tree\", or \"git-diff-files\" are run with a `-p` option, \"git diff\" without the `--raw` option, or \"git log\" with the \"-p\" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
+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:13
+#: 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:15
+#: 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:17
+#: 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:21
+#: 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:25
+#: 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:27
+#: 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:39
+#: en/diff-generate-patch.txt:43
#, no-wrap, priority:260
msgid ""
"old mode <mode>\n"
@@ -2995,43 +3308,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:42
+#: 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:44
+#: 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:51
+#: 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:55
+#: en/diff-generate-patch.txt:59
#, priority:260
-msgid "The index line includes the SHA-1 checksum 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."
+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:59
+#: 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:64
+#: 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:71
+#: en/diff-generate-patch.txt:75
#, no-wrap, priority:260
msgid ""
"diff --git a/a b/b\n"
@@ -3043,25 +3356,25 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/diff-generate-patch.txt:74
+#: en/diff-generate-patch.txt:78
#, no-wrap, priority:260
-msgid "combined diff format"
+msgid "Combined diff format"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:82
+#: 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:84
+#: en/diff-generate-patch.txt:88
#, priority:260
-msgid "A 'combined diff' format looks like this:"
+msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:93
+#: en/diff-generate-patch.txt:97
#, no-wrap, priority:260
msgid ""
"diff --combined describe.c\n"
@@ -3074,7 +3387,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:103
+#: en/diff-generate-patch.txt:107
#, no-wrap, priority:260
msgid ""
"- static void describe(char *arg)\n"
@@ -3089,7 +3402,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:113
+#: en/diff-generate-patch.txt:117
#, no-wrap, priority:260
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
@@ -3104,37 +3417,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:117
+#: en/diff-generate-patch.txt:121
#, priority:260
-msgid "It is preceded with a \"git diff\" header, that looks like this (when `-c` option is used):"
+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:119
+#: en/diff-generate-patch.txt:123
#, no-wrap, priority:260
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:121
+#: en/diff-generate-patch.txt:125
#, priority:260
-msgid "or like this (when `--cc` option is used):"
+msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:123
+#: en/diff-generate-patch.txt:127
#, no-wrap, priority:260
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:126
+#: 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:131
+#: en/diff-generate-patch.txt:135
#, no-wrap, priority:260
msgid ""
"index <hash>,<hash>..<hash>\n"
@@ -3144,79 +3457,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:137
+#: 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:139
+#: 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:141
+#: 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:142
+#: 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:146
+#: 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:152
+#: en/diff-generate-patch.txt:154
#, 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 for apply. The change is similar to the change in the extended 'index' header:"
+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:154
+#: 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:157
+#: 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:166
+#: 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:172
+#: 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:178
+#: 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:184
+#: 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:322 en/merge-options.txt:74
+#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3228,13 +3553,13 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:182 en/git-add.txt:111 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:44
+#: en/diff-options.txt:23 en/fetch-options.txt:198 en/git-add.txt:111 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
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:89 en/git-checkout.txt:254 en/git-commit.txt:71
+#: en/diff-options.txt:24 en/git-add.txt:89 en/git-checkout.txt:269 en/git-commit.txt:71 en/git-restore.txt:47
#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"
@@ -3246,13 +3571,13 @@ msgid "Generate patch (see section on generating patches)."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:28 en/diff-options.txt:50
+#: en/diff-options.txt:28 en/diff-options.txt:60
#, no-wrap, priority:280
msgid "\tThis is the default.\n"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:30 en/git-am.txt:34 en/git-blame.txt:74 en/git-cat-file.txt:40 en/git-cherry-pick.txt:100 en/git-clone.txt:66 en/git-commit.txt:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:116 en/git-ls-files.txt:59 en/git-revert.txt:89 en/git-shortlog.txt:34 en/git-show-ref.txt:53 en/git-status.txt:27 en/git-stripspace.txt:38 en/git-svn.txt:46 en/git-tag.txt:64 en/git-verify-pack.txt:31
+#: en/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:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:118 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"
@@ -3284,7 +3609,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:40
#, priority:280
-msgid "Generate diffs with <n> lines of context instead of the usual three."
+msgid "Generate diffs with <n> lines of context instead of the usual three. Implies `--patch`."
msgstr ""
#. type: Plain text
@@ -3294,19 +3619,55 @@ msgid "\tImplies `-p`.\n"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:45 en/git-replace.txt:78 en/git-verify-commit.txt:19 en/git-verify-tag.txt:19
+#: en/diff-options.txt:44 en/git-archive.txt:55
+#, no-wrap, priority:280
+msgid "--output=<file>"
+msgstr ""
+
+#. 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 ""
+
+#. type: Labeled list
+#: en/diff-options.txt:48
+#, no-wrap, priority:280
+msgid "--output-indicator-old=<char>"
+msgstr ""
+
+#. type: Labeled list
+#: en/diff-options.txt:49
+#, no-wrap, priority:280
+msgid "--output-indicator-context=<char>"
+msgstr ""
+
+#. 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:48
+#: en/diff-options.txt:58
#, no-wrap, priority:280
msgid "\tGenerate the diff in raw format.\n"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:58
+#: en/diff-options.txt:68
#, no-wrap, priority:280
msgid ""
"\tFor each commit, show a summary of changes using the raw diff\n"
@@ -3317,337 +3678,367 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:62
+#: 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:64
+#: en/diff-options.txt:74
#, priority:280
msgid "Synonym for `-p --raw`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:66
+#: en/diff-options.txt:76
#, ignore-same, no-wrap, priority:280
msgid "--indent-heuristic"
msgstr "--indent-heuristic"
#. type: Plain text
-#: en/diff-options.txt:69
+#: 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:70
+#: 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:72
+#: en/diff-options.txt:82
#, priority:280
msgid "Disable the indent heuristic."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:73
+#: en/diff-options.txt:83
#, ignore-same, no-wrap, priority:280
msgid "--minimal"
msgstr "--minimal"
#. type: Plain text
-#: en/diff-options.txt:76 en/diff-options.txt:102
+#: 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:77
+#: en/diff-options.txt:87
#, ignore-same, no-wrap, priority:280
msgid "--patience"
msgstr "--patience"
#. type: Plain text
-#: en/diff-options.txt:79
+#: en/diff-options.txt:89
#, priority:280
msgid "Generate a diff using the \"patience diff\" algorithm."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:80
+#: en/diff-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--histogram"
msgstr "--histogram"
#. type: Plain text
-#: en/diff-options.txt:82
+#: en/diff-options.txt:92
#, priority:280
msgid "Generate a diff using the \"histogram diff\" algorithm."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:83
+#: en/diff-options.txt:93
#, no-wrap, priority:280
msgid "--anchored=<text>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:85
+#: en/diff-options.txt:95
#, priority:280
msgid "Generate a diff using the \"anchored diff\" algorithm."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:87
+#: en/diff-options.txt:97
#, priority:280
msgid "This option may be specified more than once."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:92
+#: 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:93
+#: en/diff-options.txt:103
#, no-wrap, priority:280
msgid "--diff-algorithm={patience|minimal|histogram|myers}"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:95
+#: 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:97
+#: en/diff-options.txt:107
#, ignore-same, no-wrap, priority:280
msgid "`default`, `myers`"
msgstr "`default`, `myers`"
#. type: Plain text
-#: en/diff-options.txt:99
+#: 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:99
+#: en/diff-options.txt:109
#, ignore-same, no-wrap, priority:280
msgid "`minimal`"
msgstr "`minimal`"
#. type: Labeled list
-#: en/diff-options.txt:102
+#: en/diff-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "`patience`"
msgstr "`patience`"
#. type: Plain text
-#: en/diff-options.txt:104
+#: en/diff-options.txt:114
#, priority:280
msgid "Use \"patience diff\" algorithm when generating patches."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:104
+#: en/diff-options.txt:114
#, ignore-same, no-wrap, priority:280
msgid "`histogram`"
msgstr "`histogram`"
#. type: Plain text
-#: en/diff-options.txt:107
+#: 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:112
+#: 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:113
+#: en/diff-options.txt:123
#, no-wrap, priority:280
msgid "--stat[=<width>[,<name-width>[,<count>]]]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:127
+#: 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:130
+#: 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:131
+#: en/diff-options.txt:141
#, ignore-same, no-wrap, priority:280
msgid "--compact-summary"
msgstr "--compact-summary"
#. type: Plain text
-#: en/diff-options.txt:138
+#: 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:139 en/git-apply.txt:45
+#: 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:145
+#: 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:146
+#: en/diff-options.txt:156
#, ignore-same, no-wrap, priority:280
msgid "--shortstat"
msgstr "--shortstat"
#. type: Plain text
-#: en/diff-options.txt:150
+#: 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:151
+#: 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:158
+#: 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:160
+#: en/diff-options.txt:171
#, ignore-same, no-wrap, priority:280
msgid "`changes`"
msgstr "`changes`"
#. type: Plain text
-#: en/diff-options.txt:166
+#: 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:166
+#: en/diff-options.txt:177
#, ignore-same, no-wrap, priority:280
msgid "`lines`"
msgstr "`lines`"
#. type: Plain text
-#: en/diff-options.txt:174
+#: 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:174
+#: en/diff-options.txt:185
#, ignore-same, no-wrap, priority:280
msgid "`files`"
msgstr "`files`"
#. type: Plain text
-#: en/diff-options.txt:179
+#: 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:179
+#: en/diff-options.txt:190
#, ignore-same, no-wrap, priority:280
msgid "`cumulative`"
msgstr "`cumulative`"
#. type: Plain text
-#: en/diff-options.txt:184
+#: 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:184 en/git-cherry.txt:39
+#: en/diff-options.txt:195 en/git-cherry.txt:39
#, no-wrap, priority:280
msgid "<limit>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:188
+#: en/diff-options.txt:199
#, priority:280
msgid "An integer parameter specifies a cut-off percent (3% by default). Directories contributing less than this percentage of the changes are not shown in the output."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:194
+#: en/diff-options.txt:205
#, priority:280
msgid "Example: The following will count changed files, while ignoring directories with less than 10% of the total amount of changed files, and accumulating child directory counts in the parent directories: `--dirstat=files,10,cumulative`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:195 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:115
+#: en/diff-options.txt:206
+#, ignore-same, no-wrap, priority:280
+msgid "--cumulative"
+msgstr "--cumulative"
+
+#. type: Plain text
+#: en/diff-options.txt:208
+#, priority:280
+msgid "Synonym for --dirstat=cumulative"
+msgstr ""
+
+#. type: Labeled list
+#: en/diff-options.txt:209
+#, ignore-ellipsis, no-wrap, priority:280
+msgid "--dirstat-by-file[=<param1,param2>...]"
+msgstr ""
+
+#. type: Plain text
+#: en/diff-options.txt:211
+#, ignore-ellipsis, priority:280
+msgid "Synonym for --dirstat=files,param1,param2..."
+msgstr ""
+
+#. type: Labeled list
+#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--summary"
msgstr "--summary"
#. type: Plain text
-#: en/diff-options.txt:198
+#: en/diff-options.txt:215
#, priority:280
msgid "Output a condensed summary of extended header information such as creations, renames and mode changes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:200
+#: en/diff-options.txt:217
#, ignore-same, no-wrap, priority:280
msgid "--patch-with-stat"
msgstr "--patch-with-stat"
#. type: Plain text
-#: en/diff-options.txt:202
+#: en/diff-options.txt:219
#, priority:280
msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:206 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:122 en/git-update-index.txt:168
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:168
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
#. type: Plain text
-#: en/diff-options.txt:209
+#: en/diff-options.txt:226
#, no-wrap, priority:280
msgid "\tSeparate the commits with NULs instead of with new newlines.\n"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:212
+#: en/diff-options.txt:229
#, priority:280
msgid "Also, when `--raw` or `--numstat` has been given, do not munge pathnames and use NULs as output field terminators."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:216
+#: en/diff-options.txt:233
#, no-wrap, priority:280
msgid ""
"\tWhen `--raw`, `--numstat`, `--name-only` or `--name-status` has been\n"
@@ -3655,61 +4046,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:221 en/git-apply.txt:122
+#: en/diff-options.txt:238 en/git-apply.txt:122
#, priority:280
msgid "Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:222 en/git-config.txt:215 en/git-grep.txt:188 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:188 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr "--name-only"
#. type: Plain text
-#: en/diff-options.txt:224
+#: en/diff-options.txt:241
#, priority:280
msgid "Show only names of changed files."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:225 en/git-ls-tree.txt:60
+#: en/diff-options.txt:242 en/git-ls-tree.txt:60
#, ignore-same, no-wrap, priority:280
msgid "--name-status"
msgstr "--name-status"
#. type: Plain text
-#: en/diff-options.txt:228
+#: en/diff-options.txt:245
#, priority:280
msgid "Show only names and status of changed files. See the description of the `--diff-filter` option on what the status letters mean."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:229
+#: en/diff-options.txt:246
#, no-wrap, priority:280
msgid "--submodule[=<format>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:240
+#: en/diff-options.txt:257
#, priority:280
msgid "Specify how differences in submodules are shown. When specifying `--submodule=short` the 'short' format is used. This format just shows the names of the commits at the beginning and end of the range. When `--submodule` or `--submodule=log` is specified, the 'log' format is used. This format lists the commits in the range like linkgit:git-submodule[1] `summary` does. When `--submodule=diff` is specified, the 'diff' format is used. This format shows an inline diff of the changes in the submodule contents between the commit range. Defaults to `diff.submodule` or the 'short' format if the config option is unset."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:241 en/git-branch.txt:127 en/git-for-each-ref.txt:60 en/git-grep.txt:221 en/git-show-branch.txt:119 en/git-tag.txt:118
+#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:221 en/git-show-branch.txt:119 en/git-tag.txt:125
#, no-wrap, priority:280
msgid "--color[=<when>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:245
+#: en/diff-options.txt:262
#, priority:280
msgid "Show colored diff. `--color` (i.e. without '=<when>') is the same as `--color=always`. '<when>' can be one of `always`, `never`, or `auto`."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:248
+#: en/diff-options.txt:265
#, no-wrap, priority:280
msgid ""
"\tIt can be changed by the `color.ui` and `color.diff`\n"
@@ -3717,49 +4108,49 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:250 en/git-branch.txt:132 en/git-grep.txt:225 en/git-show-branch.txt:124
+#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:225 en/git-show-branch.txt:124
#, ignore-same, no-wrap, priority:280
msgid "--no-color"
msgstr "--no-color"
#. type: Plain text
-#: en/diff-options.txt:252
+#: en/diff-options.txt:269
#, priority:280
msgid "Turn off colored diff."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:254
+#: en/diff-options.txt:271
#, no-wrap, priority:280
msgid "\tThis can be used to override configuration settings.\n"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:256
+#: en/diff-options.txt:273
#, no-wrap, priority:280
msgid "\tIt is the same as `--color=never`.\n"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:257
+#: en/diff-options.txt:274
#, no-wrap, priority:280
msgid "--color-moved[=<mode>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:259
+#: en/diff-options.txt:276
#, priority:280
msgid "Moved lines of code are colored differently."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:261
+#: en/diff-options.txt:278
#, no-wrap, priority:280
msgid "\tIt can be changed by the `diff.colorMoved` configuration setting.\n"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:265
+#: en/diff-options.txt:282
#, no-wrap, priority:280
msgid ""
"\tThe <mode> defaults to 'no' if the option is not given\n"
@@ -3768,397 +4159,409 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:267 en/diff-options.txt:309
+#: en/diff-options.txt:284 en/diff-options.txt:326
#, ignore-same, no-wrap, priority:280
msgid "no"
msgstr "no"
#. type: Plain text
-#: en/diff-options.txt:269
+#: en/diff-options.txt:286
#, priority:280
msgid "Moved lines are not highlighted."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:269 en/git-commit.txt:211
+#: en/diff-options.txt:286 en/git-commit.txt:211
#, ignore-same, no-wrap, priority:280
msgid "default"
msgstr "default"
#. type: Plain text
-#: en/diff-options.txt:272
+#: en/diff-options.txt:289
#, priority:280
msgid "Is a synonym for `zebra`. This may change to a more sensible mode in the future."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:272 en/diff-options.txt:341
+#: en/diff-options.txt:289 en/diff-options.txt:358
#, ignore-same, no-wrap, priority:280
msgid "plain"
msgstr "plain"
#. type: Plain text
-#: en/diff-options.txt:279
+#: en/diff-options.txt:296
#, priority:280
msgid "Any line that is added in one location and was removed in another location will be colored with 'color.diff.newMoved'. Similarly 'color.diff.oldMoved' will be used for removed lines that are added somewhere else in the diff. This mode picks up any moved line, but it is not very useful in a review to determine if a block of code was moved without permutation."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:279
+#: en/diff-options.txt:296
#, ignore-same, no-wrap, priority:280
msgid "blocks"
msgstr "blocks"
#. type: Plain text
-#: en/diff-options.txt:284
+#: en/diff-options.txt:301
#, priority:280
msgid "Blocks of moved text of at least 20 alphanumeric characters are detected greedily. The detected blocks are painted using either the 'color.diff.{old,new}Moved' color. Adjacent blocks cannot be told apart."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:284
+#: en/diff-options.txt:301
#, ignore-same, no-wrap, priority:280
msgid "zebra"
msgstr "zebra"
#. type: Plain text
-#: en/diff-options.txt:289
+#: en/diff-options.txt:306
#, priority:280
msgid "Blocks of moved text are detected as in 'blocks' mode. The blocks are painted using either the 'color.diff.{old,new}Moved' color or 'color.diff.{old,new}MovedAlternative'. The change between the two colors indicates that a new block was detected."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:289
+#: en/diff-options.txt:306
#, ignore-same, no-wrap, priority:280
msgid "dimmed-zebra"
msgstr "dimmed-zebra"
#. type: Plain text
-#: en/diff-options.txt:294
+#: en/diff-options.txt:311
#, priority:280
msgid "Similar to 'zebra', but additional dimming of uninteresting parts of moved code is performed. The bordering lines of two adjacent blocks are considered interesting, the rest is uninteresting. `dimmed_zebra` is a deprecated synonym."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:296
+#: en/diff-options.txt:313
#, ignore-same, no-wrap, priority:280
msgid "--no-color-moved"
msgstr "--no-color-moved"
#. type: Plain text
-#: en/diff-options.txt:299
+#: en/diff-options.txt:316
#, priority:280
msgid "Turn off move detection. This can be used to override configuration settings. It is the same as `--color-moved=no`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:300
+#: en/diff-options.txt:317
#, no-wrap, priority:280
msgid "--color-moved-ws=<modes>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:303
+#: en/diff-options.txt:320
#, priority:280
msgid "This configures how whitespace is ignored when performing the move detection for `--color-moved`."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:305
+#: en/diff-options.txt:322
#, no-wrap, priority:280
msgid "\tIt can be set by the `diff.colorMovedWS` configuration setting.\n"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:307
+#: en/diff-options.txt:324
#, no-wrap, priority:280
msgid "\tThese modes can be given as a comma separated list:\n"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:311
+#: en/diff-options.txt:328
#, priority:280
msgid "Do not ignore whitespace when performing move detection."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:311 en/merge-strategies.txt:61
+#: en/diff-options.txt:328 en/merge-strategies.txt:61
#, ignore-same, no-wrap, priority:280
msgid "ignore-space-at-eol"
msgstr "ignore-space-at-eol"
#. type: Plain text
-#: en/diff-options.txt:313 en/diff-options.txt:645
+#: en/diff-options.txt:330 en/diff-options.txt:665
#, priority:280
msgid "Ignore changes in whitespace at EOL."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:313 en/merge-strategies.txt:59
+#: en/diff-options.txt:330 en/merge-strategies.txt:59
#, ignore-same, no-wrap, priority:280
msgid "ignore-space-change"
msgstr "ignore-space-change"
#. type: Plain text
-#: en/diff-options.txt:317 en/diff-options.txt:651
+#: en/diff-options.txt:334 en/diff-options.txt:671
#, priority:280
msgid "Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:317 en/merge-strategies.txt:60
+#: en/diff-options.txt:334 en/merge-strategies.txt:60
#, ignore-same, no-wrap, priority:280
msgid "ignore-all-space"
msgstr "ignore-all-space"
#. type: Plain text
-#: en/diff-options.txt:320
+#: en/diff-options.txt:337
#, priority:280
msgid "Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:320
+#: en/diff-options.txt:337
#, ignore-same, no-wrap, priority:280
msgid "allow-indentation-change"
msgstr "allow-indentation-change"
#. type: Plain text
-#: en/diff-options.txt:325
+#: en/diff-options.txt:342
#, priority:280
msgid "Initially ignore any whitespace in the move detection, then group the moved code blocks only into a block if the change in whitespace is the same per line. This is incompatible with the other modes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:327
+#: en/diff-options.txt:344
#, ignore-same, no-wrap, priority:280
msgid "--no-color-moved-ws"
msgstr "--no-color-moved-ws"
#. type: Plain text
-#: en/diff-options.txt:331
+#: en/diff-options.txt:348
#, priority:280
msgid "Do not ignore whitespace when performing move detection. This can be used to override configuration settings. It is the same as `--color-moved-ws=no`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:332
+#: en/diff-options.txt:349
#, no-wrap, priority:280
msgid "--word-diff[=<mode>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:337
+#: en/diff-options.txt:354
#, priority:280
msgid "Show a word diff, using the <mode> to delimit changed words. By default, words are delimited by whitespace; see `--word-diff-regex` below. The <mode> defaults to 'plain', and must be one of:"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:341
+#: en/diff-options.txt:358
#, priority:280
msgid "Highlight changed words using only colors. Implies `--color`."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:345
+#: en/diff-options.txt:362
#, priority:280
msgid "Show words as `[-removed-]` and `{+added+}`. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:345
+#: en/diff-options.txt:362
#, ignore-same, no-wrap, priority:280
msgid "porcelain"
msgstr "porcelain"
#. type: Plain text
-#: en/diff-options.txt:352
+#: en/diff-options.txt:369
#, priority:280
msgid "Use a special line-based format intended for script consumption. Added/removed/unchanged runs are printed in the usual unified diff format, starting with a `+`/`-`/` ` character at the beginning of the line and extending to the end of the line. Newlines in the input are represented by a tilde `~` on a line of its own."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:352 en/git-daemon.txt:131 en/git-submodule.txt:162
+#: en/diff-options.txt:369 en/git-daemon.txt:131 en/git-submodule.txt:167
#, ignore-same, no-wrap, priority:280
msgid "none"
msgstr "none"
#. type: Plain text
-#: en/diff-options.txt:354
+#: en/diff-options.txt:371
#, priority:280
msgid "Disable word diff again."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:358
+#: en/diff-options.txt:375
#, priority:280
msgid "Note that despite the name of the first mode, color is used to highlight the changed parts in all modes if enabled."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:359
+#: en/diff-options.txt:376
#, no-wrap, priority:280
msgid "--word-diff-regex=<regex>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:363
+#: en/diff-options.txt:380
#, priority:280
msgid "Use <regex> to decide what a word is, instead of considering runs of non-whitespace to be a word. Also implies `--word-diff` unless it was already enabled."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:371
+#: en/diff-options.txt:388
#, priority:280
msgid "Every non-overlapping match of the <regex> is considered a word. Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences. You may want to append `|[^[:space:]]` to your regular expression to make sure that it matches all non-whitespace characters. A match that contains a newline is silently truncated(!) at the newline."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:374
+#: en/diff-options.txt:391
#, priority:280
msgid "For example, `--word-diff-regex=.` will treat each character as a word and, correspondingly, show differences character by character."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:379
+#: en/diff-options.txt:396
#, priority:280
msgid "The regex can also be set via a diff driver or configuration option, see linkgit:gitattributes[5] or linkgit:git-config[1]. Giving it explicitly overrides any diff driver or configuration setting. Diff drivers override configuration settings."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:380
+#: en/diff-options.txt:397
#, no-wrap, priority:280
msgid "--color-words[=<regex>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:383
+#: en/diff-options.txt:400
#, priority:280
msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word-diff-regex=<regex>`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:385 en/git-status.txt:139
+#: en/diff-options.txt:402 en/git-status.txt:143
#, ignore-same, no-wrap, priority:280
msgid "--no-renames"
msgstr "--no-renames"
#. type: Plain text
-#: en/diff-options.txt:388
+#: en/diff-options.txt:405
#, priority:280
msgid "Turn off rename detection, even when the configuration file gives the default to do so."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:390 en/git-apply.txt:58
+#: en/diff-options.txt:406
+#, ignore-same, no-wrap, priority:280
+msgid "--[no-]rename-empty"
+msgstr "--[no-]rename-empty"
+
+#. type: Plain text
+#: en/diff-options.txt:408
+#, priority:280
+msgid "Whether to use empty blobs as rename source."
+msgstr ""
+
+#. type: Labeled list
+#: en/diff-options.txt:410 en/git-apply.txt:58
#, ignore-same, no-wrap, priority:280
msgid "--check"
msgstr "--check"
#. type: Plain text
-#: en/diff-options.txt:399
+#: en/diff-options.txt:419
#, priority:280
msgid "Warn if changes introduce conflict markers or whitespace errors. What are considered whitespace errors is controlled by `core.whitespace` configuration. By default, trailing whitespaces (including lines that consist solely of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors. Exits with non-zero status if problems are found. Not compatible with --exit-code."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:400
+#: en/diff-options.txt:420
#, no-wrap, priority:280
msgid "--ws-error-highlight=<kind>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:409
+#: en/diff-options.txt:429
#, priority:280
msgid "Highlight whitespace errors in the `context`, `old` or `new` lines of the diff. Multiple values are separated by comma, `none` resets previous values, `default` reset the list to `new` and `all` is a shorthand for `old,new,context`. When this option is not given, and the configuration variable `diff.wsErrorHighlight` is not set, only whitespace errors in `new` lines are highlighted. The whitespace errors are colored with `color.diff.whitespace`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:412
+#: en/diff-options.txt:432
#, ignore-same, no-wrap, priority:280
msgid "--full-index"
msgstr "--full-index"
#. type: Plain text
-#: en/diff-options.txt:416
+#: en/diff-options.txt:436
#, priority:280
msgid "Instead of the first handful of characters, show the full pre- and post-image blob object names on the \"index\" line when generating patch format output."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:417 en/git-apply.txt:160
+#: en/diff-options.txt:437 en/git-apply.txt:160
#, ignore-same, no-wrap, priority:280
msgid "--binary"
msgstr "--binary"
#. type: Plain text
-#: en/diff-options.txt:420
+#: en/diff-options.txt:440
#, priority:280
-msgid "In addition to `--full-index`, output a binary diff that can be applied with `git-apply`."
+msgid "In addition to `--full-index`, output a binary diff that can be applied with `git-apply`. Implies `--patch`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:421 en/git-ls-files.txt:152 en/git-ls-tree.txt:63 en/git-show-ref.txt:65
+#: en/diff-options.txt:441 en/git-ls-files.txt:154 en/git-ls-tree.txt:63 en/git-show-ref.txt:65
#, no-wrap, priority:280
msgid "--abbrev[=<n>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:428
+#: en/diff-options.txt:448
#, priority:280
msgid "Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header lines, show only a partial prefix. This is independent of the `--full-index` option above, which controls the diff-patch output format. Non default number of digits can be specified with `--abbrev=<n>`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:429
+#: en/diff-options.txt:449
#, no-wrap, priority:280
msgid "-B[<n>][/<m>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:430
+#: en/diff-options.txt:450
#, no-wrap, priority:280
msgid "--break-rewrites[=[<n>][/<m>]]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:433
+#: en/diff-options.txt:453
#, priority:280
msgid "Break complete rewrite changes into pairs of delete and create. This serves two purposes:"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:443
+#: en/diff-options.txt:463
#, priority:280
-msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
+msgid "It affects the way a change that amounts to a total rewrite of a file does not appear as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:451
+#: en/diff-options.txt:471
#, priority:280
msgid "When used with -M, a totally-rewritten file is also considered as the source of a rename (usually -M only considers a file that disappeared as the source of a rename), and the number `n` controls this aspect of the -B option (defaults to 50%). `-B20%` specifies that a change with addition and deletion compared to 20% or more of the file's size are eligible for being picked up as a possible source of a rename to another file."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:452
+#: en/diff-options.txt:472
#, no-wrap, priority:280
msgid "-M[<n>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:453 en/git-status.txt:143
+#: en/diff-options.txt:473 en/git-status.txt:147
#, no-wrap, priority:280
msgid "--find-renames[=<n>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:456
+#: en/diff-options.txt:476
#, no-wrap, priority:280
msgid "\tDetect renames.\n"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:461
+#: en/diff-options.txt:481
#, no-wrap, priority:280
msgid ""
"\tIf generating diffs, detect and report renames for each commit.\n"
@@ -4167,7 +4570,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:471
+#: en/diff-options.txt:491
#, no-wrap, priority:280
msgid ""
"\tIf `n` is specified, it is a threshold on the similarity\n"
@@ -4182,139 +4585,139 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:472
+#: en/diff-options.txt:492
#, no-wrap, priority:280
msgid "-C[<n>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:473
+#: en/diff-options.txt:493
#, no-wrap, priority:280
msgid "--find-copies[=<n>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:476
+#: en/diff-options.txt:496
#, priority:280
msgid "Detect copies as well as renames. See also `--find-copies-harder`. If `n` is specified, it has the same meaning as for `-M<n>`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:477 en/git-svn.txt:626
+#: en/diff-options.txt:497 en/git-svn.txt:626
#, ignore-same, no-wrap, priority:280
msgid "--find-copies-harder"
msgstr "--find-copies-harder"
#. type: Plain text
-#: en/diff-options.txt:485
+#: en/diff-options.txt:505
#, priority:280
msgid "For performance reasons, by default, `-C` option finds copies only if the original file of the copy was modified in the same changeset. This flag makes the command inspect unmodified files as candidates for the source of copy. This is a very expensive operation for large projects, so use it with caution. Giving more than one `-C` option has the same effect."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:486 en/git-branch.txt:91 en/git-http-push.txt:45
+#: en/diff-options.txt:506 en/git-branch.txt:103 en/git-http-push.txt:45
#, no-wrap, priority:280
msgid "-D"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:487
+#: en/diff-options.txt:507
#, ignore-same, no-wrap, priority:280
msgid "--irreversible-delete"
msgstr "--irreversible-delete"
#. type: Plain text
-#: en/diff-options.txt:495
+#: en/diff-options.txt:515
#, priority:280
msgid "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."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:498
+#: en/diff-options.txt:518
#, priority:280
msgid "When used together with `-B`, omit also the preimage in the deletion part of a delete/create pair."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:499 en/git-svn.txt:625
+#: en/diff-options.txt:519 en/git-svn.txt:625
#, no-wrap, priority:280
msgid "-l<num>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:505
+#: en/diff-options.txt:525
#, priority:280
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:507
+#: en/diff-options.txt:527
#, ignore-ellipsis, no-wrap, priority:280
msgid "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:518
+#: en/diff-options.txt:538
#, ignore-ellipsis, priority:280
msgid "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."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:521
+#: en/diff-options.txt:541
#, priority:280
msgid "Also, these upper-case letters can be downcased to exclude. E.g. `--diff-filter=ad` excludes added and deleted paths."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:527
+#: en/diff-options.txt:547
#, priority:280
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:528
+#: en/diff-options.txt:548
#, no-wrap, priority:280
msgid "-S<string>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:532
+#: en/diff-options.txt:552
#, priority:280
msgid "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."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:538
+#: en/diff-options.txt:558
#, priority:280
msgid "It is useful when you're looking for an exact block of code (like a struct), and want to know the history of that block since it first came into being: use the feature iteratively to feed the interesting block in the preimage back into `-S`, and keep going until you get the very first version of the block."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:540
+#: en/diff-options.txt:560
#, priority:280
msgid "Binary files are searched as well."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:541
+#: en/diff-options.txt:561
#, no-wrap, priority:280
msgid "-G<regex>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:544
+#: en/diff-options.txt:564
#, priority:280
msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:548
+#: en/diff-options.txt:568
#, priority:280
msgid "To illustrate the difference between `-S<regex> --pickaxe-regex` and `-G<regex>`, consider a commit with the following diff in the same file:"
msgstr ""
#. type: delimited block -
-#: en/diff-options.txt:553
+#: en/diff-options.txt:573
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
@@ -4323,385 +4726,385 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:558
+#: en/diff-options.txt:578
#, priority:280
msgid "While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:561
+#: en/diff-options.txt:581
#, priority:280
msgid "Unless `--text` is supplied patches of binary files without a textconv filter will be ignored."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:564
+#: en/diff-options.txt:584
#, priority:280
msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:565
+#: en/diff-options.txt:585
#, no-wrap, priority:280
msgid "--find-object=<object-id>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:570
+#: en/diff-options.txt:590
#, priority:280
msgid "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."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:573
+#: en/diff-options.txt:593
#, priority:280
msgid "The object can be a blob or a submodule commit. It implies the `-t` option in `git-log` to also find trees."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:574
+#: en/diff-options.txt:594
#, ignore-same, no-wrap, priority:280
msgid "--pickaxe-all"
msgstr "--pickaxe-all"
#. type: Plain text
-#: en/diff-options.txt:578
+#: en/diff-options.txt:598
#, priority:280
msgid "When `-S` or `-G` finds a change, show all the changes in that changeset, not just the files that contain the change in <string>."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:579
+#: en/diff-options.txt:599
#, ignore-same, no-wrap, priority:280
msgid "--pickaxe-regex"
msgstr "--pickaxe-regex"
#. type: Plain text
-#: en/diff-options.txt:582
+#: en/diff-options.txt:602
#, priority:280
msgid "Treat the <string> given to `-S` as an extended POSIX regular expression to match."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:585 en/git-mergetool.txt:93
+#: en/diff-options.txt:605 en/git-mergetool.txt:95
#, no-wrap, priority:280
msgid "-O<orderfile>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:590
+#: en/diff-options.txt:610
#, priority:280
msgid "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`."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:602
+#: en/diff-options.txt:622
#, priority:280
msgid "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."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:604
+#: en/diff-options.txt:624
#, priority:280
msgid "<orderfile> is parsed as follows:"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:608
+#: en/diff-options.txt:628
#, priority:280
msgid "Blank lines are ignored, so they can be used as separators for readability."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:612
+#: en/diff-options.txt:632
#, priority:280
msgid "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."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:614
+#: en/diff-options.txt:634
#, priority:280
msgid "Each other line contains a single pattern."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:621
+#: en/diff-options.txt:641
#, priority:280
msgid "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`\"."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:623 en/git-apply.txt:104 en/git-cvsimport.txt:168
+#: en/diff-options.txt:643 en/git-apply.txt:104 en/git-cvsimport.txt:168
#, no-wrap, priority:280
msgid "-R"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:626
+#: en/diff-options.txt:646
#, priority:280
msgid "Swap two inputs; that is, show differences from index or on-disk file to tree contents."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:627
+#: en/diff-options.txt:647
#, no-wrap, priority:280
msgid "--relative[=<path>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:634
+#: en/diff-options.txt:654
#, priority:280
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:636 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:153 en/git-checkout-index.txt:38 en/git-commit.txt:64 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-tag.txt:60
+#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:64 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-tag.txt:60
#, ignore-same, no-wrap, priority:280
msgid "-a"
msgstr "-a"
#. type: Labeled list
-#: en/diff-options.txt:637 en/git-grep.txt:102
+#: en/diff-options.txt:657 en/git-grep.txt:102
#, ignore-same, no-wrap, priority:280
msgid "--text"
msgstr "--text"
#. type: Plain text
-#: en/diff-options.txt:639
+#: en/diff-options.txt:659
#, priority:280
msgid "Treat all files as text."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:640
+#: en/diff-options.txt:660
#, ignore-same, no-wrap, priority:280
msgid "--ignore-cr-at-eol"
msgstr "--ignore-cr-at-eol"
#. type: Plain text
-#: en/diff-options.txt:642
+#: en/diff-options.txt:662
#, priority:280
msgid "Ignore carriage-return at the end of line when doing a comparison."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:643
+#: en/diff-options.txt:663
#, ignore-same, no-wrap, priority:280
msgid "--ignore-space-at-eol"
msgstr "--ignore-space-at-eol"
#. type: Labeled list
-#: en/diff-options.txt:647 en/git-am.txt:102 en/git-apply.txt:182
+#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
#, ignore-same, no-wrap, priority:280
msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
-#: en/diff-options.txt:652 en/git-blame.txt:83 en/git-cvsexportcommit.txt:71 en/git-grep.txt:134 en/git-hash-object.txt:31 en/git-help.txt:79
+#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:134 en/git-hash-object.txt:29 en/git-help.txt:79
#, ignore-same, no-wrap, priority:280
msgid "-w"
msgstr "-w"
#. type: Labeled list
-#: en/diff-options.txt:653
+#: en/diff-options.txt:673
#, ignore-same, no-wrap, priority:280
msgid "--ignore-all-space"
msgstr "--ignore-all-space"
#. type: Plain text
-#: en/diff-options.txt:657
+#: en/diff-options.txt:677
#, priority:280
msgid "Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:658
+#: en/diff-options.txt:678
#, ignore-same, no-wrap, priority:280
msgid "--ignore-blank-lines"
msgstr "--ignore-blank-lines"
#. type: Plain text
-#: en/diff-options.txt:660
+#: en/diff-options.txt:680
#, priority:280
msgid "Ignore changes whose lines are all blank."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:661
+#: en/diff-options.txt:681
#, no-wrap, priority:280
msgid "--inter-hunk-context=<lines>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:666
+#: en/diff-options.txt:686
#, priority:280
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:667 en/git-cvsexportcommit.txt:77 en/git-grep.txt:261
+#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:261 en/git-restore.txt:56
#, no-wrap, priority:280
msgid "-W"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:668 en/git-grep.txt:262
+#: en/diff-options.txt:688 en/git-grep.txt:262
#, ignore-same, no-wrap, priority:280
msgid "--function-context"
msgstr "--function-context"
#. type: Plain text
-#: en/diff-options.txt:670
+#: en/diff-options.txt:690
#, priority:280
msgid "Show whole surrounding functions of changes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:673 en/git-ls-remote.txt:46
+#: en/diff-options.txt:693 en/git-ls-remote.txt:46
#, ignore-same, no-wrap, priority:280
msgid "--exit-code"
msgstr "--exit-code"
#. type: Plain text
-#: en/diff-options.txt:677
+#: en/diff-options.txt:697
#, priority:280
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:678 en/fetch-options.txt:199 en/git-am.txt:74 en/git-branch.txt:173 en/git-checkout-index.txt:31 en/git-checkout.txt:118 en/git-clean.txt:52 en/git-clone.txt:118 en/git-commit.txt:314 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:296 en/git-gc.txt:87 en/git-grep.txt:296 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-rebase.txt:310 en/git-reset.txt:97 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:401 en/git-show-ref.txt:71 en/git-submodule.txt:244 en/git-svn.txt:671 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:122 en/rev-list-options.txt:212
+#: en/diff-options.txt:698 en/fetch-options.txt:215 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:316 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:302 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:256 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
#. type: Plain text
-#: en/diff-options.txt:680
+#: en/diff-options.txt:700
#, priority:280
msgid "Disable all output of the program. Implies `--exit-code`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:683
+#: en/diff-options.txt:703
#, ignore-same, no-wrap, priority:280
msgid "--ext-diff"
msgstr "--ext-diff"
#. type: Plain text
-#: en/diff-options.txt:687
+#: en/diff-options.txt:707
#, priority:280
msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:688
+#: en/diff-options.txt:708
#, ignore-same, no-wrap, priority:280
msgid "--no-ext-diff"
msgstr "--no-ext-diff"
#. type: Plain text
-#: en/diff-options.txt:690
+#: en/diff-options.txt:710
#, priority:280
msgid "Disallow external diff drivers."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:691 en/git-cat-file.txt:60 en/git-grep.txt:105
+#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:105
#, ignore-same, no-wrap, priority:280
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
-#: en/diff-options.txt:692 en/git-grep.txt:108
+#: en/diff-options.txt:712 en/git-grep.txt:108
#, ignore-same, no-wrap, priority:280
msgid "--no-textconv"
msgstr "--no-textconv"
#. type: Plain text
-#: en/diff-options.txt:701
+#: en/diff-options.txt:721
#, priority:280
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:702 en/git-status.txt:85
+#: en/diff-options.txt:722 en/git-status.txt:87
#, no-wrap, priority:280
msgid "--ignore-submodules[=<when>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:714
+#: en/diff-options.txt:734
#, priority:280
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:715
+#: en/diff-options.txt:735
#, no-wrap, priority:280
msgid "--src-prefix=<prefix>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:717
+#: en/diff-options.txt:737
#, priority:280
msgid "Show the given source prefix instead of \"a/\"."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:718
+#: en/diff-options.txt:738
#, no-wrap, priority:280
msgid "--dst-prefix=<prefix>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:720
+#: en/diff-options.txt:740
#, priority:280
msgid "Show the given destination prefix instead of \"b/\"."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:721
+#: en/diff-options.txt:741
#, ignore-same, no-wrap, priority:280
msgid "--no-prefix"
msgstr "--no-prefix"
#. type: Plain text
-#: en/diff-options.txt:723
+#: en/diff-options.txt:743
#, priority:280
msgid "Do not show any source or destination prefix."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:724
+#: en/diff-options.txt:744
#, no-wrap, priority:280
msgid "--line-prefix=<prefix>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:726
+#: en/diff-options.txt:746
#, priority:280
msgid "Prepend an additional prefix to every line of output."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:727
+#: en/diff-options.txt:747
#, ignore-same, no-wrap, priority:280
msgid "--ita-invisible-in-index"
msgstr "--ita-invisible-in-index"
#. type: Plain text
-#: en/diff-options.txt:734
+#: en/diff-options.txt:754
#, priority:280
msgid "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."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:736
+#: en/diff-options.txt:756
#, priority:280
msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:154 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:254 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:266 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -4749,7 +5152,7 @@ msgid "Similar to --depth, except it specifies the number of commits from the cu
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:22 en/git-clone.txt:206 en/git-fetch-pack.txt:90
+#: en/fetch-options.txt:22 en/git-clone.txt:215 en/git-fetch-pack.txt:90
#, no-wrap, priority:300
msgid "--shallow-since=<date>"
msgstr ""
@@ -4761,7 +5164,7 @@ msgid "Deepen or shorten the history of a shallow repository to include all reac
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:26 en/git-clone.txt:209 en/git-fetch-pack.txt:94
+#: en/fetch-options.txt:26 en/git-clone.txt:218 en/git-fetch-pack.txt:94
#, no-wrap, priority:300
msgid "--shallow-exclude=<revision>"
msgstr ""
@@ -4833,7 +5236,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:48 en/git-commit.txt:317 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:58 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:392 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:50 en/git-commit.txt:319 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -4845,13 +5248,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:64 en/git-branch.txt:104 en/git-checkout-index.txt:34 en/git-checkout.txt:127 en/git-clean.txt:34 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:195 en/git-ls-files.txt:137 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:342 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:266 en/git-tag.txt:72 en/git-update-server-info.txt:26 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:279 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:105 en/git-checkout-index.txt:35 en/git-checkout.txt:128 en/git-clean.txt:35 en/git-fast-import.txt:37 en/git-filter-branch.txt:196 en/git-gc.txt:90 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:421 en/git-send-pack.txt:54 en/git-submodule.txt:267 en/git-tag.txt:73 en/git-update-server-info.txt:27 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:280 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -4883,13 +5286,13 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:111 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:113 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
#. type: Labeled list
-#: en/fetch-options.txt:83 en/git-am.txt:41 en/git-fetch-pack.txt:54 en/git-index-pack.txt:54 en/git-reset.txt:82
+#: en/fetch-options.txt:83 en/git-am.txt:41 en/git-fetch-pack.txt:54 en/git-index-pack.txt:54 en/git-reset.txt:83
#, ignore-same, no-wrap, priority:280
msgid "--keep"
msgstr "--keep"
@@ -4913,265 +5316,325 @@ msgid "Allow several <repository> and <group> arguments to be specified. No <ref
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:92 en/git-push.txt:153
+#: en/fetch-options.txt:91
+#, ignore-same, no-wrap, priority:220
+msgid "--[no-]auto-gc"
+msgstr "--[no-]auto-gc"
+
+#. type: Plain text
+#: en/fetch-options.txt:94
+#, priority:220
+msgid "Run `git gc --auto` at the end to perform garbage collection if needed. This is enabled by default."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:96 en/git-push.txt:153
#, ignore-same, no-wrap, priority:220
msgid "--prune"
msgstr "--prune"
#. type: Plain text
-#: en/fetch-options.txt:102
+#: en/fetch-options.txt:106
#, priority:220
msgid "Before fetching, remove any remote-tracking references that no longer exist on the remote. Tags are not subject to pruning if they are fetched only because of the default tag auto-following or due to a --tags option. However, if tags are fetched due to an explicit refspec (either on the command line or in the remote configuration, for example if the remote was cloned with the --mirror option), then they are also subject to pruning. Supplying `--prune-tags` is a shorthand for providing the tag refspec."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:104 en/fetch-options.txt:115
+#: en/fetch-options.txt:108 en/fetch-options.txt:119
#, priority:220
msgid "See the PRUNING section below for more details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:105 en/git-cvsexportcommit.txt:57 en/git-grep.txt:165 en/git.txt:106 en/rev-list-options.txt:92
+#: en/fetch-options.txt:109 en/git-cvsexportcommit.txt:57 en/git-grep.txt:165 en/git.txt:108 en/rev-list-options.txt:92
#, no-wrap, priority:260
msgid "-P"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:106
+#: en/fetch-options.txt:110
#, ignore-same, no-wrap, priority:220
msgid "--prune-tags"
msgstr "--prune-tags"
#. type: Plain text
-#: en/fetch-options.txt:113
+#: en/fetch-options.txt:117
#, priority:220
msgid "Before fetching, remove any local tags that no longer exist on the remote if `--prune` is enabled. This option should be used more carefully, unlike `--prune` it will remove any local references (local tags) that have been created. This option is a shorthand for providing the explicit tag refspec along with `--prune`, see the discussion about that in its documentation."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:119 en/git-add.txt:68 en/git-blame.txt:70 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:87 en/git-clean.txt:47 en/git-clone.txt:135 en/git-commit.txt:174 en/git-format-patch.txt:96 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:57 en/git-rebase.txt:321 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:69 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:289 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:73
+#: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:98 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:302 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
#. type: Labeled list
-#: en/fetch-options.txt:121 en/git-clone.txt:224
+#: en/fetch-options.txt:125 en/git-clone.txt:233
#, ignore-same, no-wrap, priority:300
msgid "--no-tags"
msgstr "--no-tags"
#. type: Plain text
-#: en/fetch-options.txt:127
+#: en/fetch-options.txt:131
#, priority:220
msgid "By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following. The default behavior for a remote may be specified with the remote.<name>.tagOpt setting. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:129
+#: en/fetch-options.txt:133
#, no-wrap, priority:220
msgid "--refmap=<refspec>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:136
+#: en/fetch-options.txt:140
#, priority:220
msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. See section on \"Configured Remote-tracking Branches\" for details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:138 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
+#: en/fetch-options.txt:142 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
#, ignore-same, no-wrap, priority:260
msgid "--tags"
msgstr "--tags"
#. type: Plain text
-#: en/fetch-options.txt:145
+#: en/fetch-options.txt:149
#, priority:220
msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:146
+#: en/fetch-options.txt:150
#, no-wrap, priority:220
msgid "--recurse-submodules[=yes|on-demand|no]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:156
+#: en/fetch-options.txt:160
#, priority:220
msgid "This option controls if and under what conditions new commits of populated submodules should be fetched too. It can be used as a boolean option to completely disable recursion when set to 'no' or to unconditionally recurse into all populated submodules when set to 'yes', which is the default when this option is used without any value. Use 'on-demand' to only recurse into a populated submodule when the superproject retrieves a commit that updates the submodule's reference to a commit that isn't already in the local submodule clone."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:157
+#: en/fetch-options.txt:161
#, ignore-same, no-wrap, priority:220
msgid "-j"
msgstr "-j"
#. type: Labeled list
-#: en/fetch-options.txt:158
+#: en/fetch-options.txt:162
#, no-wrap, priority:220
msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:163
+#: en/fetch-options.txt:164
+#, priority:220
+msgid "Number of parallel children to be used for all forms of fetching."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:169
#, priority:220
-msgid "Number of parallel children to be used for fetching submodules. Each will fetch from different submodules, such that fetching many submodules will be faster. By default submodules will be fetched one at a time."
+msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
+msgstr ""
+
+#. type: Plain text
+#: en/fetch-options.txt:172
+#, priority:220
+msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:164 en/git-push.txt:377
-#, ignore-same, no-wrap, priority:220
+#: en/fetch-options.txt:173 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
+#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:167
+#: en/fetch-options.txt:176
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:168
+#: en/fetch-options.txt:177 en/git-branch.txt:225 en/git-push.txt:349
+#, ignore-same, no-wrap, priority:240
+msgid "--set-upstream"
+msgstr "--set-upstream"
+
+#. type: Plain text
+#: en/fetch-options.txt:183
+#, priority:220
+msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:184
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:172
+#: en/fetch-options.txt:188
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:173
+#: en/fetch-options.txt:189
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:180
+#: en/fetch-options.txt:196
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:183
+#: en/fetch-options.txt:199
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:190
+#: en/fetch-options.txt:206
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:191 en/git-clone.txt:172
+#: en/fetch-options.txt:207 en/git-clone.txt:182
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:196
+#: en/fetch-options.txt:212
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:198 en/git-am.txt:73 en/git-branch.txt:172 en/git-checkout-index.txt:30 en/git-checkout.txt:117 en/git-clean.txt:51 en/git-clone.txt:119 en/git-commit.txt:313 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:295 en/git-grep.txt:295 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-rebase.txt:309 en/git-repack.txt:78 en/git-reset.txt:96 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:243 en/git-svn.txt:670 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:121
+#: en/fetch-options.txt:214 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:315 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:301 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:255 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:203
+#: en/fetch-options.txt:219
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:204 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:163 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:298 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:132 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:62 en/git-rebase.txt:313 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:80 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:125
+#: en/fetch-options.txt:220 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:300 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:205 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:165 en/git-clone.txt:123 en/git-commit.txt:299 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:77 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:314 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:126
+#: en/fetch-options.txt:221 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:301 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:207 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:128
+#: en/fetch-options.txt:223 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:209 en/git-clone.txt:128 en/git-format-patch.txt:321 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-submodule.txt:247 en/merge-options.txt:129
+#: en/fetch-options.txt:225 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:328 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:259 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:214 en/git-clone.txt:133 en/git-pack-objects.txt:156 en/git-push.txt:376
-#, priority:300
+#: en/fetch-options.txt:230 en/git-pack-objects.txt:156 en/git-push.txt:376
+#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:215 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:231 en/git-ls-remote.txt:73 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:216 en/git-ls-remote.txt:74
-#, no-wrap, priority:220
+#: en/fetch-options.txt:232 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:222 en/git-ls-remote.txt:80
+#: en/fetch-options.txt:239 en/git-clone.txt:142
+#, priority:300
+msgid "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."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:240
+#, ignore-same, no-wrap, priority:220
+msgid "--show-forced-updates"
+msgstr "--show-forced-updates"
+
+#. type: Plain text
+#: en/fetch-options.txt:245
#, priority:220
-msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
+msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:223 en/git-push.txt:398
+#: en/fetch-options.txt:246
+#, ignore-same, no-wrap, priority:220
+msgid "--no-show-forced-updates"
+msgstr "--no-show-forced-updates"
+
+#. type: Plain text
+#: en/fetch-options.txt:252
+#, priority:220
+msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/fetch-options.txt:253 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:224 en/git-push.txt:399
+#: en/fetch-options.txt:254 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:226 en/git-push.txt:401
+#: en/fetch-options.txt:256 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:227 en/git-push.txt:402
+#: en/fetch-options.txt:257 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:228 en/git-push.txt:403
+#: en/fetch-options.txt:258 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:229 en/git-push.txt:405
+#: en/fetch-options.txt:259 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5183,7 +5646,7 @@ msgid "git-add(1)"
msgstr "git-add(1)"
#. type: Title -
-#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote-testgit.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5
+#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5
#, no-wrap, priority:300
msgid "NAME"
msgstr ""
@@ -5195,7 +5658,7 @@ msgid "git-add - Add file contents to the index"
msgstr ""
#. type: Title -
-#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote-testgit.txt:10 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10
+#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10
#, no-wrap, priority:300
msgid "SYNOPSIS"
msgstr "�쇔폀"
@@ -5211,7 +5674,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:17 en/git-branch.txt:26 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:18 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:21 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:20 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:33 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote-testgit.txt:15 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-revert.txt:17 en/git-rev-list.txt:66 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:24 en/git-svn.txt:14 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
+#: en/git-add.txt:17 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:19 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:34 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:16 en/git-restore.txt:15 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:26 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:31 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr "沃ゆ삇"
@@ -5253,13 +5716,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr ""
#. type: Title -
-#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:49 en/git-branch.txt:84 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:116 en/git-check-ref-format.txt:99 en/git-cherry-pick.txt:44 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:42 en/git-column.txt:22 en/git-commit-tree.txt:42 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:83 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:84 en/git-fsck.txt:22 en/git-gc.txt:36 en/git-grep.txt:74 en/git-hash-object.txt:26 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:64 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:94 en/git-revert.txt:34 en/git-rev-list.txt:114 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:242 en/git-svn.txt:575 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:40 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-update-server-info.txt:24 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:34 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:107 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:63 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:86 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:95 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:254 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr "�면쟿"
#. type: Labeled list
-#: en/git-add.txt:52 en/git-grep.txt:308 en/git-status.txt:148
+#: en/git-add.txt:52 en/git-grep.txt:325 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
@@ -5271,7 +5734,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:67 en/git-grep.txt:314
+#: en/git-add.txt:67 en/git-grep.txt:331
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -5289,13 +5752,13 @@ msgid "Allow adding otherwise ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:81 en/git-am.txt:122 en/git-branch.txt:137 en/git-clean.txt:42 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:48 en/git-rebase.txt:389 en/git-repack.txt:163 en/git-tag.txt:123 en/rev-list-options.txt:73
+#: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:123 en/git-clean.txt:43 en/git-rebase.txt:390 en/git-rebase.txt:530 en/git-svn.txt:297
+#: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5319,13 +5782,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:99 en/git-blame.txt:77 en/git-cat-file.txt:44 en/git-cherry-pick.txt:55 en/git-commit.txt:219 en/git-config.txt:245 en/git-grep.txt:275 en/git-revert.txt:43 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:170 en/merge-options.txt:11
+#: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
#. type: Labeled list
-#: en/git-add.txt:100 en/git-cherry-pick.txt:56 en/git-commit.txt:220 en/git-config.txt:246 en/git-revert.txt:44 en/git-svn.txt:615 en/git-tag.txt:171 en/merge-options.txt:10
+#: en/git-add.txt:100 en/git-cherry-pick.txt:54 en/git-commit.txt:220 en/git-config.txt:248 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
#, ignore-same, no-wrap, priority:300
msgid "--edit"
msgstr "--edit"
@@ -5409,7 +5872,7 @@ msgid "This option is primarily to help users who are used to older versions of
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:146 en/git-format-patch.txt:100 en/git-submodule.txt:328
+#: en/git-add.txt:146 en/git-format-patch.txt:102 en/git-submodule.txt:341
#, no-wrap, priority:300
msgid "-N"
msgstr ""
@@ -5451,7 +5914,7 @@ msgid "If some files could not be added because of errors indexing them, do not
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:165 en/git-notes.txt:169 en/git-update-index.txt:72 en/rev-list-options.txt:193
+#: en/git-add.txt:165 en/git-notes.txt:169 en/git-update-index.txt:72 en/rev-list-options.txt:201
#, ignore-same, no-wrap, priority:300
msgid "--ignore-missing"
msgstr "--ignore-missing"
@@ -5499,7 +5962,7 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:343 en/git-grep.txt:304 en/git-ls-files.txt:180 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
+#: en/git-add.txt:190 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-commit.txt:345 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-rm.txt:53 en/git-update-index.txt:221 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr ""
@@ -5511,79 +5974,67 @@ msgid "This option can be used to separate command-line options from the list of
msgstr ""
#. type: Title -
-#: en/git-add.txt:197 en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:282 en/git-config.txt:261 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:325 en/git-gc.txt:100 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:344 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:436 en/git-status.txt:394 en/git-svn.txt:1083 en/git-tag.txt:208 en/git-update-index.txt:519
-#, no-wrap, priority:300
-msgid "CONFIGURATION"
-msgstr ""
-
-#. type: Plain text
-#: en/git-add.txt:203
-#, priority:300
-msgid "The optional configuration variable `core.excludesFile` indicates a path to a file containing patterns of file names to exclude from git-add, similar to $GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to those in info/exclude. See linkgit:gitignore[5]."
-msgstr ""
-
-#. type: Title -
-#: en/git-add.txt:206 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:288 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:459 en/git-check-ref-format.txt:122 en/git-cherry-pick.txt:156 en/git-cherry.txt:43 en/git-clone.txt:283 en/git-column.txt:50 en/git-commit.txt:357 en/git-config.txt:336 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:146 en/git-fetch.txt:242 en/git-filter-branch.txt:234 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:268 en/git-format-patch.txt:629 en/git-grep.txt:316 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:310 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:210 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:105 en/git-revert.txt:109 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:475 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:206 en/git-stripspace.txt:49 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:197 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:96 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:492 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:298 en/git-column.txt:50 en/git-commit.txt:359 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:638 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:106 en/git-restore.txt:117 en/git-revert.txt:122 en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr "影꾡풃"
#. type: Plain text
-#: en/git-add.txt:210
+#: en/git-add.txt:201
#, priority:300
msgid "Adds content from all `*.txt` files under `Documentation` directory and its subdirectories:"
msgstr ""
#. type: delimited block -
-#: en/git-add.txt:213
+#: en/git-add.txt:204
#, no-wrap, priority:300
msgid "$ git add Documentation/\\*.txt\n"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:218
+#: en/git-add.txt:209
#, priority:300
msgid "Note that the asterisk `*` is quoted from the shell in this example; this lets the command include the files from subdirectories of `Documentation/` directory."
msgstr ""
#. type: Plain text
-#: en/git-add.txt:220
+#: en/git-add.txt:211
#, priority:300
msgid "Considers adding content from all git-*.sh scripts:"
msgstr ""
#. type: delimited block -
-#: en/git-add.txt:223
+#: en/git-add.txt:214
#, no-wrap, priority:300
msgid "$ git add git-*.sh\n"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:228
+#: en/git-add.txt:219
#, priority:300
msgid "Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not consider `subdir/git-foo.sh`."
msgstr ""
#. type: Title -
-#: en/git-add.txt:230 en/git-rebase.txt:588
+#: en/git-add.txt:221 en/git-rebase.txt:613
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr "雅믣땿與▼폀"
#. type: Plain text
-#: en/git-add.txt:234
+#: en/git-add.txt:225
#, priority:300
msgid "When the command enters the interactive mode, it shows the output of the 'status' subcommand, and then goes into its interactive command loop."
msgstr ""
#. type: Plain text
-#: en/git-add.txt:239 en/git-clean.txt:84
+#: en/git-add.txt:230 en/git-clean.txt:85
#, priority:300
msgid "The command loop shows the list of subcommands available, and gives a prompt \"What now> \". In general, when the prompt ends with a single '>', you can pick only one of the choices given and type return, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-add.txt:245
+#: en/git-add.txt:236
#, no-wrap, priority:300
msgid ""
" *** Commands ***\n"
@@ -5593,31 +6044,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-add.txt:249
+#: en/git-add.txt:240
#, priority:300
msgid "You also could say `s` or `sta` or `status` above as long as the choice is unique."
msgstr ""
#. type: Plain text
-#: en/git-add.txt:251
+#: en/git-add.txt:242
#, priority:300
msgid "The main command loop has 6 subcommands (plus help and quit)."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:252
+#: en/git-add.txt:243
#, no-wrap, priority:300
msgid "status"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:259
+#: en/git-add.txt:250
#, priority:300
msgid "This shows the change between HEAD and index (i.e. what will be committed if you say `git commit`), and between index and working tree files (i.e. what you could stage further before `git commit` using `git add`) for each path. A sample output looks like this:"
msgstr ""
#. type: delimited block -
-#: en/git-add.txt:264
+#: en/git-add.txt:255
#, no-wrap, priority:300
msgid ""
" staged unstaged path\n"
@@ -5626,31 +6077,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-add.txt:275
+#: en/git-add.txt:266
#, priority:300
msgid "It shows that foo.png has differences from HEAD (but that is binary so line count cannot be shown) and there is no difference between indexed copy and the working tree version (if the working tree version were also different, 'binary' would have been shown in place of 'nothing'). The other file, git-add{litdd}interactive.perl, has 403 lines added and 35 lines deleted if you commit what is in the index, but working tree file has further modifications (one addition and one deletion)."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:276 en/git-update-ref.txt:94
+#: en/git-add.txt:267 en/git-update-ref.txt:94
#, ignore-same, no-wrap, priority:300
msgid "update"
msgstr "update"
#. type: Plain text
-#: en/git-add.txt:285
+#: en/git-add.txt:276
#, priority:300
msgid "This shows the status information and issues an \"Update>>\" prompt. When the prompt ends with double '>>', you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining patches are taken. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything."
msgstr ""
#. type: Plain text
-#: en/git-add.txt:288
+#: en/git-add.txt:279
#, priority:300
msgid "What you chose are then highlighted with '*', like this:"
msgstr ""
#. type: delimited block -
-#: en/git-add.txt:293
+#: en/git-add.txt:284
#, no-wrap, priority:300
msgid ""
" staged unstaged path\n"
@@ -5659,61 +6110,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-add.txt:297
+#: en/git-add.txt:288
#, priority:300
msgid "To remove selection, prefix the input with `-` like this:"
msgstr ""
#. type: delimited block -
-#: en/git-add.txt:300
+#: en/git-add.txt:291
#, no-wrap, priority:300
msgid "Update>> -2\n"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:304
+#: en/git-add.txt:295
#, priority:300
msgid "After making the selection, answer with an empty line to stage the contents of working tree files for selected paths in the index."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:305
+#: en/git-add.txt:296
#, no-wrap, priority:300
msgid "revert"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:310
+#: en/git-add.txt:301
#, priority:300
msgid "This has a very similar UI to 'update', and the staged information for selected paths are reverted to that of the HEAD version. Reverting new paths makes them untracked."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:311
+#: en/git-add.txt:302
#, no-wrap, priority:300
msgid "add untracked"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:315
+#: en/git-add.txt:306
#, priority:300
msgid "This has a very similar UI to 'update' and 'revert', and lets you add untracked paths to the index."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:316
+#: en/git-add.txt:307
#, no-wrap, priority:300
msgid "patch"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:323
+#: en/git-add.txt:314
#, priority:300
msgid "This lets you choose one path out of a 'status' like selection. After choosing the path, it presents the diff between the index and the working tree file and asks you if you want to stage the change of each hunk. You can select one of the following options and type return:"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:338
+#: en/git-add.txt:329
#, no-wrap, priority:300
msgid ""
"y - stage this hunk\n"
@@ -5733,169 +6184,169 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-add.txt:341
+#: en/git-add.txt:332
#, priority:300
msgid "After deciding the fate for all hunks, if there is any hunk that was chosen, the index is updated with the selected hunks."
msgstr ""
#. type: Plain text
-#: en/git-add.txt:344
+#: en/git-add.txt:335
#, priority:300
msgid "You can omit having to type return here, by setting the configuration variable `interactive.singleKey` to `true`."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:345
+#: en/git-add.txt:336
#, ignore-same, no-wrap, priority:300
msgid "diff"
msgstr "diff"
#. type: Plain text
-#: en/git-add.txt:349
+#: en/git-add.txt:340
#, priority:300
msgid "This lets you review what will be committed (i.e. between HEAD and index)."
msgstr ""
#. type: Title -
-#: en/git-add.txt:352
+#: en/git-add.txt:343
#, no-wrap, priority:300
msgid "EDITING PATCHES"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:362
+#: en/git-add.txt:353
#, priority:300
msgid "Invoking `git add -e` or selecting `e` from the interactive hunk selector will open a patch in your editor; after the editor exits, the result is applied to the index. You are free to make arbitrary changes to the patch, but note that some changes may have confusing results, or even result in a patch that cannot be applied. If you want to abort the operation entirely (i.e., stage nothing new in the index), simply delete all lines of the patch. The list below describes some common things you may see in a patch, and which editing operations make sense on them."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:364
+#: en/git-add.txt:355
#, no-wrap, priority:300
msgid "added content"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:368
+#: en/git-add.txt:359
#, priority:300
msgid "Added content is represented by lines beginning with \"{plus}\". You can prevent staging any addition lines by deleting them."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:369
+#: en/git-add.txt:360
#, no-wrap, priority:300
msgid "removed content"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:373
+#: en/git-add.txt:364
#, priority:300
msgid "Removed content is represented by lines beginning with \"-\". You can prevent staging their removal by converting the \"-\" to a \" \" (space)."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:374
+#: en/git-add.txt:365
#, no-wrap, priority:300
msgid "modified content"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:381
+#: en/git-add.txt:372
#, priority:300
msgid "Modified content is represented by \"-\" lines (removing the old content) followed by \"{plus}\" lines (adding the replacement content). You can prevent staging the modification by converting \"-\" lines to \" \", and removing \"{plus}\" lines. Beware that modifying only half of the pair is likely to introduce confusing changes to the index."
msgstr ""
#. type: Plain text
-#: en/git-add.txt:389
+#: en/git-add.txt:380
#, priority:300
msgid "There are also more complex operations that can be performed. But beware that because the patch is applied only to the index and not the working tree, the working tree will appear to \"undo\" the change in the index. For example, introducing a new line into the index that is in neither the HEAD nor the working tree will stage the new line for commit, but the line will appear to be reverted in the working tree."
msgstr ""
#. type: Plain text
-#: en/git-add.txt:391
+#: en/git-add.txt:382
#, priority:300
msgid "Avoid using these constructs, or do so with extreme caution."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:393
+#: en/git-add.txt:384
#, no-wrap, priority:300
msgid "removing untouched content"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:399
+#: en/git-add.txt:390
#, priority:300
msgid "Content which does not differ between the index and working tree may be shown on context lines, beginning with a \" \" (space). You can stage context lines for removal by converting the space to a \"-\". The resulting working tree file will appear to re-add the content."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:400
+#: en/git-add.txt:391
#, no-wrap, priority:300
msgid "modifying existing content"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:407
+#: en/git-add.txt:398
#, priority:300
msgid "One can also modify context lines by staging them for removal (by converting \" \" to \"-\") and adding a \"{plus}\" line with the new content. Similarly, one can modify \"{plus}\" lines for existing additions or modifications. In all cases, the new modification will appear reverted in the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:408
+#: en/git-add.txt:399
#, no-wrap, priority:300
msgid "new content"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:413
+#: en/git-add.txt:404
#, priority:300
msgid "You may also add new content that does not exist in the patch; simply add new lines, each starting with \"{plus}\". The addition will appear reverted in the working tree."
msgstr ""
#. type: Plain text
-#: en/git-add.txt:417
+#: en/git-add.txt:408
#, priority:300
msgid "There are also several operations which should be avoided entirely, as they will make the patch impossible to apply:"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:419
+#: en/git-add.txt:410
#, priority:300
msgid "adding context (\" \") or removal (\"-\") lines"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:420
+#: en/git-add.txt:411
#, priority:300
msgid "deleting context or removal lines"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:421
+#: en/git-add.txt:412
#, priority:300
msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:423 en/git-am.txt:235 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:230 en/git-branch.txt:342 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-cherry-pick.txt:228 en/git-cherry.txt:140 en/git-clean.txt:136 en/git-commit-tree.txt:113 en/git-commit.txt:487 en/git-difftool.txt:135 en/git-diff.txt:193 en/git-fast-export.txt:234 en/git-fast-import.txt:1487 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:384 en/git-format-patch.txt:674 en/git-gc.txt:204 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:243 en/git-ls-remote.txt:112 en/git-merge.txt:353 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:257 en/git-read-tree.txt:432 en/git-receive-pack.txt:247 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote-testgit.txt:25 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-revert.txt:124 en/git-rm.txt:184 en/git-send-email.txt:507 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:292 en/git-status.txt:430 en/git-submodule.txt:424 en/git-svn.txt:1169 en/git-tag.txt:374 en/git.txt:869 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
+#: en/git-add.txt:414 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:578 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:489 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1526 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:683 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:179 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:437 en/git-svn.txt:1169 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:938 en/git-update-index.txt:547 en/git-upload-pack.txt:48 en/git-var.txt:63
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:430
+#: en/git-add.txt:421
#, ignore-same, priority:300
msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:432 en/git-am.txt:239 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:234 en/git-branch.txt:350 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:545 en/git-check-ref-format.txt:138 en/git-cherry-pick.txt:232 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:140 en/git-clone.txt:321 en/git-column.txt:78 en/git-commit-tree.txt:117 en/git-commit.txt:495 en/git-config.txt:490 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:146 en/git-diff-tree.txt:117 en/git-diff.txt:202 en/git-fast-export.txt:238 en/git-fast-import.txt:1491 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:480 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:388 en/git-format-patch.txt:678 en/git-fsck-objects.txt:21 en/git-fsck.txt:161 en/git-gc.txt:211 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:334 en/git-gui.txt:126 en/git-hash-object.txt:64 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:247 en/git-ls-remote.txt:116 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:230 en/git-merge-file.txt:94 en/git-merge-index.txt:78 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:46 en/git-mergetool.txt:111 en/git-merge-tree.txt:28 en/git-merge.txt:362 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:261 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:437 en/git-rebase.txt:1048 en/git-receive-pack.txt:251 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote-testgit.txt:29 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:473 en/git-revert.txt:128 en/git-rev-list.txt:122 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:511 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:299 en/git-status.txt:434 en/git-stripspace.txt:93 en/git-submodule.txt:428 en/git-svn.txt:1173 en/git-symbolic-ref.txt:68 en/git-tag.txt:379 en/git.txt:877 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:43 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
+#: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:497 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1530 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:693 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:687 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:441 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
#, no-wrap, priority:300
msgid "GIT"
msgstr "GIT"
#. type: Plain text
-#: en/git-add.txt:433 en/git-am.txt:240 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:235 en/git-branch.txt:351 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:546 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:233 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:141 en/git-clone.txt:322 en/git-column.txt:79 en/git-commit-tree.txt:118 en/git-commit.txt:496 en/git-config.txt:491 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:147 en/git-diff-tree.txt:118 en/git-diff.txt:203 en/git-fast-export.txt:239 en/git-fast-import.txt:1492 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:481 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:389 en/git-format-patch.txt:679 en/git-fsck-objects.txt:22 en/git-fsck.txt:162 en/git-gc.txt:212 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:335 en/git-gui.txt:127 en/git-hash-object.txt:65 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:248 en/git-ls-remote.txt:117 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:231 en/git-merge-file.txt:95 en/git-merge-index.txt:79 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:47 en/git-mergetool.txt:112 en/git-merge-tree.txt:29 en/git-merge.txt:363 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:262 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:438 en/git-rebase.txt:1049 en/git-receive-pack.txt:252 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote-testgit.txt:30 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:474 en/git-revert.txt:129 en/git-rev-list.txt:123 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:512 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:300 en/git-status.txt:435 en/git-stripspace.txt:94 en/git-submodule.txt:429 en/git-svn.txt:1174 en/git-symbolic-ref.txt:69 en/git-tag.txt:380 en/git.txt:878 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:44 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
+#: en/git-add.txt:424 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:205 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:584 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:337 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:498 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1531 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:694 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:688 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:235 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:475 en/git-restore.txt:185 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:442 en/git-svn.txt:1174 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:947 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:554 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -5945,7 +6396,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:101 en/git-commit.txt:166 en/git-format-patch.txt:117 en/git-rebase.txt:382 en/git-revert.txt:90 en/merge-options.txt:61
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:119 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -5987,7 +6438,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:52 en/git-branch.txt:120 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:950
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:985
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6017,7 +6468,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:113 en/git-checkout.txt:227 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:267 en/git-svn.txt:308 en/git-svn.txt:675 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:963
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1005
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6108,302 +6559,320 @@ msgstr "--no-3way"
msgid "When the patch does not apply cleanly, fall back on 3-way merge if the patch records the identity of blobs it is supposed to apply to and we have those blobs available locally. `--no-3way` can be used to override am.threeWay configuration variable. For more information, see am.threeWay in linkgit:git-config[1]."
msgstr ""
+#. type: Labeled list
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
+#, ignore-same, no-wrap, priority:240
+msgid "--rerere-autoupdate"
+msgstr "--rerere-autoupdate"
+
+#. type: Labeled list
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
+#, ignore-same, no-wrap, priority:240
+msgid "--no-rerere-autoupdate"
+msgstr "--no-rerere-autoupdate"
+
+#. type: Plain text
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
+#, priority:240
+msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
+msgstr ""
+
#. type: Plain text
-#: en/git-am.txt:103 en/git-apply.txt:183 en/git-rebase.txt:368 en/git-rebase.txt:518
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:104 en/git-rebase.txt:369
+#: en/git-am.txt:109 en/git-rebase.txt:396
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:105 en/git-apply.txt:129 en/git-rebase.txt:332
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:106 en/git-apply.txt:123
+#: en/git-am.txt:111 en/git-apply.txt:123
#, no-wrap, priority:100
msgid "-p<n>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:107
+#: en/git-am.txt:112
#, no-wrap, priority:100
msgid "--directory=<dir>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:108
+#: en/git-am.txt:113
#, no-wrap, priority:100
msgid "--exclude=<path>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:109
+#: en/git-am.txt:114
#, no-wrap, priority:100
msgid "--include=<path>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:108
+#: en/git-am.txt:115 en/git-apply.txt:108
#, ignore-same, no-wrap, priority:100
msgid "--reject"
msgstr "--reject"
#. type: Plain text
-#: en/git-am.txt:114
+#: en/git-am.txt:119
#, priority:100
msgid "These flags are passed to the 'git apply' (see linkgit:git-apply[1]) program that applies the patch."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:115
+#: en/git-am.txt:120
#, ignore-same, no-wrap, priority:100
msgid "--patch-format"
msgstr "--patch-format"
#. type: Plain text
-#: en/git-am.txt:121
+#: en/git-am.txt:126
#, priority:100
msgid "By default the command will try to detect the patch format automatically. This option allows the user to bypass the automatic detection and specify the patch format that the patch(es) should be interpreted as. Valid formats are mbox, mboxrd, stgit, stgit-series and hg."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:125
+#: en/git-am.txt:130
#, priority:100
msgid "Run interactively."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:126 en/git-rebase.txt:375 en/git-rebase.txt:515
+#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
#. type: Plain text
-#: en/git-am.txt:132
+#: en/git-am.txt:137
#, priority:100
msgid "By default the command records the date from the e-mail message as the commit author date, and uses the time of commit creation as the committer date. This allows the user to lie about the committer date by using the same value as the author date."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:133 en/git-rebase.txt:376 en/git-rebase.txt:516
+#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
#. type: Plain text
-#: en/git-am.txt:139
+#: en/git-am.txt:144
#, priority:100
msgid "By default the command records the date from the e-mail message as the commit author date, and uses the time of commit creation as the committer date. This allows the user to lie about the author date by using the same value as the committer date."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:140 en/git-rebase.txt:256
+#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
#. type: Plain text
-#: en/git-am.txt:143
+#: en/git-am.txt:148
#, priority:100
msgid "Skip the current patch. This is only meaningful when restarting an aborted patch."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:144 en/git-cherry-pick.txt:105 en/git-commit-tree.txt:57 en/git-commit.txt:333 en/git-rebase.txt:303 en/git-revert.txt:83 en/merge-options.txt:46
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:335 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-cherry-pick.txt:106 en/git-commit-tree.txt:58 en/git-commit.txt:334 en/git-rebase.txt:304 en/git-revert.txt:84 en/merge-options.txt:47
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:336 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:338 en/git-rebase.txt:308 en/git-revert.txt:88
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:340 en/git-rebase.txt:331 en/git-revert.txt:96
#, priority:280
msgid "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."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-merge.txt:102 en/git-rebase.txt:228 en/sequencer.txt:1
+#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:246 en/sequencer.txt:1
#, ignore-same, no-wrap, priority:240
msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:151 en/git-branch.txt:149 en/git-cherry-pick.txt:74 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:401 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:971
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1013
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
#. type: Labeled list
-#: en/git-am.txt:152
+#: en/git-am.txt:157
#, ignore-same, no-wrap, priority:100
msgid "--resolved"
msgstr "--resolved"
#. type: Plain text
-#: en/git-am.txt:159
+#: en/git-am.txt:164
#, priority:100
msgid "After a patch failure (e.g. attempting to apply conflicting patch), the user has applied it by hand and the index file stores the result of the application. Make a commit using the authorship and commit log extracted from the e-mail message and the current index file, and continue."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:160
+#: en/git-am.txt:165
#, no-wrap, priority:100
msgid "--resolvemsg=<msg>"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:166
+#: en/git-am.txt:171
#, priority:100
msgid "When a patch failure occurs, <msg> will be printed to the screen before exiting. This overrides the standard message informing you to use `--continue` or `--skip` to handle the failure. This is solely for internal use between 'git rebase' and 'git am'."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:167 en/git-merge.txt:90 en/git-notes.txt:201 en/git-rebase.txt:231 en/sequencer.txt:11
+#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:249 en/sequencer.txt:15
#, ignore-same, no-wrap, priority:240
msgid "--abort"
msgstr "--abort"
#. type: Plain text
-#: en/git-am.txt:169
+#: en/git-am.txt:174
#, priority:100
msgid "Restore the original branch and abort the patching operation."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:170 en/git-rebase.txt:238 en/sequencer.txt:6
-#, ignore-same, no-wrap, priority:100
+#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:256 en/sequencer.txt:10
+#, ignore-same, no-wrap, priority:240
msgid "--quit"
msgstr "--quit"
#. type: Plain text
-#: en/git-am.txt:173
+#: en/git-am.txt:178
#, priority:100
msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:174 en/git-rebase.txt:262
+#: en/git-am.txt:179 en/git-rebase.txt:280
#, ignore-same, no-wrap, priority:100
msgid "--show-current-patch"
msgstr "--show-current-patch"
#. type: Plain text
-#: en/git-am.txt:177
+#: en/git-am.txt:182
#, priority:100
msgid "Show the patch being applied when \"git am\" is stopped because of conflicts."
msgstr ""
#. type: Title -
-#: en/git-am.txt:179 en/git-commit.txt:451 en/git-format-patch.txt:346 en/git-fsck.txt:100 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:349 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:188 en/git-tag.txt:224
+#: en/git-am.txt:184 en/git-commit.txt:453 en/git-format-patch.txt:355 en/git-fsck.txt:113 en/git-log.txt:172 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:350 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:187
+#: en/git-am.txt:192
#, priority:100
msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:190
+#: en/git-am.txt:195
#, priority:100
msgid "\"From: \" and \"Subject: \" lines starting the body override the respective commit author name and title values taken from the headers."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:195
+#: en/git-am.txt:200
#, priority:100
msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:198
+#: en/git-am.txt:203
#, priority:100
msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:200
+#: en/git-am.txt:205
#, priority:100
msgid "three-dashes and end-of-line, or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:201
+#: en/git-am.txt:206
#, priority:100
msgid "a line that begins with \"diff -\", or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:202
+#: en/git-am.txt:207
#, priority:100
msgid "a line that begins with \"Index: \""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:205
+#: en/git-am.txt:210
#, priority:100
msgid "is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:209
+#: en/git-am.txt:214
#, priority:100
msgid "When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:212
+#: en/git-am.txt:217
#, priority:100
msgid "skip the current patch by re-running the command with the `--skip` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:216
+#: en/git-am.txt:221
#, priority:100
msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:221
+#: en/git-am.txt:226
#, priority:100
msgid "The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run `git am --abort` before running the command with mailbox names."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:227
+#: en/git-am.txt:232
#, priority:100
msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
msgstr ""
#. type: Title -
-#: en/git-am.txt:229 en/git-commit.txt:471 en/git-gc.txt:197
+#: en/git-am.txt:234 en/git-commit.txt:473 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:233
+#: en/git-am.txt:238
#, priority:100
msgid "This command can run `applypatch-msg`, `pre-applypatch`, and `post-applypatch` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:237
+#: en/git-am.txt:242
#, ignore-same, priority:100
msgid "linkgit:git-apply[1]."
msgstr "linkgit:git-apply[1]."
@@ -6489,7 +6958,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:317 en/merge-options.txt:72
+#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -6531,7 +7000,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:279
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:292
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -6573,7 +7042,7 @@ msgid "When a pure mode change is encountered (which has no index information),
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:105 en/rev-list-options.txt:668
+#: en/git-apply.txt:105 en/rev-list-options.txt:676
#, ignore-same, no-wrap, priority:260
msgid "--reverse"
msgstr "--reverse"
@@ -6603,7 +7072,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:337
+#: en/git-apply.txt:134 en/git-rebase.txt:360
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -6818,6 +7287,12 @@ msgstr ""
msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the `--unsafe-paths` option to override this safety check. This option has no effect when `--index` or `--cached` is in use."
msgstr ""
+#. type: Title -
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:332 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:177 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1083 en/git-tag.txt:215 en/git-update-index.txt:519
+#, no-wrap, priority:280
+msgid "CONFIGURATION"
+msgstr ""
+
#. type: Labeled list
#: en/git-apply.txt:256
#, ignore-same, no-wrap, priority:100
@@ -7083,7 +7558,7 @@ msgid "Format of the resulting archive: 'tar' or 'zip'. If this option is not gi
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:44 en/git-branch.txt:158 en/git-config.txt:165 en/git-show-branch.txt:80 en/git-tag.txt:93
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:165 en/git-show-branch.txt:80 en/git-tag.txt:100
#, ignore-same, no-wrap, priority:240
msgid "--list"
msgstr "--list"
@@ -7118,12 +7593,6 @@ msgstr ""
msgid "-o <file>"
msgstr ""
-#. type: Labeled list
-#: en/git-archive.txt:55
-#, no-wrap, priority:100
-msgid "--output=<file>"
-msgstr ""
-
#. type: Plain text
#: en/git-archive.txt:57
#, priority:100
@@ -7179,7 +7648,7 @@ msgid "Used with --remote to specify the path to the 'git-upload-archive' on the
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:77 en/git-checkout.txt:305 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:315
+#: en/git-archive.txt:77 en/git-checkout.txt:338 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:337
#, no-wrap, priority:240
msgid "<tree-ish>"
msgstr ""
@@ -7784,7 +8253,7 @@ msgid "If, in the middle of a bisect session, you know that the suggested revisi
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:245 en/git-tag.txt:366
+#: en/git-bisect.txt:245 en/git-tag.txt:373
#, priority:240
msgid "For example:"
msgstr ""
@@ -7948,7 +8417,7 @@ msgid "To cope with such a situation, after the inner 'git bisect' finds the nex
msgstr ""
#. type: Labeled list
-#: en/git-bisect.txt:357 en/git-clone.txt:134
+#: en/git-bisect.txt:357 en/git-clone.txt:144
#, ignore-same, no-wrap, priority:300
msgid "--no-checkout"
msgstr "--no-checkout"
@@ -8194,47 +8663,48 @@ msgid "git-blame - Show what revision and author last modified each line of a fi
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:15
+#: en/git-blame.txt:16
#, no-wrap, priority:100
msgid ""
"'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental]\n"
"\t [-L <range>] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>]\n"
+"\t [--ignore-rev <rev>] [--ignore-revs-file <file>]\n"
"\t [--progress] [--abbrev=<n>] [<rev> | --contents <file> | --reverse <rev>..<rev>]\n"
"\t [--] <file>\n"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:21
+#: en/git-blame.txt:22
#, priority:100
msgid "Annotates each line in the given file with information from the revision which last modified the line. Optionally, start annotating from the given revision."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:24
+#: en/git-blame.txt:25
#, priority:100
msgid "When specified one or more times, `-L` restricts annotation to the requested lines."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:30
+#: en/git-blame.txt:31
#, priority:100
msgid "The origin of lines is automatically followed across whole-file renames (currently there is no option to turn the rename-following off). To follow lines moved from one file to another, or to follow lines that were copied and pasted from another file, etc., see the `-C` and `-M` options."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:34
+#: en/git-blame.txt:35
#, priority:100
msgid "The report does not tell you anything about lines which have been deleted or replaced; you need to use a tool such as 'git diff' or the \"pickaxe\" interface briefly mentioned in the following paragraph."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:41
+#: en/git-blame.txt:42
#, priority:100
msgid "Apart from supporting file annotation, Git also supports searching the development history for when a code snippet occurred in a change. This makes it possible to track when a code snippet was added to a file, moved or copied between files, and eventually deleted or replaced. It works by searching for a text string in the diff. A small example of the pickaxe interface that searches for `blame_usage`:"
msgstr ""
#. type: delimited block -
-#: en/git-blame.txt:46
+#: en/git-blame.txt:47
#, no-wrap, priority:100
msgid ""
"$ git log --pretty=oneline -S'blame_usage'\n"
@@ -8243,157 +8713,157 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:54
+#: en/git-blame.txt:55
#, priority:100
msgid "Use the same output mode as linkgit:git-annotate[1] (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/git-blame.txt:55
+#: en/git-blame.txt:56
#, ignore-same, no-wrap, priority:100
msgid "--score-debug"
msgstr "--score-debug"
#. type: Plain text
-#: en/git-blame.txt:63
+#: en/git-blame.txt:64
#, priority:100
msgid "Include debugging information related to the movement of lines between files (see `-C`) and lines moved within a file (see `-M`). The first number listed is the score. This is the number of alphanumeric characters detected as having been moved between or within files. This must be above a certain threshold for 'git blame' to consider those lines of code to have been moved."
msgstr ""
#. type: Labeled list
-#: en/git-blame.txt:65
+#: en/git-blame.txt:66
#, ignore-same, no-wrap, priority:100
msgid "--show-name"
msgstr "--show-name"
#. type: Plain text
-#: en/git-blame.txt:69
+#: en/git-blame.txt:70
#, priority:100
msgid "Show the filename in the original commit. By default the filename is shown if there is any line that came from a file with a different name, due to rename detection."
msgstr ""
#. type: Labeled list
-#: en/git-blame.txt:71
+#: en/git-blame.txt:72
#, ignore-same, no-wrap, priority:100
msgid "--show-number"
msgstr "--show-number"
#. type: Plain text
-#: en/git-blame.txt:73
+#: en/git-blame.txt:74
#, priority:100
msgid "Show the line number in the original commit (Default: off)."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:76
+#: en/git-blame.txt:77
#, priority:100
msgid "Suppress the author name and timestamp from the output."
msgstr ""
#. type: Labeled list
-#: en/git-blame.txt:78
+#: en/git-blame.txt:79
#, ignore-same, no-wrap, priority:100
msgid "--show-email"
msgstr "--show-email"
#. type: Plain text
-#: en/git-blame.txt:82
+#: en/git-blame.txt:83
#, priority:100
msgid "Show the author email instead of author name (Default: off). This can also be controlled via the `blame.showEmail` config option."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:86
+#: en/git-blame.txt:87
#, priority:100
msgid "Ignore whitespace when comparing the parent's version and the child's to find where the lines came from."
msgstr ""
#. type: Labeled list
-#: en/git-blame.txt:87 en/git-describe.txt:65
+#: en/git-blame.txt:88 en/git-describe.txt:65
#, no-wrap, priority:260
msgid "--abbrev=<n>"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:91
+#: en/git-blame.txt:92
#, priority:100
msgid "Instead of using the default 7+1 hexadecimal digits as the abbreviated object name, use <n>+1 digits. Note that 1 column is used for a caret to mark the boundary commit."
msgstr ""
#. type: Title -
-#: en/git-blame.txt:94
+#: en/git-blame.txt:95
#, no-wrap, priority:100
msgid "THE PORCELAIN FORMAT"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:98
+#: en/git-blame.txt:99
#, priority:100
msgid "In this format, each line is output after a header; the header at the minimum has the first line which has:"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:100
+#: en/git-blame.txt:101
#, priority:100
msgid "40-byte SHA-1 of the commit the line is attributed to;"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:101
+#: en/git-blame.txt:102
#, priority:100
msgid "the line number of the line in the original file;"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:102
+#: en/git-blame.txt:103
#, priority:100
msgid "the line number of the line in the final file;"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:105
+#: en/git-blame.txt:106
#, priority:100
msgid "on a line that starts a group of lines from a different commit than the previous one, the number of lines in this group. On subsequent lines this field is absent."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:108
+#: en/git-blame.txt:109
#, priority:100
msgid "This header line is followed by the following information at least once for each commit:"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:112
+#: en/git-blame.txt:113
#, priority:100
msgid "the author name (\"author\"), email (\"author-mail\"), time (\"author-time\"), and time zone (\"author-tz\"); similarly for committer."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:113
+#: en/git-blame.txt:114
#, priority:100
msgid "the filename in the commit that the line is attributed to."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:114
+#: en/git-blame.txt:115
#, priority:100
msgid "the first line of the commit log message (\"summary\")."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:118
+#: en/git-blame.txt:119
#, priority:100
msgid "The contents of the actual line is output after the above header, prefixed by a TAB. This is to allow adding more header elements later."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:126
+#: en/git-blame.txt:127
#, priority:100
msgid "The porcelain format generally suppresses commit information that has already been seen. For example, two lines that are blamed to the same commit will both be shown, but the details for that commit will be shown only once. This is more efficient, but may require more state be kept by the reader. The `--line-porcelain` option can be used to output full commit information for each line, allowing simpler (but less efficient) usage like:"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:131
+#: en/git-blame.txt:132
#, no-wrap, priority:100
msgid ""
"\t# count the number of lines attributed to each author\n"
@@ -8403,25 +8873,25 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-blame.txt:134 en/revisions.txt:248
+#: en/git-blame.txt:135 en/revisions.txt:247
#, no-wrap, priority:100
msgid "SPECIFYING RANGES"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:140
+#: en/git-blame.txt:141
#, priority:100
msgid "Unlike 'git blame' and 'git annotate' in older versions of git, the extent of the annotation can be limited to both line ranges and revision ranges. The `-L` option, which limits annotation to a range of lines, may be specified multiple times."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:145
+#: en/git-blame.txt:146
#, priority:100
msgid "When you are interested in finding the origin for lines 40-60 for file `foo`, you can use the `-L` option like so (they mean the same thing -- both ask for 21 lines starting at line 40):"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:148
+#: en/git-blame.txt:149
#, no-wrap, priority:100
msgid ""
"\tgit blame -L 40,60 foo\n"
@@ -8429,31 +8899,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:150
+#: en/git-blame.txt:151
#, priority:100
msgid "Also you can use a regular expression to specify the line range:"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:152
+#: en/git-blame.txt:153
#, no-wrap, priority:100
msgid "\tgit blame -L '/^sub hello {/,/^}$/' foo\n"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:154
+#: en/git-blame.txt:155
#, priority:100
msgid "which limits the annotation to the body of the `hello` subroutine."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:158
+#: en/git-blame.txt:159
#, priority:100
msgid "When you are not interested in changes older than version v2.6.18, or changes older than 3 weeks, you can use revision range specifiers similar to 'git rev-list':"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:161
+#: en/git-blame.txt:162
#, no-wrap, priority:100
msgid ""
"\tgit blame v2.6.18.. -- foo\n"
@@ -8461,103 +8931,103 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:167
+#: en/git-blame.txt:168
#, priority:100
msgid "When revision range specifiers are used to limit the annotation, lines that have not changed since the range boundary (either the commit v2.6.18 or the most recent commit that is more than 3 weeks old in the above example) are blamed for that range boundary commit."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:173
+#: en/git-blame.txt:174
#, priority:100
msgid "A particularly useful way is to see if an added file has lines created by copy-and-paste from existing files. Sometimes this indicates that the developer was being sloppy and did not refactor the code properly. You can first find the commit that introduced the file with:"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:175
+#: en/git-blame.txt:176
#, no-wrap, priority:100
msgid "\tgit log --diff-filter=A --pretty=short -- foo\n"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:178
+#: en/git-blame.txt:179
#, priority:100
msgid "and then annotate the change between the commit and its parents, using `commit^!` notation:"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:180
+#: en/git-blame.txt:181
#, no-wrap, priority:100
msgid "\tgit blame -C -C -f $commit^! -- foo\n"
msgstr ""
#. type: Title -
-#: en/git-blame.txt:183
+#: en/git-blame.txt:184
#, no-wrap, priority:100
msgid "INCREMENTAL OUTPUT"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:190
+#: en/git-blame.txt:191
#, priority:100
msgid "When called with `--incremental` option, the command outputs the result as it is built. The output generally will talk about lines touched by more recent commits first (i.e. the lines will be annotated out of order) and is meant to be used by interactive viewers."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:194
+#: en/git-blame.txt:195
#, priority:100
msgid "The output format is similar to the Porcelain format, but it does not contain the actual lines from the file that is being annotated."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:196
+#: en/git-blame.txt:197
#, priority:100
msgid "Each blame entry always starts with a line of:"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:198
+#: en/git-blame.txt:199
#, no-wrap, priority:100
msgid "<40-byte hex sha1> <sourceline> <resultline> <num_lines>\n"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:200
+#: en/git-blame.txt:201
#, priority:100
msgid "Line numbers count from 1."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:205
+#: en/git-blame.txt:206
#, priority:100
msgid "The first time that a commit shows up in the stream, it has various other information about it printed out with a one-word tag at the beginning of each line describing the extra commit information (author, email, committer, dates, summary, etc.)."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:208
+#: en/git-blame.txt:209
#, priority:100
msgid "Unlike the Porcelain format, the filename information is always given and terminates the entry:"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:210
+#: en/git-blame.txt:211
#, no-wrap, priority:100
msgid "\"filename\" <whitespace-quoted-filename-goes-here>\n"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:213
+#: en/git-blame.txt:214
#, priority:100
msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:221
+#: en/git-blame.txt:222
#, priority:100
msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
msgstr ""
#. type: Title -
-#: en/git-blame.txt:224 en/git-check-mailmap.txt:40 en/git-shortlog.txt:80
+#: en/git-blame.txt:225 en/git-check-mailmap.txt:40 en/git-shortlog.txt:80
#, no-wrap, priority:260
msgid "MAPPING AUTHORS"
msgstr ""
@@ -8575,15 +9045,17 @@ msgid "git-branch - List, create, or delete branches"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:24
+#: en/git-branch.txt:26
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
-"'git branch' [--color[=<when>] | --no-color] [-r | -a]\n"
-"\t[--list] [-v [--abbrev=<length> | --no-abbrev]]\n"
+"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
+"\t[-v [--abbrev=<length> | --no-abbrev]]\n"
"\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
"\t[(--merged | --no-merged) [<commit>]]\n"
"\t[--contains [<commit]] [--no-contains [<commit>]]\n"
-"\t[--points-at <object>] [--format=<format>] [<pattern>...]\n"
+"\t[--points-at <object>] [--format=<format>]\n"
+"\t[(-r | --remotes) | (-a | --all)]\n"
+"\t[--list] [<pattern>...]\n"
"'git branch' [--track | --no-track] [-f] <branchname> [<start-point>]\n"
"'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]\n"
"'git branch' --unset-upstream [<branchname>]\n"
@@ -8594,515 +9066,533 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:37
+#: en/git-branch.txt:36
#, priority:240
-msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted with an asterisk. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches. If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns. Note that when providing a `<pattern>`, you must use `--list`; otherwise the command is interpreted as branch creation."
+msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:46
+#: en/git-branch.txt:41
#, priority:240
-msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
+msgid "If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:49
+#: en/git-branch.txt:45
#, priority:240
-msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given."
+msgid "Note that when providing a `<pattern>`, you must use `--list`; otherwise the command may be interpreted as branch creation."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:53
+#: en/git-branch.txt:54
#, priority:240
-msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git checkout <newbranch>\" to switch to the new branch."
+msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:61
+#, ignore-ellipsis, priority:240
+msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-branch.txt:65
+#, priority:240
+msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch <newbranch>\" to switch to the new branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-branch.txt:73
#, priority:240
msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:67
+#: en/git-branch.txt:79
#, priority:240
msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:71
+#: en/git-branch.txt:83
#, priority:240
msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed it along with its config and reflog will be copied to a new name."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:75
+#: en/git-branch.txt:87
#, priority:240
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:81
+#: en/git-branch.txt:93
#, priority:240
msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:85 en/git-clean.txt:28 en/git-cvsexportcommit.txt:49 en/git-difftool.txt:22 en/git-http-push.txt:44 en/git-instaweb.txt:27 en/git-ls-files.txt:39 en/git-ls-tree.txt:41 en/git-push.txt:181 en/git-repack.txt:60 en/git-replace.txt:65 en/git-show-ref.txt:47 en/git-symbolic-ref.txt:35 en/git-tag.txt:76
+#: en/git-branch.txt:97 en/git-clean.txt:28 en/git-cvsexportcommit.txt:49 en/git-difftool.txt:22 en/git-http-push.txt:44 en/git-instaweb.txt:27 en/git-ls-files.txt:39 en/git-ls-tree.txt:41 en/git-push.txt:181 en/git-repack.txt:60 en/git-replace.txt:65 en/git-show-ref.txt:47 en/git-switch.txt:81 en/git-symbolic-ref.txt:35 en/git-tag.txt:83
#, ignore-same, no-wrap, priority:240
msgid "-d"
msgstr "-d"
#. type: Labeled list
-#: en/git-branch.txt:86 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:77
+#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
#, ignore-same, no-wrap, priority:240
msgid "--delete"
msgstr "--delete"
#. type: Plain text
-#: en/git-branch.txt:90
+#: en/git-branch.txt:102
#, priority:240
msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:93
+#: en/git-branch.txt:105
#, priority:240
msgid "Shortcut for `--delete --force`."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:94 en/git-tag.txt:183
+#: en/git-branch.txt:106 en/git-tag.txt:190
#, ignore-same, no-wrap, priority:240
msgid "--create-reflog"
msgstr "--create-reflog"
#. type: Plain text
-#: en/git-branch.txt:103
+#: en/git-branch.txt:115
#, priority:240
msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:112
+#: en/git-branch.txt:124
#, priority:240
msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:114
+#: en/git-branch.txt:126
#, ignore-same, no-wrap, priority:240
msgid "--move"
msgstr "--move"
#. type: Plain text
-#: en/git-branch.txt:116
+#: en/git-branch.txt:128
#, priority:240
msgid "Move/rename a branch and the corresponding reflog."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:117 en/git-fast-export.txt:53 en/git-p4.txt:317
+#: en/git-branch.txt:129 en/git-fast-export.txt:53 en/git-p4.txt:317
#, no-wrap, priority:240
msgid "-M"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:119
+#: en/git-branch.txt:131
#, priority:240
msgid "Shortcut for `--move --force`."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:121
+#: en/git-branch.txt:133
#, ignore-same, no-wrap, priority:240
msgid "--copy"
msgstr "--copy"
#. type: Plain text
-#: en/git-branch.txt:123
+#: en/git-branch.txt:135
#, priority:240
msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:124 en/git-fast-export.txt:54 en/git-rebase.txt:519
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
#, no-wrap, priority:240
msgid "-C"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:126
+#: en/git-branch.txt:138
#, priority:240
msgid "Shortcut for `--copy --force`."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:131
+#: en/git-branch.txt:143
#, priority:240
msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136
+#: en/git-branch.txt:148
#, priority:240
msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:138 en/git-for-each-ref.txt:95 en/git-grep.txt:113 en/git-tag.txt:124
+#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:113 en/git-tag.txt:131
#, ignore-same, no-wrap, priority:240
msgid "--ignore-case"
msgstr "--ignore-case"
#. type: Plain text
-#: en/git-branch.txt:140
+#: en/git-branch.txt:152
#, priority:240
msgid "Sorting and filtering branches are case insensitive."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:141 en/git-status.txt:126 en/git-tag.txt:127
+#: en/git-branch.txt:153 en/git-status.txt:130 en/git-tag.txt:134
#, no-wrap, priority:280
msgid "--column[=<options>]"
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:142 en/git-status.txt:127 en/git-tag.txt:128
+#: en/git-branch.txt:154 en/git-status.txt:131 en/git-tag.txt:135
#, ignore-same, no-wrap, priority:280
msgid "--no-column"
msgstr "--no-column"
#. type: Plain text
-#: en/git-branch.txt:146
+#: en/git-branch.txt:158
#, priority:240
msgid "Display branch listing in columns. See configuration variable column.branch for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:148
+#: en/git-branch.txt:160
#, priority:240
msgid "This option is only applicable in non-verbose mode."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:150 en/git-show-branch.txt:44
+#: en/git-branch.txt:162 en/git-show-branch.txt:44
#, ignore-same, no-wrap, priority:240
msgid "--remotes"
msgstr "--remotes"
#. type: Plain text
-#: en/git-branch.txt:152
+#: en/git-branch.txt:165
#, priority:240
-msgid "List or delete (if used with -d) the remote-tracking branches."
+msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:156
+#: en/git-branch.txt:170
#, priority:240
-msgid "List both remote-tracking branches and local branches."
+msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:162
+#: en/git-branch.txt:176
#, ignore-ellipsis, priority:240
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:164
+#: en/git-branch.txt:177
+#, ignore-same, no-wrap, priority:240
+msgid "--show-current"
+msgstr "--show-current"
+
+#. type: Plain text
+#: en/git-branch.txt:180
+#, priority:240
+msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-branch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "-vv"
msgstr "-vv"
#. type: Plain text
-#: en/git-branch.txt:171
+#: en/git-branch.txt:191
#, priority:240
-msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the name of the upstream branch, as well (see also `git remote show <remote>`)."
+msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show <remote>`). Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:176
+#: en/git-branch.txt:196
#, priority:240
msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:177
+#: en/git-branch.txt:197
#, no-wrap, priority:240
msgid "--abbrev=<length>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:181
+#: en/git-branch.txt:201
#, priority:240
msgid "Alter the sha1's minimum display length in the output listing. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:182
+#: en/git-branch.txt:202
#, ignore-same, no-wrap, priority:240
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
-#: en/git-branch.txt:184
+#: en/git-branch.txt:204
#, priority:240
msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:186 en/git-checkout.txt:167
+#: en/git-branch.txt:206 en/git-checkout.txt:159 en/git-switch.txt:152
#, ignore-same, no-wrap, priority:240
msgid "--track"
msgstr "--track"
#. type: Plain text
-#: en/git-branch.txt:194
+#: en/git-branch.txt:214
#, priority:240
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:200
+#: en/git-branch.txt:220
#, priority:240
-msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
+msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:201 en/git-checkout.txt:181
+#: en/git-branch.txt:221 en/git-checkout.txt:173 en/git-switch.txt:167
#, ignore-same, no-wrap, priority:240
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
-#: en/git-branch.txt:204 en/git-checkout.txt:184
+#: en/git-branch.txt:224
#, priority:240
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
-#. type: Labeled list
-#: en/git-branch.txt:205 en/git-push.txt:349
-#, ignore-same, no-wrap, priority:240
-msgid "--set-upstream"
-msgstr "--set-upstream"
-
#. type: Plain text
-#: en/git-branch.txt:208
+#: en/git-branch.txt:228
#, priority:240
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:209
+#: en/git-branch.txt:229
#, no-wrap, priority:240
msgid "-u <upstream>"
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:210
+#: en/git-branch.txt:230
#, no-wrap, priority:240
msgid "--set-upstream-to=<upstream>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:214
+#: en/git-branch.txt:234
#, priority:240
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:215
+#: en/git-branch.txt:235
#, ignore-same, no-wrap, priority:240
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
-#: en/git-branch.txt:218
+#: en/git-branch.txt:238
#, priority:240
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:219
+#: en/git-branch.txt:239
#, ignore-same, no-wrap, priority:240
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
-#: en/git-branch.txt:224
+#: en/git-branch.txt:244
#, priority:240
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:225 en/git-tag.txt:135
+#: en/git-branch.txt:245 en/git-tag.txt:142
#, no-wrap, priority:240
msgid "--contains [<commit>]"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:228
+#: en/git-branch.txt:248
#, priority:240
msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:229 en/git-tag.txt:139
+#: en/git-branch.txt:249 en/git-tag.txt:146
#, no-wrap, priority:240
msgid "--no-contains [<commit>]"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:232
+#: en/git-branch.txt:252
#, priority:240
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:233 en/git-tag.txt:143
+#: en/git-branch.txt:253 en/git-tag.txt:150
#, no-wrap, priority:240
msgid "--merged [<commit>]"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:237
+#: en/git-branch.txt:257
#, priority:240
msgid "Only list branches whose tips are reachable from the specified commit (HEAD if not specified). Implies `--list`, incompatible with `--no-merged`."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:238 en/git-tag.txt:147
+#: en/git-branch.txt:258 en/git-tag.txt:154
#, no-wrap, priority:240
msgid "--no-merged [<commit>]"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:242
+#: en/git-branch.txt:262
#, priority:240
msgid "Only list branches whose tips are not reachable from the specified commit (HEAD if not specified). Implies `--list`, incompatible with `--merged`."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:243
+#: en/git-branch.txt:263
#, no-wrap, priority:240
msgid "<branchname>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:248
+#: en/git-branch.txt:268
#, priority:240
msgid "The name of the branch to create or delete. The new branch name must pass all checks defined by linkgit:git-check-ref-format[1]. Some of these checks may restrict the characters allowed in a branch name."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:249
+#: en/git-branch.txt:269 en/git-switch.txt:42
#, no-wrap, priority:240
msgid "<start-point>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:253
+#: en/git-branch.txt:273
#, priority:240
msgid "The new branch head will point to this commit. It may be given as a branch name, a commit-id, or a tag. If this option is omitted, the current HEAD will be used instead."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:254
+#: en/git-branch.txt:274
#, no-wrap, priority:240
msgid "<oldbranch>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:256
+#: en/git-branch.txt:276
#, priority:240
msgid "The name of an existing branch to rename."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:257
+#: en/git-branch.txt:277
#, no-wrap, priority:240
msgid "<newbranch>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:260
+#: en/git-branch.txt:280
#, priority:240
msgid "The new name for an existing branch. The same restrictions as for <branchname> apply."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:261 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:63 en/git-tag.txt:105
+#: en/git-branch.txt:281 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:63 en/git-tag.txt:112
#, no-wrap, priority:240
msgid "--sort=<key>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:271
+#: en/git-branch.txt:291
#, ignore-ellipsis, priority:240
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. You may use the --sort=<key> option multiple times, in which case the last key becomes the primary key. The keys supported are the same as those in `git for-each-ref`. Sort order defaults to the value configured for the `branch.sort` variable if exists, or to sorting based on the full refname (including `refs/...` prefix). This lists detached HEAD (if present) first, then local branches and finally remote-tracking branches. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:273 en/git-tag.txt:151
+#: en/git-branch.txt:293 en/git-tag.txt:158
#, no-wrap, priority:240
msgid "--points-at <object>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:275
+#: en/git-branch.txt:295
#, priority:240
msgid "Only list branches of the given object."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:276
+#: en/git-branch.txt:296
#, no-wrap, priority:240
msgid "--format <format>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:280
+#: en/git-branch.txt:300
#, priority:240
msgid "A string that interpolates `%(fieldname)` from a branch ref being shown and the object it points at. The format is the same as that of linkgit:git-for-each-ref[1]."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:286
+#: en/git-branch.txt:306
#, priority:240
msgid "`pager.branch` is only respected when listing branches, i.e., when `--list` is used or implied. The default is to use a pager. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:290
+#: en/git-branch.txt:310
#, no-wrap, priority:240
msgid "Start development from a known tag"
msgstr ""
#. type: delimited block -
-#: en/git-branch.txt:297
+#: en/git-branch.txt:317
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
"$ git branch my2.6.14 v2.6.14 <1>\n"
-"$ git checkout my2.6.14\n"
+"$ git switch my2.6.14\n"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:301
+#: en/git-branch.txt:321
#, priority:240
msgid "This step and the next one could be combined into a single step with \"checkout -b my2.6.14 v2.6.14\"."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:302
+#: en/git-branch.txt:322
#, no-wrap, priority:240
msgid "Delete an unneeded branch"
msgstr ""
#. type: delimited block -
-#: en/git-branch.txt:309
+#: en/git-branch.txt:329
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
@@ -9112,61 +9602,93 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:314
+#: en/git-branch.txt:334
#, priority:240
msgid "Delete the remote-tracking branches \"todo\", \"html\" and \"man\". The next 'fetch' or 'pull' will create them again unless you configure them not to. See linkgit:git-fetch[1]."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:316
+#: en/git-branch.txt:336
#, priority:240
msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
msgstr ""
+#. type: Labeled list
+#: en/git-branch.txt:337
+#, no-wrap, priority:240
+msgid "Listing branches from a specific remote"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-branch.txt:342
+#, no-wrap, priority:240
+msgid ""
+"$ git branch -r -l '<remote>/<pattern>' <1>\n"
+"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-branch.txt:346
+#, priority:240
+msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
+msgstr ""
+
+#. type: Plain text
+#: en/git-branch.txt:347
+#, priority:240
+msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-branch.txt:349
+#, priority:240
+msgid "Patterns will normally need quoting."
+msgstr ""
+
#. type: Title -
-#: en/git-branch.txt:319 en/git-filter-branch.txt:449 en/git-gc.txt:164 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:324
+#: en/git-branch.txt:356
#, priority:240
-msgid "If you are creating a branch that you want to checkout immediately, it is easier to use the git checkout command with its `-b` option to create a branch and check it out with a single command."
+msgid "If you are creating a branch that you want to switch to immediately, it is easier to use the \"git switch\" command with its `-c` option to do the same thing with a single command."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:327
+#: en/git-branch.txt:359
#, priority:240
msgid "The options `--contains`, `--no-contains`, `--merged` and `--no-merged` serve four related but different purposes:"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:331
+#: en/git-branch.txt:363
#, priority:240
msgid "`--contains <commit>` is used to find all branches which will need special attention if <commit> were to be rebased or amended, since those branches contain the specified <commit>."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:334
+#: en/git-branch.txt:366
#, priority:240
msgid "`--no-contains <commit>` is the inverse of that, i.e. branches that don't contain the specified <commit>."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:337
+#: en/git-branch.txt:369
#, priority:240
msgid "`--merged` is used to find all branches which can be safely deleted, since those branches are fully contained by HEAD."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:340
+#: en/git-branch.txt:372
#, priority:240
msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:348
+#: en/git-branch.txt:380
#, priority:240
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr ""
@@ -9489,7 +10011,7 @@ msgid "In the second form, a list of objects (separated by linefeeds) is provide
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:203 en/git.txt:303
+#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:325
#, no-wrap, priority:240
msgid "<object>"
msgstr ""
@@ -9525,7 +10047,7 @@ msgid "Pretty-print the contents of <object> based on its type."
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:52 en/git.txt:327
+#: en/git-cat-file.txt:52 en/git.txt:349
#, no-wrap, priority:100
msgid "<type>"
msgstr ""
@@ -9744,7 +10266,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:188 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:152 en/git-update-server-info.txt:32
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10006,19 +10528,19 @@ msgid "is printed when, during symlink resolution, a file is used as a directory
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:304 en/git-for-each-ref.txt:370 en/git-svn.txt:998
+#: en/git-cat-file.txt:304 en/git-for-each-ref.txt:375 en/git-svn.txt:998
#, no-wrap, priority:100
msgid "CAVEATS"
msgstr ""
#. type: Plain text
-#: en/git-cat-file.txt:312 en/git-for-each-ref.txt:378
+#: en/git-cat-file.txt:312 en/git-for-each-ref.txt:383
#, priority:100
msgid "Note that the sizes of objects on disk are reported accurately, but care should be taken in drawing conclusions about which refs or objects are responsible for disk usage. The size of a packed non-delta object may be much larger than the size of objects which delta against it, but the choice of which object is the base and which is the delta is arbitrary and is subject to change during a repack."
msgstr ""
#. type: Plain text
-#: en/git-cat-file.txt:316 en/git-for-each-ref.txt:382
+#: en/git-cat-file.txt:316 en/git-for-each-ref.txt:387
#, priority:100
msgid "Note also that multiple copies of an object may be present in the object database; in this case, it is undefined which copy's size or delta base will be reported."
msgstr ""
@@ -10068,7 +10590,7 @@ msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:34 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:148 en/rev-list-options.txt:205
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:148 en/rev-list-options.txt:213
#, ignore-same, no-wrap, priority:260
msgid "--stdin"
msgstr "--stdin"
@@ -10393,7 +10915,7 @@ msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will al
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:226
+#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
@@ -10590,7 +11112,7 @@ msgid "Only meaningful with `--stdin`; paths are separated with NUL character in
msgstr ""
#. type: Plain text
-#: en/git-checkout-index.txt:73 en/git-commit.txt:345 en/git-ls-files.txt:182 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
+#: en/git-checkout-index.txt:73 en/git-commit.txt:347 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-update-index.txt:223 en/git-verify-pack.txt:38
#, priority:280
msgid "Do not interpret any more arguments as options."
msgstr ""
@@ -10785,59 +11307,53 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:26
#, no-wrap, priority:240
-msgid "'git checkout' <branch>"
+msgid "'git checkout' [<branch>]"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:32
#, priority:240
-msgid "To prepare for working on <branch>, switch to it by updating the index and the files in the working tree, and by pointing HEAD at the branch. Local modifications to the files in the working tree are kept, so that they can be committed to the <branch>."
+msgid "To prepare for working on `<branch>`, switch to it by updating the index and the files in the working tree, and by pointing `HEAD` at the branch. Local modifications to the files in the working tree are kept, so that they can be committed to the `<branch>`."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:36
#, priority:240
-msgid "If <branch> is not found but there does exist a tracking branch in exactly one remote (call it <remote>) with a matching name, treat as equivalent to"
+msgid "If `<branch>` is not found but there does exist a tracking branch in exactly one remote (call it `<remote>`) with a matching name and `--no-guess` is not specified, treat as equivalent to"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:39
+#: en/git-checkout.txt:39 en/git-checkout.txt:185
#, no-wrap, priority:240
msgid "$ git checkout -b <branch> --track <remote>/<branch>\n"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:49 en/git-worktree.txt:71
-#, priority:240
-msgid "If the branch exists in multiple remotes and one of them is named by the `checkout.defaultRemote` configuration variable, we'll use that one for the purposes of disambiguation, even if the `<branch>` isn't unique across all remotes. Set it to e.g. `checkout.defaultRemote=origin` to always checkout remote branches from there if `<branch>` is ambiguous but exists on the 'origin' remote. See also `checkout.defaultRemote` in linkgit:git-config[1]."
-msgstr ""
-
-#. type: Plain text
-#: en/git-checkout.txt:54
+#: en/git-checkout.txt:45
#, priority:240
-msgid "You could omit <branch>, in which case the command degenerates to \"check out the current branch\", which is a glorified no-op with rather expensive side-effects to show only the tracking information, if exists, for the current branch."
+msgid "You could omit `<branch>`, in which case the command degenerates to \"check out the current branch\", which is a glorified no-op with rather expensive side-effects to show only the tracking information, if exists, for the current branch."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:55
+#: en/git-checkout.txt:46
#, no-wrap, priority:240
msgid "'git checkout' -b|-B <new_branch> [<start point>]"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:63
+#: en/git-checkout.txt:54
#, priority:240
msgid "Specifying `-b` causes a new branch to be created as if linkgit:git-branch[1] were called and then checked out. In this case you can use the `--track` or `--no-track` options, which will be passed to 'git branch'. As a convenience, `--track` without `-b` implies branch creation; see the description of `--track` below."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:66
+#: en/git-checkout.txt:57
#, priority:240
-msgid "If `-B` is given, <new_branch> is created if it doesn't exist; otherwise, it is reset. This is the transactional equivalent of"
+msgid "If `-B` is given, `<new_branch>` is created if it doesn't exist; otherwise, it is reset. This is the transactional equivalent of"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:70
+#: en/git-checkout.txt:61
#, no-wrap, priority:240
msgid ""
"$ git branch -f <branch> [<start point>]\n"
@@ -10845,373 +11361,457 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:74
+#: en/git-checkout.txt:65
#, priority:240
msgid "that is to say, the branch is not reset/created unless \"git checkout\" is successful."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:75
+#: en/git-checkout.txt:66
#, no-wrap, priority:240
msgid "'git checkout' --detach [<branch>]"
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:76
+#: en/git-checkout.txt:67
#, no-wrap, priority:240
msgid "'git checkout' [--detach] <commit>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:84
+#: en/git-checkout.txt:75
#, priority:240
-msgid "Prepare to work on top of <commit>, by detaching HEAD at it (see \"DETACHED HEAD\" section), and updating the index and the files in the working tree. Local modifications to the files in the working tree are kept, so that the resulting working tree will be the state recorded in the commit plus the local modifications."
+msgid "Prepare to work on top of `<commit>`, by detaching `HEAD` at it (see \"DETACHED HEAD\" section), and updating the index and the files in the working tree. Local modifications to the files in the working tree are kept, so that the resulting working tree will be the state recorded in the commit plus the local modifications."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:88
+#: en/git-checkout.txt:79
#, priority:240
-msgid "When the <commit> argument is a branch name, the `--detach` option can be used to detach HEAD at the tip of the branch (`git checkout <branch>` would check out that branch without detaching HEAD)."
+msgid "When the `<commit>` argument is a branch name, the `--detach` option can be used to detach `HEAD` at the tip of the branch (`git checkout <branch>` would check out that branch without detaching `HEAD`)."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:90
+#: en/git-checkout.txt:81
#, priority:240
-msgid "Omitting <branch> detaches HEAD at the tip of the current branch."
+msgid "Omitting `<branch>` detaches `HEAD` at the tip of the current branch."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:91
+#: en/git-checkout.txt:82
#, ignore-ellipsis, no-wrap, priority:240
msgid "'git checkout' [<tree-ish>] [--] <pathspec>..."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:98
+#: en/git-checkout.txt:89
#, priority:240
-msgid "Overwrite paths in the working tree by replacing with the contents in the index or in the <tree-ish> (most often a commit). When a <tree-ish> is given, the paths that match the <pathspec> are updated both in the index and in the working tree."
+msgid "Overwrite paths in the working tree by replacing with the contents in the index or in the `<tree-ish>` (most often a commit). When a `<tree-ish>` is given, the paths that match the `<pathspec>` are updated both in the index and in the working tree."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:106
+#: en/git-checkout.txt:97
#, priority:240
msgid "The index may contain unmerged entries because of a previous failed merge. By default, if you try to check out such an entry from the index, the checkout operation will fail and nothing will be checked out. Using `-f` will ignore these unmerged entries. The contents from a specific side of the merge can be checked out of the index by using `--ours` or `--theirs`. With `-m`, changes made to the working tree file can be discarded to re-create the original conflicted merge result."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:107
+#: en/git-checkout.txt:98
#, ignore-ellipsis, no-wrap, priority:240
msgid "'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:113
+#: en/git-checkout.txt:104
#, priority:240
msgid "This is similar to the \"check out paths to the working tree from either the index or from a tree-ish\" mode described above, but lets you use the interactive interface to show the \"diff\" output and choose which hunks to use in the result. See below for the description of `--patch` option."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:120
+#: en/git-checkout.txt:111 en/git-read-tree.txt:135 en/git-switch.txt:143
#, priority:240
msgid "Quiet, suppress feedback messages."
msgstr ""
+#. type: Labeled list
+#: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:152
+#, ignore-same, no-wrap, priority:240
+msgid "--no-progress"
+msgstr "--no-progress"
+
#. type: Plain text
-#: en/git-checkout.txt:126
+#: en/git-checkout.txt:118 en/git-restore.txt:74 en/git-switch.txt:150
#, priority:240
msgid "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`."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:132
+#: en/git-checkout.txt:124
#, priority:240
-msgid "When switching branches, proceed even if the index or the working tree differs from HEAD. This is used to throw away local changes."
+msgid "When switching branches, proceed even if the index or the working tree differs from `HEAD`. This is used to throw away local changes."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:135
+#: en/git-checkout.txt:127
#, priority:240
msgid "When checking out paths from the index, do not fail upon unmerged entries; instead, unmerged entries are ignored."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:136 en/git-merge-file.txt:73
+#: en/git-checkout.txt:128 en/git-merge-file.txt:73 en/git-restore.txt:75
#, ignore-same, no-wrap, priority:240
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
-#: en/git-checkout.txt:137 en/git-merge-file.txt:74
+#: en/git-checkout.txt:129 en/git-merge-file.txt:74 en/git-restore.txt:76
#, ignore-same, no-wrap, priority:240
msgid "--theirs"
msgstr "--theirs"
#. type: Plain text
-#: en/git-checkout.txt:140
+#: en/git-checkout.txt:132
#, priority:240
msgid "When checking out paths from the index, check out stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:145
+#: en/git-checkout.txt:137
#, priority:240
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped; `--ours` gives the version from the branch the changes are rebased onto, while `--theirs` gives the version from the branch that holds your work that is being rebased."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:155
+#: en/git-checkout.txt:147
#, priority:240
msgid "This is because `rebase` is used in a workflow that treats the history at the remote as the shared canonical one, and treats the work done on the branch you are rebasing as the third-party work to be integrated, and you are temporarily assuming the role of the keeper of the canonical history during the rebase. As the keeper of the canonical history, you need to view the history from the remote as `ours` (i.e. \"our shared canonical history\"), while what you did on your side branch as `theirs` (i.e. \"one contributor's work on top of it\")."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:156
+#: en/git-checkout.txt:148
#, no-wrap, priority:240
msgid "-b <new_branch>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:159
+#: en/git-checkout.txt:151
#, priority:240
-msgid "Create a new branch named <new_branch> and start it at <start_point>; see linkgit:git-branch[1] for details."
+msgid "Create a new branch named `<new_branch>` and start it at `<start_point>`; see linkgit:git-branch[1] for details."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:160
+#: en/git-checkout.txt:152
#, no-wrap, priority:240
msgid "-B <new_branch>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:165
+#: en/git-checkout.txt:157
#, priority:240
-msgid "Creates the branch <new_branch> and start it at <start_point>; if it already exists, then reset it to <start_point>. This is equivalent to running \"git branch\" with \"-f\"; see linkgit:git-branch[1] for details."
+msgid "Creates the branch `<new_branch>` and start it at `<start_point>`; if it already exists, then reset it to `<start_point>`. This is equivalent to running \"git branch\" with \"-f\"; see linkgit:git-branch[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:170
+#: en/git-checkout.txt:162
#, priority:240
msgid "When creating a new branch, set up \"upstream\" configuration. See \"--track\" in linkgit:git-branch[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:180
+#: en/git-checkout.txt:172
+#, priority:240
+msgid "If no `-b` option is given, the name of the new branch will be derived from the remote-tracking branch, by looking at the local part of the refspec configured for the corresponding remote, and then stripping the initial part up to the \"*\". This would tell us to use `hack` as the local branch when branching off of `origin/hack` (or `remotes/origin/hack`, or even `refs/remotes/origin/hack`). If the given name has no slash, or the above guessing results in an empty name, the guessing is aborted. You can explicitly give a name with `-b` in such a case."
+msgstr ""
+
+#. type: Plain text
+#: en/git-checkout.txt:176 en/git-switch.txt:170
+#, priority:240
+msgid "Do not set up \"upstream\" configuration, even if the `branch.autoSetupMerge` configuration variable is true."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-checkout.txt:177 en/git-switch.txt:87
+#, ignore-same, no-wrap, priority:240
+msgid "--guess"
+msgstr "--guess"
+
+#. type: Labeled list
+#: en/git-checkout.txt:178 en/git-switch.txt:88
+#, ignore-same, no-wrap, priority:240
+msgid "--no-guess"
+msgstr "--no-guess"
+
+#. type: Plain text
+#: en/git-checkout.txt:182 en/git-switch.txt:92
+#, priority:240
+msgid "If `<branch>` is not found but there does exist a tracking branch in exactly one remote (call it `<remote>`) with a matching name, treat as equivalent to"
+msgstr ""
+
+#. type: Plain text
+#: en/git-checkout.txt:195 en/git-switch.txt:104 en/git-worktree.txt:71
+#, priority:240
+msgid "If the branch exists in multiple remotes and one of them is named by the `checkout.defaultRemote` configuration variable, we'll use that one for the purposes of disambiguation, even if the `<branch>` isn't unique across all remotes. Set it to e.g. `checkout.defaultRemote=origin` to always checkout remote branches from there if `<branch>` is ambiguous but exists on the 'origin' remote. See also `checkout.defaultRemote` in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-checkout.txt:197
#, priority:240
-msgid "If no `-b` option is given, the name of the new branch will be derived from the remote-tracking branch, by looking at the local part of the refspec configured for the corresponding remote, and then stripping the initial part up to the \"*\". This would tell us to use \"hack\" as the local branch when branching off of \"origin/hack\" (or \"remotes/origin/hack\", or even \"refs/remotes/origin/hack\"). If the given name has no slash, or the above guessing results in an empty name, the guessing is aborted. You can explicitly give a name with `-b` in such a case."
+msgid "Use `--no-guess` to disable this."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:188
+#: en/git-checkout.txt:201
#, priority:240
msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:189 en/git-daemon.txt:156 en/git-worktree.txt:143
+#: en/git-checkout.txt:202 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
#, ignore-same, no-wrap, priority:240
msgid "--detach"
msgstr "--detach"
#. type: Plain text
-#: en/git-checkout.txt:195
+#: en/git-checkout.txt:208
#, priority:240
-msgid "Rather than checking out a branch to work on it, check out a commit for inspection and discardable experiments. This is the default behavior of \"git checkout <commit>\" when <commit> is not a branch name. See the \"DETACHED HEAD\" section below for details."
+msgid "Rather than checking out a branch to work on it, check out a commit for inspection and discardable experiments. This is the default behavior of `git checkout <commit>` when `<commit>` is not a branch name. See the \"DETACHED HEAD\" section below for details."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:196
+#: en/git-checkout.txt:209
#, no-wrap, priority:240
msgid "--orphan <new_branch>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:202
+#: en/git-checkout.txt:215
#, priority:240
-msgid "Create a new 'orphan' branch, named <new_branch>, started from <start_point> and switch to it. The first commit made on this new branch will have no parents and it will be the root of a new history totally disconnected from all the other branches and commits."
+msgid "Create a new 'orphan' branch, named `<new_branch>`, started from `<start_point>` and switch to it. The first commit made on this new branch will have no parents and it will be the root of a new history totally disconnected from all the other branches and commits."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:207
+#: en/git-checkout.txt:220
#, priority:240
-msgid "The index and the working tree are adjusted as if you had previously run \"git checkout <start_point>\". This allows you to start a new history that records a set of paths similar to <start_point> by easily running \"git commit -a\" to make the root commit."
+msgid "The index and the working tree are adjusted as if you had previously run `git checkout <start_point>`. This allows you to start a new history that records a set of paths similar to `<start_point>` by easily running `git commit -a` to make the root commit."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:213
+#: en/git-checkout.txt:226
#, priority:240
msgid "This can be useful when you want to publish the tree from a commit without exposing its full history. You might want to do this to publish an open source branch of a project whose current tree is \"clean\", but whose full history contains proprietary or otherwise encumbered bits of code."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:220
+#: en/git-checkout.txt:233
#, priority:240
-msgid "If you want to start a disconnected history that records a set of paths that is totally different from the one of <start_point>, then you should clear the index and the working tree right after creating the orphan branch by running \"git rm -rf .\" from the top level of the working tree. Afterwards you will be ready to prepare your new files, repopulating the working tree, by copying them from elsewhere, extracting a tarball, etc."
+msgid "If you want to start a disconnected history that records a set of paths that is totally different from the one of `<start_point>`, then you should clear the index and the working tree right after creating the orphan branch by running `git rm -rf .` from the top level of the working tree. Afterwards you will be ready to prepare your new files, repopulating the working tree, by copying them from elsewhere, extracting a tarball, etc."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:221
+#: en/git-checkout.txt:234 en/git-restore.txt:102
#, ignore-same, no-wrap, priority:240
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
#. type: Plain text
-#: en/git-checkout.txt:226
+#: en/git-checkout.txt:239
#, priority:240
-msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entries matched by <paths> and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and adds back any files in <paths>."
+msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entries matched by `<paths>` and sparse patterns in `$GIT_DIR/info/sparse-checkout`. This option ignores the sparse patterns and adds back any files in `<paths>`."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:228 en/git-rebase.txt:268 en/git-rebase.txt:523 en/git-reset.txt:71 en/git-submodule.txt:342 en/git-svn.txt:676 en/rev-list-options.txt:289
+#: en/git-checkout.txt:241 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:355 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
#. type: Plain text
-#: en/git-checkout.txt:237
+#: en/git-checkout.txt:250
#, priority:240
msgid "When switching branches, if you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context. However, with this option, a three-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:242
+#: en/git-checkout.txt:255 en/git-switch.txt:132
#, priority:240
msgid "When a merge conflict happens, the index entries for conflicting paths are left unmerged, and you need to resolve the conflicts and mark the resolved paths with `git add` (or `git rm` if the merge should result in deletion of the path)."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:245
+#: en/git-checkout.txt:258
#, priority:240
msgid "When checking out paths from the index, this option lets you recreate the conflicted merge in the specified paths."
msgstr ""
+#. type: Plain text
+#: en/git-checkout.txt:260
+#, priority:240
+msgid "When switching branches with `--merge`, staged changes may be lost."
+msgstr ""
+
#. type: Labeled list
-#: en/git-checkout.txt:246
+#: en/git-checkout.txt:261 en/git-restore.txt:89 en/git-switch.txt:133
#, no-wrap, priority:240
msgid "--conflict=<style>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:252
+#: en/git-checkout.txt:267 en/git-restore.txt:95 en/git-switch.txt:139
#, priority:240
-msgid "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)."
+msgid "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)."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:259
+#: en/git-checkout.txt:274
#, priority:240
-msgid "Interactively select hunks in the difference between the <tree-ish> (or the index, if unspecified) and the working tree. The chosen hunks are then applied in reverse to the working tree (and if a <tree-ish> was specified, the index)."
+msgid "Interactively select hunks in the difference between the `<tree-ish>` (or the index, if unspecified) and the working tree. The chosen hunks are then applied in reverse to the working tree (and if a `<tree-ish>` was specified, the index)."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:263
+#: en/git-checkout.txt:278
#, priority:240
msgid "This means that you can use `git checkout -p` to selectively discard edits from your current working tree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
+#. type: Plain text
+#: en/git-checkout.txt:281
+#, priority:240
+msgid "Note that this option uses the no overlay mode by default (see also `--overlay`), and currently doesn't support overlay mode."
+msgstr ""
+
#. type: Labeled list
-#: en/git-checkout.txt:264
+#: en/git-checkout.txt:282 en/git-switch.txt:175
#, ignore-same, no-wrap, priority:240
msgid "--ignore-other-worktrees"
msgstr "--ignore-other-worktrees"
#. type: Plain text
-#: en/git-checkout.txt:269
+#: en/git-checkout.txt:287
#, priority:240
msgid "`git checkout` refuses when the wanted ref is already checked out by another worktree. This option makes it check the ref out anyway. In other words, the ref can be held by more than one worktree."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:270 en/git-read-tree.txt:117
+#: en/git-checkout.txt:288 en/git-merge.txt:90
#, ignore-same, no-wrap, priority:240
-msgid "--[no-]recurse-submodules"
-msgstr "--[no-]recurse-submodules"
+msgid "--overwrite-ignore"
+msgstr "--overwrite-ignore"
+
+#. type: Labeled list
+#: en/git-checkout.txt:289 en/git-merge.txt:91
+#, ignore-same, no-wrap, priority:240
+msgid "--no-overwrite-ignore"
+msgstr "--no-overwrite-ignore"
#. type: Plain text
-#: en/git-checkout.txt:278
+#: en/git-checkout.txt:293
#, priority:240
-msgid "Using --recurse-submodules will update the content of all initialized submodules according to the commit recorded in the superproject. If local modifications in a submodule would be overwritten the checkout will fail unless `-f` is used. If nothing (or --no-recurse-submodules) is used, the work trees of submodules will not be updated. Just like linkgit:git-submodule[1], this will detach the submodules HEAD."
+msgid "Silently overwrite ignored files when switching branches. This is the default behavior. Use `--no-overwrite-ignore` to abort the operation when the new branch contains ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:279
+#: en/git-checkout.txt:294 en/git-grep.txt:95 en/git-ls-files.txt:150 en/git-switch.txt:181
#, ignore-same, no-wrap, priority:240
-msgid "--no-guess"
-msgstr "--no-guess"
+msgid "--recurse-submodules"
+msgstr "--recurse-submodules"
+
+#. type: Plain text
+#: en/git-checkout.txt:303
+#, priority:240
+msgid "Using `--recurse-submodules` will update the content of all initialized submodules according to the commit recorded in the superproject. If local modifications in a submodule would be overwritten the checkout will fail unless `-f` is used. If nothing (or `--no-recurse-submodules`) is used, the work trees of submodules will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodule."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-checkout.txt:304 en/git-restore.txt:109
+#, ignore-same, no-wrap, priority:240
+msgid "--overlay"
+msgstr "--overlay"
+
+#. type: Labeled list
+#: en/git-checkout.txt:305 en/git-restore.txt:110
+#, ignore-same, no-wrap, priority:240
+msgid "--no-overlay"
+msgstr "--no-overlay"
#. type: Plain text
-#: en/git-checkout.txt:282
+#: en/git-checkout.txt:311
#, priority:240
-msgid "Do not attempt to create a branch if a remote tracking branch of the same name exists."
+msgid "In the default overlay mode, `git checkout` never removes files from the index or the working tree. When specifying `--no-overlay`, files that appear in the index and working tree, but not in `<tree-ish>` are removed, to make them match `<tree-ish>` exactly."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:283 en/git-rebase.txt:225
+#: en/git-checkout.txt:312 en/git-rebase.txt:243 en/git-switch.txt:36
#, no-wrap, priority:240
msgid "<branch>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:289
+#: en/git-checkout.txt:318
#, priority:240
-msgid "Branch to checkout; if it refers to a branch (i.e., a name that, when prepended with \"refs/heads/\", is a valid ref), then that branch is checked out. Otherwise, if it refers to a valid commit, your HEAD becomes \"detached\" and you are no longer on any branch (see below for details)."
+msgid "Branch to checkout; if it refers to a branch (i.e., a name that, when prepended with \"refs/heads/\", is a valid ref), then that branch is checked out. Otherwise, if it refers to a valid commit, your `HEAD` becomes \"detached\" and you are no longer on any branch (see below for details)."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:293
+#: en/git-checkout.txt:322
#, priority:240
-msgid "You can use the `\"@{-N}\"` syntax to refer to the N-th last branch/commit checked out using \"git checkout\" operation. You may also specify `-` which is synonymous to `\"@{-1}`."
+msgid "You can use the `@{-N}` syntax to refer to the N-th last branch/commit checked out using \"git checkout\" operation. You may also specify `-` which is synonymous to `@{-1}`."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:297
+#: en/git-checkout.txt:326 en/git-switch.txt:58
#, ignore-ellipsis, priority:240
-msgid "As a special case, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
+msgid "As a special case, you may use `A...B` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:298
+#: en/git-checkout.txt:327
#, no-wrap, priority:240
msgid "<new_branch>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:300
+#: en/git-checkout.txt:329 en/git-switch.txt:41
#, priority:240
msgid "Name for the new branch."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:301
+#: en/git-checkout.txt:330
#, no-wrap, priority:240
msgid "<start_point>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:304
+#: en/git-checkout.txt:333
#, priority:240
-msgid "The name of a commit at which to start the new branch; see linkgit:git-branch[1] for details. Defaults to HEAD."
+msgid "The name of a commit at which to start the new branch; see linkgit:git-branch[1] for details. Defaults to `HEAD`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-checkout.txt:337
+#, ignore-ellipsis, priority:240
+msgid "As a special case, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:308
+#: en/git-checkout.txt:341
#, priority:240
msgid "Tree to checkout from (when paths are given). If not specified, the index will be used."
msgstr ""
#. type: Title -
-#: en/git-checkout.txt:312
+#: en/git-checkout.txt:345
#, no-wrap, priority:240
msgid "DETACHED HEAD"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:316
+#: en/git-checkout.txt:349
#, priority:240
-msgid "HEAD normally refers to a named branch (e.g. 'master'). Meanwhile, each branch refers to a specific commit. Let's look at a repo with three commits, one of them tagged, and with branch 'master' checked out:"
+msgid "`HEAD` normally refers to a named branch (e.g. `master`). Meanwhile, each branch refers to a specific commit. Let's look at a repo with three commits, one of them tagged, and with branch `master` checked out:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:325
+#: en/git-checkout.txt:358
#, no-wrap, priority:240
msgid ""
" HEAD (refers to branch 'master')\n"
@@ -11224,19 +11824,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:332
+#: en/git-checkout.txt:365
#, priority:240
-msgid "When a commit is created in this state, the branch is updated to refer to the new commit. Specifically, 'git commit' creates a new commit 'd', whose parent is commit 'c', and then updates branch 'master' to refer to new commit 'd'. HEAD still refers to branch 'master' and so indirectly now refers to commit 'd':"
+msgid "When a commit is created in this state, the branch is updated to refer to the new commit. Specifically, 'git commit' creates a new commit `d`, whose parent is commit `c`, and then updates branch `master` to refer to new commit `d`. `HEAD` still refers to branch `master` and so indirectly now refers to commit `d`:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:335 en/git-checkout.txt:370 en/git-checkout.txt:387
+#: en/git-checkout.txt:368 en/git-checkout.txt:403 en/git-checkout.txt:420
#, no-wrap, priority:240
msgid "$ edit; git add; git commit\n"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:343
+#: en/git-checkout.txt:376
#, no-wrap, priority:240
msgid ""
" HEAD (refers to branch 'master')\n"
@@ -11249,13 +11849,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:349
+#: en/git-checkout.txt:382
#, priority:240
-msgid "It is sometimes useful to be able to checkout a commit that is not at the tip of any named branch, or even to create a new commit that is not referenced by a named branch. Let's look at what happens when we checkout commit 'b' (here we show two ways this may be done):"
+msgid "It is sometimes useful to be able to checkout a commit that is not at the tip of any named branch, or even to create a new commit that is not referenced by a named branch. Let's look at what happens when we checkout commit `b` (here we show two ways this may be done):"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:353
+#: en/git-checkout.txt:386
#, no-wrap, priority:240
msgid ""
"$ git checkout v2.0 # or\n"
@@ -11263,7 +11863,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:361
+#: en/git-checkout.txt:394
#, no-wrap, priority:240
msgid ""
" HEAD (refers to commit 'b')\n"
@@ -11276,13 +11876,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:367
+#: en/git-checkout.txt:400
#, priority:240
-msgid "Notice that regardless of which checkout command we use, HEAD now refers directly to commit 'b'. This is known as being in detached HEAD state. It means simply that HEAD refers to a specific commit, as opposed to referring to a named branch. Let's see what happens when we create a commit:"
+msgid "Notice that regardless of which checkout command we use, `HEAD` now refers directly to commit `b`. This is known as being in detached `HEAD` state. It means simply that `HEAD` refers to a specific commit, as opposed to referring to a named branch. Let's see what happens when we create a commit:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:380
+#: en/git-checkout.txt:413
#, no-wrap, priority:240
msgid ""
" HEAD (refers to commit 'e')\n"
@@ -11297,13 +11897,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:384
+#: en/git-checkout.txt:417
#, priority:240
-msgid "There is now a new commit 'e', but it is referenced only by HEAD. We can of course add yet another commit in this state:"
+msgid "There is now a new commit `e`, but it is referenced only by `HEAD`. We can of course add yet another commit in this state:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:397
+#: en/git-checkout.txt:430
#, no-wrap, priority:240
msgid ""
"\t HEAD (refers to commit 'f')\n"
@@ -11318,19 +11918,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:401
+#: en/git-checkout.txt:434
#, priority:240
-msgid "In fact, we can perform all the normal Git operations. But, let's look at what happens when we then checkout master:"
+msgid "In fact, we can perform all the normal Git operations. But, let's look at what happens when we then checkout `master`:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:404
+#: en/git-checkout.txt:437
#, no-wrap, priority:240
msgid "$ git checkout master\n"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:412
+#: en/git-checkout.txt:445
#, no-wrap, priority:240
msgid ""
" HEAD (refers to branch 'master')\n"
@@ -11343,13 +11943,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:419
+#: en/git-checkout.txt:452
#, priority:240
-msgid "It is important to realize that at this point nothing refers to commit 'f'. Eventually commit 'f' (and by extension commit 'e') will be deleted by the routine Git garbage collection process, unless we create a reference before that happens. If we have not yet moved away from commit 'f', any of these will create a reference to it:"
+msgid "It is important to realize that at this point nothing refers to commit `f`. Eventually commit `f` (and by extension commit `e`) will be deleted by the routine Git garbage collection process, unless we create a reference before that happens. If we have not yet moved away from commit `f`, any of these will create a reference to it:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:424
+#: en/git-checkout.txt:457
#, no-wrap, priority:240
msgid ""
"$ git checkout -b foo <1>\n"
@@ -11358,31 +11958,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:429
+#: en/git-checkout.txt:462
#, priority:240
-msgid "creates a new branch 'foo', which refers to commit 'f', and then updates HEAD to refer to branch 'foo'. In other words, we'll no longer be in detached HEAD state after this command."
+msgid "creates a new branch `foo`, which refers to commit `f`, and then updates `HEAD` to refer to branch `foo`. In other words, we'll no longer be in detached `HEAD` state after this command."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:432
+#: en/git-checkout.txt:465
#, priority:240
-msgid "similarly creates a new branch 'foo', which refers to commit 'f', but leaves HEAD detached."
+msgid "similarly creates a new branch `foo`, which refers to commit `f`, but leaves `HEAD` detached."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:435
+#: en/git-checkout.txt:468
#, priority:240
-msgid "creates a new tag 'foo', which refers to commit 'f', leaving HEAD detached."
+msgid "creates a new tag `foo`, which refers to commit `f`, leaving `HEAD` detached."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:440
+#: en/git-checkout.txt:473
#, priority:240
-msgid "If we have moved away from commit 'f', then we must first recover its object name (typically by using git reflog), and then we can create a reference to it. For example, to see the last two commits to which HEAD referred, we can use either of these commands:"
+msgid "If we have moved away from commit `f`, then we must first recover its object name (typically by using git reflog), and then we can create a reference to it. For example, to see the last two commits to which `HEAD` referred, we can use either of these commands:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:444
+#: en/git-checkout.txt:477
#, no-wrap, priority:240
msgid ""
"$ git reflog -2 HEAD # or\n"
@@ -11390,25 +11990,25 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-checkout.txt:447
+#: en/git-checkout.txt:480
#, no-wrap, priority:240
msgid "ARGUMENT DISAMBIGUATION"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:457
+#: en/git-checkout.txt:490
#, priority:240
-msgid "When there is only one argument given and it is not `--` (e.g. \"git checkout abc\"), and when the argument is both a valid `<tree-ish>` (e.g. a branch \"abc\" exists) and a valid `<pathspec>` (e.g. a file or a directory whose name is \"abc\" exists), Git would usually ask you to disambiguate. Because checking out a branch is so common an operation, however, \"git checkout abc\" takes \"abc\" as a `<tree-ish>` in such a situation. Use `git checkout -- <pathspec>` if you want to checkout these paths out of the index."
+msgid "When there is only one argument given and it is not `--` (e.g. `git checkout abc`), and when the argument is both a valid `<tree-ish>` (e.g. a branch `abc` exists) and a valid `<pathspec>` (e.g. a file or a directory whose name is \"abc\" exists), Git would usually ask you to disambiguate. Because checking out a branch is so common an operation, however, `git checkout abc` takes \"abc\" as a `<tree-ish>` in such a situation. Use `git checkout -- <pathspec>` if you want to checkout these paths out of the index."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:464
+#: en/git-checkout.txt:497
#, priority:240
-msgid "The following sequence checks out the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
+msgid "The following sequence checks out the `master` branch, reverts the `Makefile` to two revisions back, deletes `hello.c` by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:470
+#: en/git-checkout.txt:503
#, no-wrap, priority:240
msgid ""
"$ git checkout master <1>\n"
@@ -11418,73 +12018,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:473
+#: en/git-checkout.txt:506
#, priority:240
msgid "switch branch"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:474
+#: en/git-checkout.txt:507 en/git-restore.txt:131
#, priority:240
msgid "take a file out of another commit"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:475
+#: en/git-checkout.txt:508
#, priority:240
-msgid "restore hello.c from the index"
+msgid "restore `hello.c` from the index"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:478
+#: en/git-checkout.txt:511
#, priority:240
msgid "If you want to check out _all_ C source files out of the index, you can say"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:481
+#: en/git-checkout.txt:514
#, no-wrap, priority:240
msgid "$ git checkout -- '*.c'\n"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:487
+#: en/git-checkout.txt:520
#, priority:240
msgid "Note the quotes around `*.c`. The file `hello.c` will also be checked out, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:491
+#: en/git-checkout.txt:524
#, priority:240
msgid "If you have an unfortunate branch that is named `hello.c`, this step would be confused as an instruction to switch to that branch. You should instead write:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:494
+#: en/git-checkout.txt:527
#, no-wrap, priority:240
msgid "$ git checkout -- hello.c\n"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:498
+#: en/git-checkout.txt:531 en/git-switch.txt:201
#, priority:240
msgid "After working in the wrong branch, switching to the correct branch would be done using:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:501
+#: en/git-checkout.txt:534
#, no-wrap, priority:240
msgid "$ git checkout mytopic\n"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:506
+#: en/git-checkout.txt:539
#, priority:240
-msgid "However, your \"wrong\" branch and correct \"mytopic\" branch may differ in files that you have modified locally, in which case the above checkout would fail like this:"
+msgid "However, your \"wrong\" branch and correct `mytopic` branch may differ in files that you have modified locally, in which case the above checkout would fail like this:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:510
+#: en/git-checkout.txt:543
#, no-wrap, priority:240
msgid ""
"$ git checkout mytopic\n"
@@ -11492,13 +12092,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:514
+#: en/git-checkout.txt:547 en/git-switch.txt:217
#, priority:240
msgid "You can give the `-m` flag to the command, which would try a three-way merge:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:518
+#: en/git-checkout.txt:551
#, no-wrap, priority:240
msgid ""
"$ git checkout -m mytopic\n"
@@ -11506,19 +12106,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:523
+#: en/git-checkout.txt:556 en/git-switch.txt:226
#, priority:240
msgid "After this three-way merge, the local modifications are _not_ registered in your index file, so `git diff` would show you what changes you made since the tip of the new branch."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:526
+#: en/git-checkout.txt:559
#, priority:240
msgid "When a merge conflict happens during switching branches with the `-m` option, you would see something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:532
+#: en/git-checkout.txt:565
#, no-wrap, priority:240
msgid ""
"$ git checkout -m mytopic\n"
@@ -11528,19 +12128,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:538
+#: en/git-checkout.txt:571
#, priority:240
msgid "At this point, `git diff` shows the changes cleanly merged as in the previous example, as well as the changes in the conflicted files. Edit and resolve the conflict and mark it resolved with `git add` as usual:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:542
+#: en/git-checkout.txt:575
#, no-wrap, priority:240
msgid ""
"$ edit frotz\n"
"$ git add frotz\n"
msgstr ""
+#. type: Plain text
+#: en/git-checkout.txt:581
+#, ignore-same, priority:240
+msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
+msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
+
#. type: Title =
#: en/git-check-ref-format.txt:2
#, ignore-same, no-wrap, priority:100
@@ -11672,67 +12278,67 @@ msgid "at-open-brace `@{` is used as a notation to access a reflog entry."
msgstr ""
#. type: Plain text
-#: en/git-check-ref-format.txt:97
+#: en/git-check-ref-format.txt:98
#, priority:100
-msgid "With the `--branch` option, the command takes a name and checks if it can be used as a valid branch name (e.g. when creating a new branch). But be cautious when using the previous checkout syntax that may refer to a detached HEAD state. The rule `git check-ref-format --branch $name` implements may be stricter than what `git check-ref-format refs/heads/$name` says (e.g. a dash may appear at the beginning of a ref component, but it is explicitly forbidden at the beginning of a branch name). When run with `--branch` option in a repository, the input is first expanded for the ``previous checkout syntax'' `@{-n}`. For example, `@{-1}` is a way to refer the last thing that was checked out using \"git checkout\" operation. This option should be used by porcelains to accept this syntax anywhere a branch name is expected, so they can act as if you typed the branch name. As an exception note that, the ``previous checkout operation'' might result in a commit object name when the N-th last thing checked out was not a branch."
+msgid "With the `--branch` option, the command takes a name and checks if it can be used as a valid branch name (e.g. when creating a new branch). But be cautious when using the previous checkout syntax that may refer to a detached HEAD state. The rule `git check-ref-format --branch $name` implements may be stricter than what `git check-ref-format refs/heads/$name` says (e.g. a dash may appear at the beginning of a ref component, but it is explicitly forbidden at the beginning of a branch name). When run with `--branch` option in a repository, the input is first expanded for the ``previous checkout syntax'' `@{-n}`. For example, `@{-1}` is a way to refer the last thing that was checked out using \"git switch\" or \"git checkout\" operation. This option should be used by porcelains to accept this syntax anywhere a branch name is expected, so they can act as if you typed the branch name. As an exception note that, the ``previous checkout operation'' might result in a commit object name when the N-th last thing checked out was not a branch."
msgstr ""
#. type: Labeled list
-#: en/git-check-ref-format.txt:100
+#: en/git-check-ref-format.txt:101
#, ignore-same, no-wrap, priority:100
msgid "--[no-]allow-onelevel"
msgstr "--[no-]allow-onelevel"
#. type: Plain text
-#: en/git-check-ref-format.txt:104
+#: en/git-check-ref-format.txt:105
#, priority:100
msgid "Controls whether one-level refnames are accepted (i.e., refnames that do not contain multiple `/`-separated components). The default is `--no-allow-onelevel`."
msgstr ""
#. type: Labeled list
-#: en/git-check-ref-format.txt:105
+#: en/git-check-ref-format.txt:106
#, ignore-same, no-wrap, priority:100
msgid "--refspec-pattern"
msgstr "--refspec-pattern"
#. type: Plain text
-#: en/git-check-ref-format.txt:111
+#: en/git-check-ref-format.txt:112
#, priority:100
msgid "Interpret <refname> as a reference name pattern for a refspec (as used with remote repositories). If this option is enabled, <refname> is allowed to contain a single `*` in the refspec (e.g., `foo/bar*/baz` or `foo/bar*baz/` but not `foo/bar*/baz*`)."
msgstr ""
#. type: Labeled list
-#: en/git-check-ref-format.txt:112
+#: en/git-check-ref-format.txt:113
#, ignore-same, no-wrap, priority:100
msgid "--normalize"
msgstr "--normalize"
#. type: Plain text
-#: en/git-check-ref-format.txt:119
+#: en/git-check-ref-format.txt:120
#, priority:100
msgid "Normalize 'refname' by removing any leading slash (`/`) characters and collapsing runs of adjacent slashes between name components into a single slash. If the normalized refname is valid then print it to standard output and exit with a status of 0, otherwise exit with a non-zero status. (`--print` is a deprecated way to spell `--normalize`.)"
msgstr ""
#. type: Plain text
-#: en/git-check-ref-format.txt:125
+#: en/git-check-ref-format.txt:126
#, priority:100
msgid "Print the name of the previous thing checked out:"
msgstr ""
#. type: delimited block -
-#: en/git-check-ref-format.txt:128
+#: en/git-check-ref-format.txt:129
#, no-wrap, priority:100
msgid "$ git check-ref-format --branch @{-1}\n"
msgstr ""
#. type: Plain text
-#: en/git-check-ref-format.txt:131
+#: en/git-check-ref-format.txt:132
#, priority:100
msgid "Determine the reference name to use for a new branch:"
msgstr ""
#. type: delimited block -
-#: en/git-check-ref-format.txt:135
+#: en/git-check-ref-format.txt:136
#, no-wrap, priority:100
msgid ""
"$ ref=$(git check-ref-format --normalize \"refs/heads/$newbranch\")||\n"
@@ -11752,330 +12358,340 @@ msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:16
+#: en/git-cherry-pick.txt:14
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]\n"
"\t\t [-S[<keyid>]] <commit>...\n"
-"'git cherry-pick' --continue\n"
-"'git cherry-pick' --quit\n"
-"'git cherry-pick' --abort\n"
+"'git cherry-pick' (--continue | --skip | --abort | --quit)\n"
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:23
+#: en/git-cherry-pick.txt:21
#, priority:100
msgid "Given one or more existing commits, apply the change each one introduces, recording a new commit for each. This requires your working tree to be clean (no modifications from the HEAD commit)."
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:26
+#: en/git-cherry-pick.txt:24
#, priority:100
msgid "When it is not obvious how to apply a change, the following happens:"
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:29
+#: en/git-cherry-pick.txt:27
#, priority:100
msgid "The current branch and `HEAD` pointer stay at the last commit successfully made."
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:31
+#: en/git-cherry-pick.txt:29
#, priority:100
msgid "The `CHERRY_PICK_HEAD` ref is set to point at the commit that introduced the change that is difficult to apply."
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:33
+#: en/git-cherry-pick.txt:31
#, priority:100
msgid "Paths in which the change applied cleanly are updated both in the index file and in your working tree."
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:38
+#: en/git-cherry-pick.txt:36
#, priority:100
msgid "For conflicting paths, the index file records up to three versions, as described in the \"TRUE MERGE\" section of linkgit:git-merge[1]. The working tree files will include a description of the conflict bracketed by the usual conflict markers `<<<<<<<` and `>>>>>>>`."
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:39
+#: en/git-cherry-pick.txt:37
#, priority:100
msgid "No other modifications are made."
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:42
+#: en/git-cherry-pick.txt:40
#, priority:100
msgid "See linkgit:git-merge[1] for some hints on resolving such conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:45 en/git-merge.txt:107 en/git-revert.txt:35 en/git-verify-commit.txt:27
+#: en/git-cherry-pick.txt:43 en/git-merge.txt:116 en/git-revert.txt:36 en/git-verify-commit.txt:27
#, ignore-ellipsis, no-wrap, priority:240
msgid "<commit>..."
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:54
+#: en/git-cherry-pick.txt:52
#, ignore-ellipsis, priority:100
msgid "Commits to cherry-pick. For a more complete list of ways to spell commits, see linkgit:gitrevisions[7]. Sets of commits can be passed but no traversal is done by default, as if the `--no-walk` option was specified, see linkgit:git-rev-list[1]. Note that specifying a range will feed all <commit>... arguments to a single revision walk (see a later example that uses 'maint master..next')."
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:59
+#: en/git-cherry-pick.txt:57
#, priority:100
msgid "With this option, 'git cherry-pick' will let you edit the commit message prior to committing."
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:60 en/git-clean.txt:62
+#: en/git-cherry-pick.txt:58 en/git-commit.txt:191 en/git-revert.txt:70 en/git-tag.txt:183 en/merge-options.txt:35
+#, no-wrap, priority:280
+msgid "--cleanup=<mode>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-cherry-pick.txt:64 en/git-revert.txt:76
+#, priority:100
+msgid "This option determines how the commit message will be cleaned up before being passed on to the commit machinery. See linkgit:git-commit[1] for more details. In particular, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on in the case of a conflict."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-cherry-pick.txt:65 en/git-clean.txt:63
#, ignore-same, no-wrap, priority:100
msgid "-x"
msgstr "-x"
#. type: Plain text
-#: en/git-cherry-pick.txt:73
+#: en/git-cherry-pick.txt:78
#, ignore-ellipsis, priority:100
msgid "When recording the commit, append a line that says \"(cherry picked from commit ...)\" to the original commit message in order to indicate which commit this change was cherry-picked from. This is done only for cherry picks without conflicts. Do not use this option if you are cherry-picking from your private branch because the information is useless to the recipient. If on the other hand you are cherry-picking between two publicly visible branches (e.g. backporting a fix to a maintenance branch for an older release from a development branch), adding this information can be useful."
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:78
+#: en/git-cherry-pick.txt:83
#, priority:100
msgid "It used to be that the command defaulted to do `-x` described above, and `-r` was to disable it. Now the default is not to do `-x` so this option is a no-op."
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:79 en/git-revert.txt:49
+#: en/git-cherry-pick.txt:84 en/git-revert.txt:50
#, no-wrap, priority:100
msgid "-m parent-number"
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:80 en/git-revert.txt:50
+#: en/git-cherry-pick.txt:85 en/git-revert.txt:51
#, no-wrap, priority:100
msgid "--mainline parent-number"
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:86
+#: en/git-cherry-pick.txt:91
#, priority:100
msgid "Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline. This option specifies the parent number (starting from 1) of the mainline and allows cherry-pick to replay the change relative to the specified parent."
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:88 en/git-revert.txt:70 en/merge-options.txt:2
+#: en/git-cherry-pick.txt:93 en/git-revert.txt:78 en/merge-options.txt:2
#, ignore-same, no-wrap, priority:240
msgid "--no-commit"
msgstr "--no-commit"
#. type: Plain text
-#: en/git-cherry-pick.txt:96
+#: en/git-cherry-pick.txt:101
#, priority:100
msgid "Usually the command automatically creates a sequence of commits. This flag applies the changes necessary to cherry-pick each named commit to your working tree and the index, without making any commit. In addition, when this option is used, your index does not have to match the HEAD commit. The cherry-pick is done against the beginning state of your index."
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:99
+#: en/git-cherry-pick.txt:104
#, priority:100
msgid "This is useful when cherry-picking more than one commits' effect to your index in a row."
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:104 en/git-revert.txt:93
+#: en/git-cherry-pick.txt:109 en/git-revert.txt:101
#, priority:100
msgid "Add Signed-off-by line at the end of the commit message. See the signoff option in linkgit:git-commit[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:111 en/merge-options.txt:30
+#: en/git-cherry-pick.txt:116 en/merge-options.txt:42
#, ignore-same, no-wrap, priority:240
msgid "--ff"
msgstr "--ff"
#. type: Plain text
-#: en/git-cherry-pick.txt:115
+#: en/git-cherry-pick.txt:120
#, priority:100
msgid "If the current HEAD is the same as the parent of the cherry-pick'ed commit, then a fast forward to this commit will be performed."
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:116 en/git-commit.txt:179 en/git-notes.txt:158
+#: en/git-cherry-pick.txt:121 en/git-commit.txt:179 en/git-notes.txt:158
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty"
msgstr "--allow-empty"
#. type: Plain text
-#: en/git-cherry-pick.txt:128
+#: en/git-cherry-pick.txt:133
#, priority:100
msgid "By default, cherry-picking an empty commit will fail, indicating that an explicit invocation of `git commit --allow-empty` is required. This option overrides that behavior, allowing empty commits to be preserved automatically in a cherry-pick. Note that when \"--ff\" is in effect, empty commits that meet the \"fast-forward\" requirement will be kept even without this option. Note also, that use of this option only keeps commits that were initially empty (i.e. the commit recorded the same tree as its parent). Commits which are made empty due to a previous commit are dropped. To force the inclusion of those commits use `--keep-redundant-commits`."
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:129 en/git-commit.txt:185 en/git-rebase.txt:249 en/git-rebase.txt:526
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:267 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
#. type: Plain text
-#: en/git-cherry-pick.txt:133
+#: en/git-cherry-pick.txt:138
#, priority:100
msgid "By default, cherry-picking a commit with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be cherry picked."
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:134
+#: en/git-cherry-pick.txt:139
#, ignore-same, no-wrap, priority:100
msgid "--keep-redundant-commits"
msgstr "--keep-redundant-commits"
#. type: Plain text
-#: en/git-cherry-pick.txt:140
+#: en/git-cherry-pick.txt:145
#, priority:100
msgid "If a commit being cherry picked duplicates a commit already in the current history, it will become empty. By default these redundant commits cause `cherry-pick` to stop so the user can examine the commit. This option overrides that behavior and creates an empty commit object. Implies `--allow-empty`."
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:141 en/git-notes.txt:184 en/git-rebase.txt:282 en/git-revert.txt:94 en/git-svn.txt:678 en/merge-options.txt:95
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:145 en/git-revert.txt:98
+#: en/git-cherry-pick.txt:150 en/git-revert.txt:106
#, priority:100
msgid "Use the given merge strategy. Should only be used once. See the MERGE STRATEGIES section in linkgit:git-merge[1] for details."
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-revert.txt:99
+#: en/git-cherry-pick.txt:151 en/git-revert.txt:107
#, no-wrap, priority:100
msgid "-X<option>"
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:147 en/git-revert.txt:100 en/merge-options.txt:103
+#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:125
#, no-wrap, priority:240
msgid "--strategy-option=<option>"
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:150 en/git-revert.txt:103
+#: en/git-cherry-pick.txt:155 en/git-revert.txt:111
#, priority:100
msgid "Pass the merge strategy-specific option through to the merge strategy. See linkgit:git-merge[1] for details."
msgstr ""
#. type: Title -
-#: en/git-cherry-pick.txt:152 en/git-revert.txt:105
+#: en/git-cherry-pick.txt:162 en/git-revert.txt:118
#, no-wrap, priority:100
msgid "SEQUENCER SUBCOMMANDS"
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:157
+#: en/git-cherry-pick.txt:167
#, no-wrap, priority:100
msgid "`git cherry-pick master`"
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:161
+#: en/git-cherry-pick.txt:171
#, priority:100
msgid "Apply the change introduced by the commit at the tip of the master branch and create a new commit with this change."
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:162
+#: en/git-cherry-pick.txt:172
#, no-wrap, priority:100
msgid "`git cherry-pick ..master`"
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:163
+#: en/git-cherry-pick.txt:173
#, no-wrap, priority:100
msgid "`git cherry-pick ^HEAD master`"
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:167
+#: en/git-cherry-pick.txt:177
#, priority:100
msgid "Apply the changes introduced by all commits that are ancestors of master but not of HEAD to produce new commits."
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:168
+#: en/git-cherry-pick.txt:178
#, no-wrap, priority:100
msgid "`git cherry-pick maint next ^master`"
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:169
+#: en/git-cherry-pick.txt:179
#, no-wrap, priority:100
msgid "`git cherry-pick maint master..next`"
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:176
+#: en/git-cherry-pick.txt:186
#, priority:100
msgid "Apply the changes introduced by all commits that are ancestors of maint or next, but not master or any of its ancestors. Note that the latter does not mean `maint` and everything between `master` and `next`; specifically, `maint` will not be used if it is included in `master`."
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:177
+#: en/git-cherry-pick.txt:187
#, no-wrap, priority:100
msgid "`git cherry-pick master~4 master~2`"
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:182
+#: en/git-cherry-pick.txt:192
#, priority:100
msgid "Apply the changes introduced by the fifth and third last commits pointed to by master and create 2 new commits with these changes."
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:183
+#: en/git-cherry-pick.txt:193
#, no-wrap, priority:100
msgid "`git cherry-pick -n master~1 next`"
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:189
+#: en/git-cherry-pick.txt:199
#, priority:100
msgid "Apply to the working tree and the index the changes introduced by the second last commit pointed to by master and by the last commit pointed to by next, but do not create any commit with these changes."
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:190
+#: en/git-cherry-pick.txt:200
#, no-wrap, priority:100
msgid "`git cherry-pick --ff ..next`"
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:197
+#: en/git-cherry-pick.txt:207
#, priority:100
msgid "If history is linear and HEAD is an ancestor of next, update the working tree and advance the HEAD pointer to match next. Otherwise, apply the changes introduced by those commits that are in next but not HEAD to the current branch, creating a new commit for each new change."
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:198
+#: en/git-cherry-pick.txt:208
#, no-wrap, priority:100
msgid "`git rev-list --reverse master -- README | git cherry-pick -n --stdin`"
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:204
+#: en/git-cherry-pick.txt:214
#, priority:100
msgid "Apply the changes introduced by all commits on the master branch that touched README to the working tree and index, so the result can be inspected and made into a single new commit if suitable."
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:208
+#: en/git-cherry-pick.txt:218
#, priority:100
msgid "The following sequence attempts to backport a patch, bails out because the code the patch applies to has changed too much, and then tries again, this time exercising more care about matching up context lines."
msgstr ""
#. type: delimited block -
-#: en/git-cherry-pick.txt:214
+#: en/git-cherry-pick.txt:224
#, no-wrap, priority:100
msgid ""
"$ git cherry-pick topic^ <1>\n"
@@ -12085,25 +12701,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:219
+#: en/git-cherry-pick.txt:229
#, priority:100
msgid "apply the change that would be shown by `git show topic^`. In this example, the patch does not apply cleanly, so information about the conflict is written to the index and working tree and no new commit results."
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:220
+#: en/git-cherry-pick.txt:230
#, priority:100
msgid "summarize changes to be reconciled"
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:223
+#: en/git-cherry-pick.txt:233
#, priority:100
msgid "cancel the cherry-pick. In other words, return to the pre-cherry-pick state, preserving any local modifications you had in the working tree."
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:226
+#: en/git-cherry-pick.txt:236
#, priority:100
msgid "try to apply the change introduced by `topic^` again, spending extra time to avoid mistakes based on incorrectly matching context lines."
msgstr ""
@@ -12151,7 +12767,7 @@ msgid "Show the commit subjects next to the SHA1s."
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:32 en/git-rebase.txt:220
+#: en/git-cherry.txt:32 en/git-rebase.txt:238
#, no-wrap, priority:100
msgid "<upstream>"
msgstr ""
@@ -12163,13 +12779,13 @@ msgid "Upstream branch to search for equivalent commits. Defaults to the upstre
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:36 en/git.txt:347
+#: en/git-cherry.txt:36 en/git.txt:369
#, no-wrap, priority:100
msgid "<head>"
msgstr ""
#. type: Plain text
-#: en/git-cherry.txt:38 en/git-rebase.txt:227
+#: en/git-cherry.txt:38 en/git-rebase.txt:245
#, priority:100
msgid "Working branch; defaults to HEAD."
msgstr ""
@@ -12382,85 +12998,85 @@ msgid "If any optional `<path>...` arguments are given, only those paths are aff
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:33
+#: en/git-clean.txt:35
#, priority:100
-msgid "Remove untracked directories in addition to untracked files. If an untracked directory is managed by a different Git repository, it is not removed by default. Use -f option twice if you really want to remove such a directory."
+msgid "Normally, when no <path> is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. If any paths are specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under `--force`) will be removed."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:41
+#: en/git-clean.txt:43
#, priority:100
-msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f, -n or -i. Git will refuse to delete directories with .git sub directory or file unless a second -f is given."
+msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f or -i. Git will refuse to modify untracked nested git repositories (directories with a .git subdirectory) unless a second -f is given."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:46
+#: en/git-clean.txt:48
#, priority:100
msgid "Show what would be done and clean files interactively. See ``Interactive mode'' for details."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:50
+#: en/git-clean.txt:52
#, priority:100
msgid "Don't actually remove anything, just show what would be done."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:55
+#: en/git-clean.txt:57
#, priority:100
msgid "Be quiet, only report errors, but not the files that are successfully removed."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:56
+#: en/git-clean.txt:58
#, no-wrap, priority:100
msgid "-e <pattern>"
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:57 en/git-ls-files.txt:85 en/git-name-rev.txt:33
+#: en/git-clean.txt:59 en/git-ls-files.txt:85 en/git-name-rev.txt:33
#, no-wrap, priority:100
msgid "--exclude=<pattern>"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:61
+#: en/git-clean.txt:62
#, priority:100
-msgid "In addition to those found in .gitignore (per directory) and $GIT_DIR/info/exclude, also consider these patterns to be in the set of the ignore rules in effect."
+msgid "Use the given exclude pattern in addition to the standard ignore rules (see linkgit:gitignore[5])."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:69
+#: en/git-clean.txt:70
#, priority:100
-msgid "Don't use the standard ignore rules read from .gitignore (per directory) and $GIT_DIR/info/exclude, but do still use the ignore rules given with `-e` options. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git reset') to create a pristine working directory to test a clean build."
+msgid "Don't use the standard ignore rules (see linkgit:gitignore[5]), but still use the ignore rules given with `-e` options from the command line. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git restore' or 'git reset') to create a pristine working directory to test a clean build."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:70
+#: en/git-clean.txt:71
#, no-wrap, priority:100
msgid "-X"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:73
+#: en/git-clean.txt:74
#, priority:100
msgid "Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files."
msgstr ""
#. type: Title -
-#: en/git-clean.txt:75
+#: en/git-clean.txt:76
#, no-wrap, priority:100
msgid "Interactive mode"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:79
+#: en/git-clean.txt:80
#, priority:100
msgid "When the command enters the interactive mode, it shows the files and directories to be cleaned, and goes into its interactive command loop."
msgstr ""
#. type: delimited block -
-#: en/git-clean.txt:90
+#: en/git-clean.txt:91
#, no-wrap, priority:100
msgid ""
" *** Commands ***\n"
@@ -12470,91 +13086,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:93
+#: en/git-clean.txt:94
#, priority:100
msgid "You also could say `c` or `clean` above as long as the choice is unique."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:95
+#: en/git-clean.txt:96
#, priority:100
msgid "The main command loop has 6 subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:96
+#: en/git-clean.txt:97
#, no-wrap, priority:100
msgid "clean"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:99
+#: en/git-clean.txt:100
#, priority:100
msgid "Start cleaning files and directories, and then quit."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:100
+#: en/git-clean.txt:101
#, no-wrap, priority:100
msgid "filter by pattern"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:108
+#: en/git-clean.txt:109
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Input ignore patterns>>\" prompt. You can input space-separated patterns to exclude files and directories from deletion. E.g. \"*.c *.h\" will excludes files end with \".c\" and \".h\" from deletion. When you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:109
+#: en/git-clean.txt:110
#, no-wrap, priority:100
msgid "select by numbers"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:120
+#: en/git-clean.txt:121
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Select items to delete>>\" prompt. When the prompt ends with double '>>' like this, you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything. Also when you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:121
+#: en/git-clean.txt:122
#, no-wrap, priority:100
msgid "ask each"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:126
+#: en/git-clean.txt:127
#, priority:100
msgid "This will start to clean, and you must confirm one by one in order to delete items. Please note that this action is not as efficient as the above two actions."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:127
+#: en/git-clean.txt:128
#, no-wrap, priority:100
msgid "quit"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:130
+#: en/git-clean.txt:131
#, priority:100
msgid "This lets you quit without do cleaning."
msgstr ""
#. type: Labeled list
-#: en/git-clean.txt:131
+#: en/git-clean.txt:132
#, no-wrap, priority:100
msgid "help"
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:134
+#: en/git-clean.txt:135
#, priority:100
msgid "Show brief usage of interactive git-clean."
msgstr ""
#. type: Plain text
-#: en/git-clean.txt:138 en/git-status.txt:432
+#: en/git-clean.txt:139 en/git-status.txt:440
#, ignore-same, priority:280
msgid "linkgit:gitignore[5]"
msgstr "linkgit:gitignore[5]"
@@ -12572,7 +13188,7 @@ msgid "git-clone - Clone a repository into a new directory"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:19
+#: en/git-clone.txt:20
#, no-wrap, priority:300
msgid ""
"'git clone' [--template=<template_directory>]\n"
@@ -12581,71 +13197,72 @@ msgid ""
"\t [--dissociate] [--separate-git-dir <git dir>]\n"
"\t [--depth <depth>] [--[no-]single-branch] [--no-tags]\n"
"\t [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]\n"
-"\t [--jobs <n>] [--] <repository> [<directory>]\n"
+"\t [--[no-]remote-submodules] [--jobs <n>] [--] <repository>\n"
+"\t [<directory>]\n"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:28
+#: en/git-clone.txt:29
#, priority:300
-msgid "Clones a repository into a newly created directory, creates remote-tracking branches for each branch in the cloned repository (visible using `git branch -r`), and creates and checks out an initial branch that is forked from the cloned repository's currently active branch."
+msgid "Clones a repository into a newly created directory, creates remote-tracking branches for each branch in the cloned repository (visible using `git branch --remotes`), and creates and checks out an initial branch that is forked from the cloned repository's currently active branch."
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:34
+#: en/git-clone.txt:35
#, priority:300
msgid "After the clone, a plain `git fetch` without arguments will update all the remote-tracking branches, and a `git pull` without arguments will in addition merge the remote master branch into the current master branch, if any (this is untrue when \"--single-branch\" is given; see below)."
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:39
+#: en/git-clone.txt:40
#, priority:300
msgid "This default configuration is achieved by creating references to the remote branch heads under `refs/remotes/origin` and by initializing `remote.origin.url` and `remote.origin.fetch` configuration variables."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:43 en/git-config.txt:127 en/git-instaweb.txt:24 en/git-pack-objects.txt:142 en/git-svn.txt:245
+#: en/git-clone.txt:45 en/git-config.txt:127 en/git-instaweb.txt:24 en/git-pack-objects.txt:142 en/git-svn.txt:245
#, ignore-same, no-wrap, priority:300
msgid "--local"
msgstr "--local"
#. type: Plain text
-#: en/git-clone.txt:51
+#: en/git-clone.txt:52
#, priority:300
msgid "When the repository to clone from is on a local machine, this flag bypasses the normal \"Git aware\" transport mechanism and clones the repository by making a copy of HEAD and everything under objects and refs directories. The files under `.git/objects/` directory are hardlinked to save space when possible."
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:58
+#: en/git-clone.txt:59
#, priority:300
msgid "If the repository is specified as a local path (e.g., `/path/to/repo`), this is the default, and --local is essentially a no-op. If the repository is specified as a URL, then this flag is ignored (and we never use the local optimizations). Specifying `--no-local` will override the default when `/path/to/repo` is given, using the regular Git transport instead."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:59
+#: en/git-clone.txt:60
#, ignore-same, no-wrap, priority:300
msgid "--no-hardlinks"
msgstr "--no-hardlinks"
#. type: Plain text
-#: en/git-clone.txt:64
+#: en/git-clone.txt:65
#, priority:300
msgid "Force the cloning process from a repository on a local filesystem to copy the files under the `.git/objects` directory instead of using hardlinks. This may be desirable if you are trying to make a back-up of your repository."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:65
+#: en/git-clone.txt:67
#, ignore-same, no-wrap, priority:300
msgid "--shared"
msgstr "--shared"
#. type: Plain text
-#: en/git-clone.txt:72
+#: en/git-clone.txt:73
#, priority:300
msgid "When the repository to clone is on the local machine, instead of using hard links, automatically setup `.git/objects/info/alternates` to share the objects with the source repository. The resulting repository starts out without any object of its own."
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:82
+#: en/git-clone.txt:83
#, no-wrap, priority:300
msgid ""
"*NOTE*: this is a possibly dangerous operation; do *not* use\n"
@@ -12660,31 +13277,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:88
+#: en/git-clone.txt:89
#, priority:300
-msgid "Note that running `git repack` without the `-l` option in a repository cloned with `-s` will copy objects from the source repository into a pack in the cloned repository, removing the disk space savings of `clone -s`. It is safe, however, to run `git gc`, which uses the `-l` option by default."
+msgid "Note that running `git repack` without the `--local` option in a repository cloned with `--shared` will copy objects from the source repository into a pack in the cloned repository, removing the disk space savings of `clone --shared`. It is safe, however, to run `git gc`, which uses the `--local` option by default."
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:92
+#: en/git-clone.txt:93
#, priority:300
-msgid "If you want to break the dependency of a repository cloned with `-s` on its source repository, you can simply run `git repack -a` to copy all objects from the source repository into a pack in the cloned repository."
+msgid "If you want to break the dependency of a repository cloned with `--shared` on its source repository, you can simply run `git repack -a` to copy all objects from the source repository into a pack in the cloned repository."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:93
+#: en/git-clone.txt:94
#, no-wrap, priority:300
msgid "--reference[-if-able] <repository>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:103
+#: en/git-clone.txt:104
#, priority:300
msgid "If the reference repository is on the local machine, automatically setup `.git/objects/info/alternates` to obtain objects from the reference repository. Using an already existing repository as an alternate will require fewer objects to be copied from the repository being cloned, reducing network and local storage costs. When using the `--reference-if-able`, a non existing directory is skipped with a warning instead of aborting the clone."
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:106
+#: en/git-clone.txt:107
#, no-wrap, priority:300
msgid ""
"*NOTE*: see the NOTE for the `--shared` option, and also the\n"
@@ -12692,283 +13309,301 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:107 en/git-submodule.txt:380
+#: en/git-clone.txt:108 en/git-submodule.txt:393
#, ignore-same, no-wrap, priority:300
msgid "--dissociate"
msgstr "--dissociate"
#. type: Plain text
-#: en/git-clone.txt:117
+#: en/git-clone.txt:118
#, priority:300
msgid "Borrow the objects from reference repositories specified with the `--reference` options only to reduce network transfer, and stop borrowing from them after a clone is made by making necessary local copies of borrowed objects. This option can also be used when cloning locally from a repository that already borrows objects from another repository--the new repository will borrow objects from the same repository, and this option can be used to stop the borrowing."
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:122
+#: en/git-clone.txt:123
#, priority:300
msgid "Operate quietly. Progress is not reported to the standard error stream."
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:127
+#: en/git-clone.txt:128
#, priority:300
msgid "Run verbosely. Does not affect the reporting of progress status to the standard error stream."
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:137
+#: en/git-clone.txt:134
+#, priority:300
+msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
+msgstr ""
+
+#. type: Plain text
+#: en/git-clone.txt:146
#, priority:300
msgid "No checkout of HEAD is performed after the clone is complete."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:138 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:133
+#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:135
#, ignore-same, no-wrap, priority:300
msgid "--bare"
msgstr "--bare"
#. type: Plain text
-#: en/git-clone.txt:149
+#: en/git-clone.txt:158
#, priority:300
-msgid "Make a 'bare' Git repository. That is, instead of creating `<directory>` and placing the administrative files in `<directory>/.git`, make the `<directory>` itself the `$GIT_DIR`. This obviously implies the `-n` because there is nowhere to check out the working tree. Also the branch heads at the remote are copied directly to corresponding local branch heads, without mapping them to `refs/remotes/origin/`. When this option is used, neither remote-tracking branches nor the related configuration variables are created."
+msgid "Make a 'bare' Git repository. That is, instead of creating `<directory>` and placing the administrative files in `<directory>/.git`, make the `<directory>` itself the `$GIT_DIR`. This obviously implies the `--no-checkout` because there is nowhere to check out the working tree. Also the branch heads at the remote are copied directly to corresponding local branch heads, without mapping them to `refs/remotes/origin/`. When this option is used, neither remote-tracking branches nor the related configuration variables are created."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:150 en/git-push.txt:161
+#: en/git-clone.txt:159 en/git-push.txt:161
#, ignore-same, no-wrap, priority:300
msgid "--mirror"
msgstr "--mirror"
#. type: Plain text
-#: en/git-clone.txt:157
+#: en/git-clone.txt:166
#, priority:300
msgid "Set up a mirror of the source repository. This implies `--bare`. Compared to `--bare`, `--mirror` not only maps local branches of the source to local branches of the target, it maps all refs (including remote-tracking branches, notes etc.) and sets up a refspec configuration such that all these refs are overwritten by a `git remote update` in the target repository."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:158
+#: en/git-clone.txt:167
#, no-wrap, priority:300
-msgid "--origin <name>"
+msgid "-o <name>"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:159
+#: en/git-clone.txt:168
#, no-wrap, priority:300
-msgid "-o <name>"
+msgid "--origin <name>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:162
+#: en/git-clone.txt:171
#, priority:300
msgid "Instead of using the remote name `origin` to keep track of the upstream repository, use `<name>`."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:163
+#: en/git-clone.txt:172
#, no-wrap, priority:300
-msgid "--branch <name>"
+msgid "-b <name>"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:164
+#: en/git-clone.txt:173
#, no-wrap, priority:300
-msgid "-b <name>"
+msgid "--branch <name>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:171
+#: en/git-clone.txt:180
#, priority:300
msgid "Instead of pointing the newly created HEAD to the branch pointed to by the cloned repository's HEAD, point to `<name>` branch instead. In a non-bare repository, this is the branch that will be checked out. `--branch` can also take tags and detaches the HEAD at that commit in the resulting repository."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:173
+#: en/git-clone.txt:181
#, no-wrap, priority:300
msgid "-u <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:177
+#: en/git-clone.txt:186
#, priority:300
msgid "When given, and the repository to clone from is accessed via ssh, this specifies a non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:178 en/git-init.txt:51 en/git-svn.txt:578
+#: en/git-clone.txt:187 en/git-init.txt:51 en/git-svn.txt:578
#, no-wrap, priority:300
msgid "--template=<template_directory>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:181
+#: en/git-clone.txt:190
#, priority:300
msgid "Specify the directory from which templates will be used; (See the \"TEMPLATE DIRECTORY\" section of linkgit:git-init[1].)"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:182
+#: en/git-clone.txt:191
#, no-wrap, priority:300
-msgid "--config <key>=<value>"
+msgid "-c <key>=<value>"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:183
+#: en/git-clone.txt:192
#, no-wrap, priority:300
-msgid "-c <key>=<value>"
+msgid "--config <key>=<value>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:192
+#: en/git-clone.txt:201
#, priority:300
msgid "Set a configuration variable in the newly-created repository; this takes effect immediately after the repository is initialized, but before the remote history is fetched or any files checked out. The key is in the same format as expected by linkgit:git-config[1] (e.g., `core.eol=true`). If multiple values are given for the same key, each value will be written to the config file. This makes it safe, for example, to add additional fetch refspecs to the origin remote."
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:198
+#: en/git-clone.txt:207
#, priority:300
msgid "Due to limitations of the current implementation, some configuration variables do not take effect until after the initial fetch and checkout. Configuration variables known to not take effect are: `remote.<name>.mirror` and `remote.<name>.tagOpt`. Use the corresponding `--mirror` and `--no-tags` options instead."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:199
+#: en/git-clone.txt:208
#, no-wrap, priority:300
msgid "--depth <depth>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:205
+#: en/git-clone.txt:214
#, priority:300
msgid "Create a 'shallow' clone with a history truncated to the specified number of commits. Implies `--single-branch` unless `--no-single-branch` is given to fetch the histories near the tips of all branches. If you want to clone submodules shallowly, also pass `--shallow-submodules`."
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:208
+#: en/git-clone.txt:217
#, priority:300
msgid "Create a shallow clone with a history after the specified time."
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:213
+#: en/git-clone.txt:222
#, priority:300
msgid "Create a shallow clone with a history, excluding commits reachable from a specified remote branch or tag. This option can be specified multiple times."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:214
+#: en/git-clone.txt:223
#, ignore-same, no-wrap, priority:300
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
#. type: Plain text
-#: en/git-clone.txt:223
+#: en/git-clone.txt:232
#, priority:300
msgid "Clone only the history leading to the tip of a single branch, either specified by the `--branch` option or the primary branch remote's `HEAD` points at. Further fetches into the resulting repository will only update the remote-tracking branch for the branch this option was used for the initial cloning. If the HEAD at the remote did not point at any branch when `--single-branch` clone was made, no remote-tracking branch is created."
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:230
+#: en/git-clone.txt:239
#, priority:300
msgid "Don't clone any tags, and set `remote.<remote>.tagOpt=--no-tags` in the config, ensuring that future `git pull` and `git fetch` operations won't follow any tags. Subsequent explicit tag fetches will still work, (see linkgit:git-fetch[1])."
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:235
+#: en/git-clone.txt:244
#, priority:300
msgid "Can be used in conjunction with `--single-branch` to clone and maintain a branch with no references other than a single cloned branch. This is useful e.g. to maintain minimal clones of the default branch of some repository for search indexing."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:236
+#: en/git-clone.txt:245
#, no-wrap, priority:300
msgid "--recurse-submodules[=<pathspec]"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:244
+#: en/git-clone.txt:253
#, priority:300
msgid "After the clone is created, initialize and clone submodules within based on the provided pathspec. If no pathspec is provided, all submodules are initialized and cloned. This option can be given multiple times for pathspecs consisting of multiple entries. The resulting clone has `submodule.active` set to the provided pathspec, or \".\" (meaning all submodules) if no pathspec is provided."
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:251
+#: en/git-clone.txt:260
#, priority:300
msgid "Submodules are initialized and cloned using their default settings. This is equivalent to running `git submodule update --init --recursive <pathspec>` immediately after the clone is finished. This option is ignored if the cloned repository does not have a worktree/checkout (i.e. if any of `--no-checkout`/`-n`, `--bare`, or `--mirror` is given)"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:252
+#: en/git-clone.txt:261
#, ignore-same, no-wrap, priority:300
msgid "--[no-]shallow-submodules"
msgstr "--[no-]shallow-submodules"
#. type: Plain text
-#: en/git-clone.txt:254
+#: en/git-clone.txt:263
#, priority:300
msgid "All submodules which are cloned will be shallow with a depth of 1."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:255 en/git-init.txt:56
+#: en/git-clone.txt:264
+#, ignore-same, no-wrap, priority:300
+msgid "--[no-]remote-submodules"
+msgstr "--[no-]remote-submodules"
+
+#. type: Plain text
+#: en/git-clone.txt:269
+#, priority:300
+msgid "All submodules which are cloned will use the status of the submodule�셲 remote-tracking branch to update the submodule, rather than the superproject�셲 recorded SHA-1. Equivalent to passing `--remote` to `git submodule update`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-clone.txt:270 en/git-init.txt:56
#, no-wrap, priority:300
msgid "--separate-git-dir=<git dir>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:261
+#: en/git-clone.txt:276
#, priority:300
msgid "Instead of placing the cloned repository where it is supposed to be, place the cloned repository at the specified directory, then make a filesystem-agnostic Git symbolic link to there. The result is Git repository can be separated from working tree."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:262 en/git-submodule.txt:404
+#: en/git-clone.txt:277 en/git-submodule.txt:417
#, no-wrap, priority:300
msgid "-j <n>"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:263 en/git-submodule.txt:405
+#: en/git-clone.txt:278 en/git-submodule.txt:418
#, no-wrap, priority:300
msgid "--jobs <n>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:266
+#: en/git-clone.txt:281
#, priority:300
msgid "The number of submodules fetched at the same time. Defaults to the `submodule.fetchJobs` option."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:267 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:81 en/git-push.txt:50 en/pull-fetch-param.txt:1
+#: en/git-clone.txt:282 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:81 en/git-push.txt:50 en/pull-fetch-param.txt:1
#, no-wrap, priority:300
msgid "<repository>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:271
+#: en/git-clone.txt:286
#, priority:300
msgid "The (possibly remote) repository to clone from. See the <<URLS,GIT URLS>> section below for more information on specifying repositories."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:272 en/git-cvsserver.txt:53 en/git-daemon.txt:220 en/git-receive-pack.txt:41 en/git-send-pack.txt:95 en/git-upload-archive.txt:57 en/git-upload-pack.txt:44
+#: en/git-clone.txt:287 en/git-cvsserver.txt:53 en/git-daemon.txt:220 en/git-receive-pack.txt:41 en/git-send-pack.txt:95 en/git-upload-archive.txt:57 en/git-upload-pack.txt:44
#, no-wrap, priority:300
msgid "<directory>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:278
+#: en/git-clone.txt:293
#, priority:300
msgid "The name of a new directory to clone into. The \"humanish\" part of the source repository is used if no directory is explicitly given (`repo` for `/path/to/repo.git` and `foo` for `host.xz:foo/.git`). Cloning into an existing directory is only allowed if the directory is empty."
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:286
+#: en/git-clone.txt:301
#, priority:300
msgid "Clone from upstream:"
msgstr ""
#. type: delimited block -
-#: en/git-clone.txt:291
+#: en/git-clone.txt:306
#, ignore-ellipsis, no-wrap, priority:300
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux.git my-linux\n"
@@ -12977,13 +13612,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:295
+#: en/git-clone.txt:310
#, priority:300
msgid "Make a local clone that borrows from the current directory, without checking things out:"
msgstr ""
#. type: delimited block -
-#: en/git-clone.txt:300
+#: en/git-clone.txt:315
#, no-wrap, priority:300
msgid ""
"$ git clone -l -s -n . ../copy\n"
@@ -12992,13 +13627,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:304
+#: en/git-clone.txt:319
#, priority:300
msgid "Clone from upstream while borrowing from an existing local directory:"
msgstr ""
#. type: delimited block -
-#: en/git-clone.txt:310
+#: en/git-clone.txt:325
#, ignore-ellipsis, no-wrap, priority:300
msgid ""
"$ git clone --reference /git/linux.git \\\n"
@@ -13008,13 +13643,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:314
+#: en/git-clone.txt:329
#, priority:300
msgid "Create a bare repository to publish your changes to the public:"
msgstr ""
#. type: delimited block -
-#: en/git-clone.txt:317
+#: en/git-clone.txt:332
#, no-wrap, priority:300
msgid "$ git clone --bare -l /home/proj/.git /pub/scm/proj.git\n"
msgstr ""
@@ -13212,121 +13847,127 @@ msgid "Creates a new commit object based on the provided tree object and emits t
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:30
+#: en/git-commit-tree.txt:29
#, priority:100
-msgid "A commit object may have any number of parents. With exactly one parent, it is an ordinary commit. Having more than one parent makes the commit a merge between several lines of history. Initial (root) commits have no parents."
+msgid "The `-m` and `-F` options can be given any number of times, in any order. The commit log message will be composed in the order in which the options are given."
msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:34
#, priority:100
+msgid "A commit object may have any number of parents. With exactly one parent, it is an ordinary commit. Having more than one parent makes the commit a merge between several lines of history. Initial (root) commits have no parents."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit-tree.txt:38
+#, priority:100
msgid "While a tree represents a particular directory state of a working directory, a commit represents that state in \"time\", and explains how to get there."
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:40
+#: en/git-commit-tree.txt:44
#, priority:100
msgid "Normally a commit would identify a new \"HEAD\" state, and while Git doesn't care where you save the note about that state, in practice we tend to just write the result to the file that is pointed at by `.git/HEAD`, so that we can always see what the last committed state was."
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:43 en/git.txt:309
+#: en/git-commit-tree.txt:47 en/git.txt:331
#, no-wrap, priority:100
msgid "<tree>"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:45
+#: en/git-commit-tree.txt:49
#, priority:100
-msgid "An existing tree object"
+msgid "An existing tree object."
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:46
+#: en/git-commit-tree.txt:50
#, no-wrap, priority:100
msgid "-p <parent>"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:48
+#: en/git-commit-tree.txt:52
#, priority:100
msgid "Each `-p` indicates the id of a parent commit object."
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:49 en/git-fmt-merge-msg.txt:42
+#: en/git-commit-tree.txt:53 en/git-fmt-merge-msg.txt:42
#, no-wrap, priority:100
msgid "-m <message>"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:52
+#: en/git-commit-tree.txt:56
#, priority:100
msgid "A paragraph in the commit log message. This can be given more than once and each <message> becomes its own paragraph."
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:53 en/git-commit.txt:131 en/git-fmt-merge-msg.txt:47 en/git-merge.txt:78 en/git-notes.txt:140 en/git-tag.txt:163
+#: en/git-commit-tree.txt:57 en/git-commit.txt:131 en/git-fmt-merge-msg.txt:47 en/git-merge.txt:77 en/git-notes.txt:140 en/git-tag.txt:170
#, no-wrap, priority:280
msgid "-F <file>"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:56
+#: en/git-commit-tree.txt:61
#, priority:100
-msgid "Read the commit log message from the given file. Use `-` to read from the standard input."
+msgid "Read the commit log message from the given file. Use `-` to read from the standard input. This can be given more than once and the content of each file becomes its own paragraph."
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:63 en/git-commit.txt:339
+#: en/git-commit-tree.txt:68 en/git-commit.txt:341
#, ignore-same, no-wrap, priority:280
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
#. type: Plain text
-#: en/git-commit-tree.txt:66
+#: en/git-commit-tree.txt:71
#, priority:100
msgid "Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlier on the command line."
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:69
+#: en/git-commit-tree.txt:74
#, no-wrap, priority:100
msgid "Commit Information"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:72
+#: en/git-commit-tree.txt:77
#, priority:100
msgid "A commit encapsulates:"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:74
+#: en/git-commit-tree.txt:79
#, priority:100
msgid "all parent object ids"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:75
+#: en/git-commit-tree.txt:80
#, priority:100
msgid "author name, email and date"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:76
+#: en/git-commit-tree.txt:81
#, priority:100
msgid "committer name and email and the commit time."
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:80
+#: en/git-commit-tree.txt:85
#, priority:100
msgid "While parent object ids are provided on the command line, author and committer information is taken from the following environment variables, if set:"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:87
+#: en/git-commit-tree.txt:92
#, no-wrap, priority:100
msgid ""
"\tGIT_AUTHOR_NAME\n"
@@ -13338,37 +13979,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:89
+#: en/git-commit-tree.txt:94
#, priority:100
msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:96
+#: en/git-commit-tree.txt:101
#, priority:100
msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items user.name and user.email, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:100
+#: en/git-commit-tree.txt:105
#, priority:100
msgid "A commit comment is read from stdin. If a changelog entry is not provided via \"<\" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D."
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:104
+#: en/git-commit-tree.txt:109
#, no-wrap, priority:100
msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:109 en/git-commit.txt:477 en/git-config.txt:268 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:416 en/git-svn.txt:1156
+#: en/git-commit-tree.txt:114 en/git-commit.txt:479 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:429 en/git-svn.txt:1156
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:111
+#: en/git-commit-tree.txt:116
#, priority:100
msgid "/etc/mailname"
msgstr ""
@@ -13548,7 +14189,7 @@ msgid "When doing a dry-run, give the output in the short-format. See linkgit:gi
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:110 en/git-status.txt:32 en/git-submodule.txt:259
+#: en/git-commit.txt:110 en/git-status.txt:32
#, ignore-same, no-wrap, priority:280
msgid "--branch"
msgstr "--branch"
@@ -13590,7 +14231,7 @@ msgid "When showing `short` or `porcelain` status output, print the filename ver
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:132 en/git-merge.txt:79 en/git-notes.txt:141 en/git-tag.txt:164
+#: en/git-commit.txt:132 en/git-merge.txt:78 en/git-notes.txt:141 en/git-tag.txt:171
#, no-wrap, priority:280
msgid "--file=<file>"
msgstr ""
@@ -13626,13 +14267,13 @@ msgid "Override the author date used in the commit."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:146 en/git-merge.txt:67 en/git-notes.txt:132 en/git-svn.txt:468 en/git-tag.txt:155
+#: en/git-commit.txt:146 en/git-merge.txt:66 en/git-notes.txt:132 en/git-svn.txt:468 en/git-tag.txt:162
#, no-wrap, priority:280
msgid "-m <msg>"
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:147 en/git-notes.txt:133 en/git-svn.txt:469 en/git-tag.txt:156
+#: en/git-commit.txt:147 en/git-notes.txt:133 en/git-svn.txt:469 en/git-tag.txt:163
#, no-wrap, priority:280
msgid "--message=<msg>"
msgstr ""
@@ -13668,13 +14309,13 @@ msgid "When editing the commit message, start the editor with the contents in th
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:173 en/merge-options.txt:69
+#: en/git-commit.txt:173 en/merge-options.txt:85
#, priority:280
msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:175 en/git-rebase.txt:325
+#: en/git-commit.txt:175 en/git-rebase.txt:348 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -13697,12 +14338,6 @@ msgstr ""
msgid "Like --allow-empty this command is primarily for use by foreign SCM interface scripts. It allows you to create a commit with an empty commit message without using plumbing commands like linkgit:git-commit-tree[1]."
msgstr ""
-#. type: Labeled list
-#: en/git-commit.txt:191 en/git-tag.txt:176
-#, no-wrap, priority:280
-msgid "--cleanup=<mode>"
-msgstr ""
-
#. type: Plain text
#: en/git-commit.txt:195
#, priority:280
@@ -13782,7 +14417,7 @@ msgid "The message taken from file with `-F`, command line with `-m`, and from c
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:226 en/git-revert.txt:65 en/merge-options.txt:12
+#: en/git-commit.txt:226 en/git-revert.txt:66 en/merge-options.txt:17
#, ignore-same, no-wrap, priority:280
msgid "--no-edit"
msgstr "--no-edit"
@@ -13887,115 +14522,115 @@ msgid "Show untracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:288
+#: en/git-commit.txt:289
#, priority:280
msgid "The mode parameter is optional (defaults to 'all'), and is used to specify the handling of untracked files; when -u is not used, the default is 'normal', i.e. show untracked files and directories."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:290 en/git-status.txt:67 en/git-status.txt:107
+#: en/git-commit.txt:291 en/git-status.txt:68 en/git-status.txt:110
#, priority:280
msgid "The possible options are:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:292
+#: en/git-commit.txt:293
#, no-wrap, priority:280
msgid "'no' - Show no untracked files\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:293
+#: en/git-commit.txt:294
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:294 en/git-status.txt:71
+#: en/git-commit.txt:295 en/git-status.txt:72
#, no-wrap, priority:280
msgid "'all' - Also shows individual files in untracked directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:297 en/git-status.txt:84
+#: en/git-commit.txt:298 en/git-status.txt:85
#, priority:280
msgid "The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:308
+#: en/git-commit.txt:310
#, priority:280
msgid "Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template to help the user describe the commit by reminding what changes the commit has. Note that this diff output doesn't have its lines prefixed with '#'. This diff will not be a part of the commit message. See the `commit.verbose` configuration variable in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:312
+#: en/git-commit.txt:314
#, priority:280
msgid "If specified twice, show in addition the unified diff between what would be committed and the worktree files, i.e. the unstaged changes to tracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:316
+#: en/git-commit.txt:318
#, priority:280
msgid "Suppress commit summary message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:321
+#: en/git-commit.txt:323
#, priority:280
msgid "Do not create a commit, but show a list of paths that are to be committed, paths with local changes that will be left uncommitted and paths that are untracked."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:322
+#: en/git-commit.txt:324
#, ignore-same, no-wrap, priority:280
msgid "--status"
msgstr "--status"
#. type: Plain text
-#: en/git-commit.txt:327
+#: en/git-commit.txt:329
#, priority:280
msgid "Include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the commit message. Defaults to on, but can be used to override configuration variable commit.status."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:328
+#: en/git-commit.txt:330
#, ignore-same, no-wrap, priority:280
msgid "--no-status"
msgstr "--no-status"
#. type: Plain text
-#: en/git-commit.txt:332
+#: en/git-commit.txt:334
#, priority:280
msgid "Do not include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the default commit message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:342
+#: en/git-commit.txt:344
#, priority:280
msgid "Countermand `commit.gpgSign` configuration variable that is set to force each and every commit to be signed."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:346 en/git-rm.txt:29
+#: en/git-commit.txt:348 en/git-rm.txt:29
#, ignore-ellipsis, no-wrap, priority:280
msgid "<file>..."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:352
+#: en/git-commit.txt:354
#, priority:280
msgid "When files are given on the command line, the command commits the contents of the named files, without recording the changes already staged. The contents of these files are also staged for the next commit on top of what have been staged before."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:369
+#: en/git-commit.txt:371
#, priority:280
-msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git reset HEAD -- <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
+msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:375
+#: en/git-commit.txt:377
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14005,13 +14640,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:383
+#: en/git-commit.txt:385
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:388
+#: en/git-commit.txt:390
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14020,19 +14655,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:393
+#: en/git-commit.txt:395
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:398
+#: en/git-commit.txt:400
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:404
+#: en/git-commit.txt:406
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14042,31 +14677,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:411
+#: en/git-commit.txt:413
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:414 en/git-commit.txt:440
+#: en/git-commit.txt:416 en/git-commit.txt:442
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:418
+#: en/git-commit.txt:420
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:426
+#: en/git-commit.txt:428
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:432
+#: en/git-commit.txt:434
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14076,55 +14711,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:437
+#: en/git-commit.txt:439
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:448
+#: en/git-commit.txt:450
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:460
+#: en/git-commit.txt:462
#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:464
+#: en/git-commit.txt:466
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:469
+#: en/git-commit.txt:471
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:475
+#: en/git-commit.txt:477
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:479
+#: en/git-commit.txt:481
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:485
+#: en/git-commit.txt:487
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:493
+#: en/git-commit.txt:495
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -14337,7 +14972,7 @@ msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_
msgstr ""
#. type: Plain text
-#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:332
+#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:334
#, priority:100
msgid "See also <<FILES>>."
msgstr ""
@@ -14363,7 +14998,7 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:130
#, priority:100
-msgid "For writing options: write to the repository `.git/config` file. This is\tthe default behavior."
+msgid "For writing options: write to the repository `.git/config` file. This is the default behavior."
msgstr ""
#. type: Plain text
@@ -14373,7 +15008,7 @@ msgid "For reading options: read only from the repository `.git/config` rather t
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:136
+#: en/git-config.txt:136 en/git-restore.txt:57
#, ignore-same, no-wrap, priority:100
msgid "--worktree"
msgstr "--worktree"
@@ -14541,7 +15176,7 @@ msgid "--bool-or-int"
msgstr "--bool-or-int"
#. type: Labeled list
-#: en/git-config.txt:196 en/git-hash-object.txt:41
+#: en/git-config.txt:196 en/git-hash-object.txt:39
#, ignore-same, no-wrap, priority:100
msgid "--path"
msgstr "--path"
@@ -14619,384 +15254,384 @@ msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output i
msgstr ""
#. type: Plain text
-#: en/git-config.txt:244
+#: en/git-config.txt:246
#, priority:100
-msgid "`--type=color [--default=<default>]` is preferred over `--get-color`."
+msgid "`--type=color [--default=<default>]` is preferred over `--get-color` (but note that `--get-color` will omit the trailing newline printed by `--type=color`)."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:251
#, priority:100
msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:252
#, ignore-same, no-wrap, priority:100
msgid "--[no-]includes"
msgstr "--[no-]includes"
#. type: Plain text
-#: en/git-config.txt:255
+#: en/git-config.txt:257
#, priority:100
msgid "Respect `include.*` directives in config files when looking up values. Defaults to `off` when a specific file is given (e.g., using `--file`, `--global`, etc) and `on` when searching all config files."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:256
+#: en/git-config.txt:258
#, no-wrap, priority:100
msgid "--default <value>"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:259
+#: en/git-config.txt:261
#, priority:100
msgid "When using `--get`, and the requested variable is not found, behave as if <value> were the value assigned to the that variable."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:265
+#: en/git-config.txt:267
#, priority:100
msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results. The default is to use a pager."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:272
+#: en/git-config.txt:274
#, priority:100
msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:273
+#: en/git-config.txt:275
#, no-wrap, priority:100
msgid "$(prefix)/etc/gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:277
#, priority:100
msgid "System-wide configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:276
+#: en/git-config.txt:278
#, no-wrap, priority:100
msgid "$XDG_CONFIG_HOME/git/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:283
+#: en/git-config.txt:285
#, priority:100
msgid "Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or empty, `$HOME/.config/git/config` will be used. Any single-valued variable set in this file will be overwritten by whatever is in `~/.gitconfig`. It is a good idea not to create this file if you sometimes use older versions of Git, as support for this file was added fairly recently."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:284
+#: en/git-config.txt:286
#, no-wrap, priority:100
msgid "~/.gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:287
+#: en/git-config.txt:289
#, priority:100
msgid "User-specific configuration file. Also called \"global\" configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:288
+#: en/git-config.txt:290
#, no-wrap, priority:100
msgid "$GIT_DIR/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:290
+#: en/git-config.txt:292
#, priority:100
msgid "Repository specific configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:291
+#: en/git-config.txt:293
#, no-wrap, priority:100
msgid "$GIT_DIR/config.worktree"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:294
+#: en/git-config.txt:296
#, priority:100
msgid "This is optional and is only searched when `extensions.worktreeConfig` is present in $GIT_DIR/config."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:300
+#: en/git-config.txt:302
#, priority:100
msgid "If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration file are not available they will be ignored. If the repository configuration file is not available or readable, 'git config' will exit with a non-zero error code. However, in neither case will an error message be issued."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:304
+#: en/git-config.txt:306
#, priority:100
msgid "The files are read in the order given above, with last value found taking precedence over values read earlier. When multiple values are taken then all values of a key from all files will be used."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:307
+#: en/git-config.txt:309
#, priority:100
msgid "You may override individual configuration parameters when running any git command by using the `-c` option. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:311
+#: en/git-config.txt:313
#, priority:100
msgid "All writing options will per default write to the repository specific configuration file. Note that this also affects options like `--replace-all` and `--unset`. *'git config' will only ever change one file at a time*."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:317
+#: en/git-config.txt:319
#, priority:100
msgid "You can override these rules either by command-line options or by environment variables. The `--global`, `--system` and `--worktree` options will limit the file used to the global, system-wide or per-worktree file respectively. The `GIT_CONFIG` environment variable has a similar effect, but you can specify any filename you want."
msgstr ""
#. type: Title -
-#: en/git-config.txt:320 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
+#: en/git-config.txt:322 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
#, no-wrap, priority:100
msgid "ENVIRONMENT"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:322
+#: en/git-config.txt:324
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
#. type: Plain text
-#: en/git-config.txt:326
+#: en/git-config.txt:328
#, priority:100
msgid "Take the configuration from the given file instead of .git/config. Using the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" option forces this to $(prefix)/etc/gitconfig."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:327
+#: en/git-config.txt:329
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG_NOSYSTEM"
msgstr "GIT_CONFIG_NOSYSTEM"
#. type: Plain text
-#: en/git-config.txt:330
+#: en/git-config.txt:332
#, priority:100
msgid "Whether to skip reading settings from the system-wide $(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:339
+#: en/git-config.txt:341
#, priority:100
msgid "Given a .git/config like this:"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:345
+#. type: delimited block -
+#: en/git-config.txt:348
#, no-wrap, priority:100
msgid ""
-"\t#\n"
-"\t# This is the config file, and\n"
-"\t# a '#' or ';' character indicates\n"
-"\t# a comment\n"
-"\t#\n"
+"#\n"
+"# This is the config file, and\n"
+"# a '#' or ';' character indicates\n"
+"# a comment\n"
+"#\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:350
+#. type: delimited block -
+#: en/git-config.txt:353 en/git.txt:310
#, no-wrap, priority:100
msgid ""
-"\t; core variables\n"
-"\t[core]\n"
-"\t\t; Don't trust file modes\n"
-"\t\tfilemode = false\n"
+"; core variables\n"
+"[core]\n"
+"\t; Don't trust file modes\n"
+"\tfilemode = false\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:355
+#. type: delimited block -
+#: en/git-config.txt:358
#, no-wrap, priority:100
msgid ""
-"\t; Our diff algorithm\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"; Our diff algorithm\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:360
+#. type: delimited block -
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
-"\t; Proxy settings\n"
-"\t[core]\n"
-"\t\tgitproxy=proxy-command for kernel.org\n"
-"\t\tgitproxy=default-proxy ; for all the rest\n"
+"; Proxy settings\n"
+"[core]\n"
+"\tgitproxy=proxy-command for kernel.org\n"
+"\tgitproxy=default-proxy ; for all the rest\n"
msgstr ""
-#. type: Plain text
-#: en/git-config.txt:367
+#. type: delimited block -
+#: en/git-config.txt:370
#, no-wrap, priority:100
msgid ""
-"\t; HTTP\n"
-"\t[http]\n"
-"\t\tsslVerify\n"
-"\t[http \"https://weak.example.com\"]\n"
-"\t\tsslVerify = false\n"
-"\t\tcookieFile = /tmp/cookie.txt\n"
+"; HTTP\n"
+"[http]\n"
+"\tsslVerify\n"
+"[http \"https://weak.example.com\"]\n"
+"\tsslVerify = false\n"
+"\tcookieFile = /tmp/cookie.txt\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:369
+#: en/git-config.txt:373
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:372
+#: en/git-config.txt:376
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:377
+#: en/git-config.txt:381
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:380
+#: en/git-config.txt:384
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:383
+#: en/git-config.txt:387
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:385
+#: en/git-config.txt:389
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:388
+#: en/git-config.txt:392
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:392
+#: en/git-config.txt:396
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:394
+#: en/git-config.txt:398
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:397
+#: en/git-config.txt:401
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:400 en/git-gui.txt:120 en/git-merge-index.txt:64
+#: en/git-config.txt:404 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:403
+#: en/git-config.txt:407
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:406
+#: en/git-config.txt:410
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:409
+#: en/git-config.txt:413
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:412
+#: en/git-config.txt:416
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:415
+#: en/git-config.txt:419
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:419
+#: en/git-config.txt:423
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:422
+#: en/git-config.txt:426
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:426
+#: en/git-config.txt:430
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:429
+#: en/git-config.txt:433
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:432
+#: en/git-config.txt:436
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:435
+#: en/git-config.txt:439
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:438
+#: en/git-config.txt:442
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:441
+#: en/git-config.txt:445
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:445
+#: en/git-config.txt:449
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:451
+#: en/git-config.txt:455
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15006,13 +15641,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:455
+#: en/git-config.txt:459
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:464
+#: en/git-config.txt:468
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15025,19 +15660,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:469 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:248 en/git-rebase.txt:1025 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
+#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1064 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:474
+#: en/git-config.txt:478
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:478
+#: en/git-config.txt:482
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15045,13 +15680,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:481
+#: en/git-config.txt:485
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:486
+#: en/git-config.txt:490
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -16366,7 +17001,7 @@ msgid "-V"
msgstr ""
#. type: Labeled list
-#: en/git-cvsserver.txt:45 en/git.txt:41
+#: en/git-cvsserver.txt:45 en/git.txt:42
#, ignore-same, no-wrap, priority:100
msgid "--version"
msgstr "--version"
@@ -16378,7 +17013,7 @@ msgid "Print version information and exit"
msgstr ""
#. type: Labeled list
-#: en/git-cvsserver.txt:50 en/git.txt:44
+#: en/git-cvsserver.txt:50 en/git.txt:45
#, ignore-same, no-wrap, priority:100
msgid "--help"
msgstr "--help"
@@ -16414,7 +17049,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
msgstr ""
#. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:227
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
#, no-wrap, priority:100
msgid "LIMITATIONS"
msgstr ""
@@ -16658,7 +17293,7 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:246
#, priority:100
-msgid "The database can not be reliably regenerated in a consistent form after the branch it is tracking has changed. Example: For merged branches, 'git-cvsserver' only tracks one branch of development, and after a 'git merge' an incrementally updated database may track a different branch than a database regenerated from scratch, causing inconsistent CVS revision numbers. `git-cvsserver` has no way of knowing which branch it would have picked if it had been run incrementally pre-merge. So if you have to fully or partially (from old backup) regenerate the database, you should be suspicious of pre-existing CVS sandboxes."
+msgid "The database cannot be reliably regenerated in a consistent form after the branch it is tracking has changed. Example: For merged branches, 'git-cvsserver' only tracks one branch of development, and after a 'git merge' an incrementally updated database may track a different branch than a database regenerated from scratch, causing inconsistent CVS revision numbers. `git-cvsserver` has no way of knowing which branch it would have picked if it had been run incrementally pre-merge. So if you have to fully or partially (from old backup) regenerate the database, you should be suspicious of pre-existing CVS sandboxes."
msgstr ""
#. type: Plain text
@@ -17074,7 +17709,7 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:61
#, priority:100
-msgid "Remap all the path requests as relative to the given path. This is sort of \"Git root\" - if you run 'git daemon' with '--base-path=/srv/git' on example.com, then if you later try to pull 'git://example.com/hello.git', 'git daemon' will interpret the path as '/srv/git/hello.git'."
+msgid "Remap all the path requests as relative to the given path. This is sort of \"Git root\" - if you run 'git daemon' with '--base-path=/srv/git' on example.com, then if you later try to pull 'git://example.com/hello.git', 'git daemon' will interpret the path as `/srv/git/hello.git`."
msgstr ""
#. type: Labeled list
@@ -17687,7 +18322,7 @@ msgid "Only output exact matches (a tag directly references the supplied commit)
msgstr ""
#. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:157
+#: en/git-describe.txt:82 en/git-ls-files.txt:159
#, ignore-same, no-wrap, priority:260
msgid "--debug"
msgstr "--debug"
@@ -17729,7 +18364,7 @@ msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the
msgstr ""
#. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:108 en/git-name-rev.txt:61
+#: en/git-describe.txt:118 en/git-diff-tree.txt:115 en/git-name-rev.txt:61
#, ignore-same, no-wrap, priority:260
msgid "--always"
msgstr "--always"
@@ -17775,7 +18410,7 @@ msgstr ""
#. type: Plain text
#: en/git-describe.txt:147
#, priority:260
-msgid "The number of additional commits is the number of commits which would be displayed by \"git log v1.0.4..parent\". The hash suffix is \"-g\" + 7-char abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The \"g\" prefix stands for \"git\" and is used to allow describing the version of a software depending on the SCM the software is managed with. This is useful in an environment where people may use different SCMs."
+msgid "The number of additional commits is the number of commits which would be displayed by \"git log v1.0.4..parent\". The hash suffix is \"-g\" + unambiguous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The \"g\" prefix stands for \"git\" and is used to allow describing the version of a software depending on the SCM the software is managed with. This is useful in an environment where people may use different SCMs."
msgstr ""
#. type: Plain text
@@ -17919,7 +18554,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:957
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:992
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -18270,7 +18905,7 @@ msgid "Specify a custom command for viewing diffs. 'git-difftool' ignores the c
msgstr ""
#. type: Labeled list
-#: en/git-difftool.txt:88 en/git-help.txt:59 en/git-mergetool.txt:82 en/git-show-branch.txt:111 en/git-update-index.txt:122 en/rev-list-options.txt:256
+#: en/git-difftool.txt:88 en/git-help.txt:59 en/git-mergetool.txt:82 en/git-show-branch.txt:111 en/git-update-index.txt:122 en/rev-list-options.txt:264
#, ignore-same, no-wrap, priority:260
msgid "-g"
msgstr "-g"
@@ -18282,145 +18917,145 @@ msgid "--[no-]gui"
msgstr "--[no-]gui"
#. type: Plain text
-#: en/git-difftool.txt:94
+#: en/git-difftool.txt:96
#, priority:100
-msgid "When 'git-difftool' is invoked with the `-g` or `--gui` option the default diff tool will be read from the configured `diff.guitool` variable instead of `diff.tool`. The `--no-gui` option can be used to override this setting."
+msgid "When 'git-difftool' is invoked with the `-g` or `--gui` option the default diff tool will be read from the configured `diff.guitool` variable instead of `diff.tool`. The `--no-gui` option can be used to override this setting. If `diff.guitool` is not set, we will fallback in the order of `merge.guitool`, `diff.tool`, `merge.tool` until a tool is found."
msgstr ""
#. type: Labeled list
-#: en/git-difftool.txt:95
+#: en/git-difftool.txt:97
#, ignore-same, no-wrap, priority:100
msgid "--[no-]trust-exit-code"
msgstr "--[no-]trust-exit-code"
#. type: Plain text
-#: en/git-difftool.txt:100
+#: en/git-difftool.txt:102
#, priority:100
msgid "'git-difftool' invokes a diff tool individually on each file. Errors reported by the diff tool are ignored by default. Use `--trust-exit-code` to make 'git-difftool' exit when an invoked diff tool returns a non-zero exit code."
msgstr ""
#. type: Plain text
-#: en/git-difftool.txt:103
+#: en/git-difftool.txt:105
#, priority:100
msgid "'git-difftool' will forward the exit code of the invoked tool when `--trust-exit-code` is used."
msgstr ""
#. type: Plain text
-#: en/git-difftool.txt:105
+#: en/git-difftool.txt:107
#, priority:100
msgid "See linkgit:git-diff[1] for the full list of supported options."
msgstr ""
#. type: Title -
-#: en/git-difftool.txt:107
+#: en/git-difftool.txt:109
#, no-wrap, priority:100
msgid "CONFIG VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-difftool.txt:110
+#: en/git-difftool.txt:112
#, priority:100
msgid "'git difftool' falls back to 'git mergetool' config variables when the difftool equivalents have not been defined."
msgstr ""
#. type: Labeled list
-#: en/git-difftool.txt:111
+#: en/git-difftool.txt:113
#, ignore-same, no-wrap, priority:100
msgid "diff.tool"
msgstr "diff.tool"
#. type: Plain text
-#: en/git-difftool.txt:113
+#: en/git-difftool.txt:115
#, priority:100
msgid "The default diff tool to use."
msgstr ""
#. type: Labeled list
-#: en/git-difftool.txt:114
+#: en/git-difftool.txt:116
#, ignore-same, no-wrap, priority:100
msgid "diff.guitool"
msgstr "diff.guitool"
#. type: Plain text
-#: en/git-difftool.txt:116
+#: en/git-difftool.txt:118
#, priority:100
msgid "The default diff tool to use when `--gui` is specified."
msgstr ""
#. type: Labeled list
-#: en/git-difftool.txt:117
+#: en/git-difftool.txt:119
#, no-wrap, priority:100
msgid "difftool.<tool>.path"
msgstr ""
#. type: Plain text
-#: en/git-difftool.txt:120
+#: en/git-difftool.txt:122
#, priority:100
msgid "Override the path for the given tool. This is useful in case your tool is not in the PATH."
msgstr ""
#. type: Labeled list
-#: en/git-difftool.txt:121
+#: en/git-difftool.txt:123
#, no-wrap, priority:100
msgid "difftool.<tool>.cmd"
msgstr ""
#. type: Plain text
-#: en/git-difftool.txt:123
+#: en/git-difftool.txt:125
#, priority:100
msgid "Specify the command to invoke the specified diff tool."
msgstr ""
#. type: Plain text
-#: en/git-difftool.txt:125
+#: en/git-difftool.txt:127
#, priority:100
msgid "See the `--tool=<tool>` option above for more details."
msgstr ""
#. type: Labeled list
-#: en/git-difftool.txt:126
+#: en/git-difftool.txt:128
#, ignore-same, no-wrap, priority:100
msgid "difftool.prompt"
msgstr "difftool.prompt"
#. type: Plain text
-#: en/git-difftool.txt:128
+#: en/git-difftool.txt:130
#, priority:100
msgid "Prompt before each invocation of the diff tool."
msgstr ""
#. type: Labeled list
-#: en/git-difftool.txt:129
+#: en/git-difftool.txt:131
#, ignore-same, no-wrap, priority:100
msgid "difftool.trustExitCode"
msgstr "difftool.trustExitCode"
#. type: Plain text
-#: en/git-difftool.txt:131
+#: en/git-difftool.txt:133
#, priority:100
msgid "Exit difftool if the invoked diff tool returns a non-zero exit status."
msgstr ""
#. type: Plain text
-#: en/git-difftool.txt:133
+#: en/git-difftool.txt:135
#, priority:100
msgid "See the `--trust-exit-code` option above for more details."
msgstr ""
#. type: Plain text
-#: en/git-difftool.txt:138
+#: en/git-difftool.txt:140
#, priority:100
msgid "Show changes between commits, commit and working tree, etc"
msgstr ""
#. type: Plain text
-#: en/git-difftool.txt:141
+#: en/git-difftool.txt:143
#, priority:100
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
#. type: Plain text
-#: en/git-difftool.txt:144
+#: en/git-difftool.txt:146
#, priority:100
msgid "Get and set repository or global options"
msgstr ""
@@ -18442,8 +19077,8 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
-"\t [-t] [-r] [-c | --cc] [--root] [<common diff options>]\n"
-"\t <tree-ish> [<tree-ish>] [<path>...]\n"
+"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root]\n"
+"\t [<common diff options>] <tree-ish> [<tree-ish>] [<path>...]\n"
msgstr ""
#. type: Plain text
@@ -18471,7 +19106,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:410
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:423
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -18566,8 +19201,20 @@ msgstr ""
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr ""
+#. type: Labeled list
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:998
+#, ignore-same, no-wrap, priority:260
+msgid "--combined-all-paths"
+msgstr "--combined-all-paths"
+
#. type: Plain text
-#: en/git-diff-tree.txt:111
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1004
+#, priority:260
+msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-diff-tree.txt:118
#, priority:100
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
@@ -18916,9 +19563,9 @@ msgid "This program dumps the given revisions in a form suitable to be piped int
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:22
+#: en/git-fast-export.txt:23
#, priority:100
-msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a kind of an interactive 'git filter-branch'."
+msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
@@ -19005,134 +19652,158 @@ msgstr ""
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
+#. type: Labeled list
+#: en/git-fast-export.txt:79
+#, ignore-same, no-wrap, priority:100
+msgid "--mark-tags"
+msgstr "--mark-tags"
+
+#. type: Plain text
+#: en/git-fast-export.txt:87
+#, priority:100
+msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
+msgstr ""
+
#. type: Plain text
-#: en/git-fast-export.txt:83
+#: en/git-fast-export.txt:92
#, priority:100
-msgid "Any commits that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
+msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:84
+#: en/git-fast-export.txt:93
#, ignore-same, no-wrap, priority:100
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
-#: en/git-fast-export.txt:89
+#: en/git-fast-export.txt:98
#, priority:100
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:90
+#: en/git-fast-export.txt:99
#, ignore-same, no-wrap, priority:100
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
-#: en/git-fast-export.txt:93
+#: en/git-fast-export.txt:102
#, priority:100
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:94
+#: en/git-fast-export.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
-#: en/git-fast-export.txt:101
+#: en/git-fast-export.txt:110
#, priority:100
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
+#: en/git-fast-export.txt:111 en/git-ls-tree.txt:72
#, ignore-same, no-wrap, priority:100
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
-#: en/git-fast-export.txt:107
+#: en/git-fast-export.txt:116
#, priority:100
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:108
+#: en/git-fast-export.txt:117
#, ignore-same, no-wrap, priority:100
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
-#: en/git-fast-export.txt:112
+#: en/git-fast-export.txt:121
#, priority:100
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:113
+#: en/git-fast-export.txt:122
#, ignore-same, no-wrap, priority:100
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
-#: en/git-fast-export.txt:124
+#: en/git-fast-export.txt:133
#, priority:100
-msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
+msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:125
+#: en/git-fast-export.txt:134
#, ignore-same, no-wrap, priority:100
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
-#: en/git-fast-export.txt:131
+#: en/git-fast-export.txt:140
#, priority:100
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:132
+#: en/git-fast-export.txt:141
+#, no-wrap, priority:100
+msgid "--reencode=(yes|no|abort)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:147
+#, priority:100
+msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be reencoded into UTF-8. With 'no', the original encoding will be preserved."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-export.txt:148
#, ignore-same, no-wrap, priority:100
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
-#: en/git-fast-export.txt:135
+#: en/git-fast-export.txt:151
#, priority:100
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:136
+#: en/git-fast-export.txt:152
#, ignore-ellipsis, no-wrap, priority:100
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:144
+#: en/git-fast-export.txt:160
#, priority:100
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:150
+#: en/git-fast-export.txt:166
#, no-wrap, priority:100
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:155
+#: en/git-fast-export.txt:171
#, priority:100
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:160
+#: en/git-fast-export.txt:176
#, no-wrap, priority:100
msgid ""
"$ git fast-export master~5..master |\n"
@@ -19141,55 +19812,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:164
+#: en/git-fast-export.txt:180
#, priority:100
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:168
+#: en/git-fast-export.txt:184
#, priority:100
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:187
#, no-wrap, priority:100
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:179
+#: en/git-fast-export.txt:195
#, priority:100
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:191
+#: en/git-fast-export.txt:207
#, priority:100
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:194
+#: en/git-fast-export.txt:210
#, priority:100
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:197
+#: en/git-fast-export.txt:213
#, no-wrap, priority:100
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:202
+#: en/git-fast-export.txt:218
#, priority:100
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:208
+#: en/git-fast-export.txt:224
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git init anon-repo\n"
@@ -19199,25 +19870,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:215
+#: en/git-fast-export.txt:231
#, priority:100
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:218
+#: en/git-fast-export.txt:234
#, no-wrap, priority:100
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:224
+#: en/git-fast-export.txt:240
#, priority:100
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:232
+#: en/git-fast-export.txt:248
#, priority:100
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
@@ -19451,7 +20122,7 @@ msgid "See linkgit:git-config[1]"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:144 en/git-p4.txt:507
+#: en/git-fast-import.txt:144 en/git-filter-branch.txt:463 en/git-p4.txt:507
#, no-wrap, priority:100
msgid "PERFORMANCE"
msgstr ""
@@ -19685,7 +20356,7 @@ msgid "fast-import accepts several commands to update the current repository and
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:319 en/git-fast-import.txt:381
+#: en/git-fast-import.txt:319 en/git-fast-import.txt:388
#, ignore-same, no-wrap, priority:100
msgid "`commit`"
msgstr "`commit`"
@@ -19697,7 +20368,7 @@ msgid "Creates a new branch or updates an existing branch by creating a new comm
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:324 en/git-fast-import.txt:759
+#: en/git-fast-import.txt:324 en/git-fast-import.txt:778
#, ignore-same, no-wrap, priority:100
msgid "`tag`"
msgstr "`tag`"
@@ -19709,7 +20380,7 @@ msgid "Creates an annotated tag object from an existing commit or branch. Light
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:330 en/git-fast-import.txt:803
+#: en/git-fast-import.txt:330 en/git-fast-import.txt:823
#, ignore-same, no-wrap, priority:100
msgid "`reset`"
msgstr "`reset`"
@@ -19721,7 +20392,7 @@ msgid "Reset an existing branch (or a new branch) to a specific revision. This
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:335 en/git-fast-import.txt:832
+#: en/git-fast-import.txt:335 en/git-fast-import.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`blob`"
msgstr "`blob`"
@@ -19733,109 +20404,121 @@ msgid "Convert raw file data into a blob, for future use in a `commit` command.
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:340 en/git-fast-import.txt:905
+#: en/git-fast-import.txt:340 en/git-fast-import.txt:925
+#, ignore-same, no-wrap, priority:100
+msgid "`alias`"
+msgstr "`alias`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:346
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
+msgstr ""
+
+#. type: Title ~
+#: en/git-fast-import.txt:347 en/git-fast-import.txt:940
#, ignore-same, no-wrap, priority:100
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
-#: en/git-fast-import.txt:345
+#: en/git-fast-import.txt:352
#, priority:100
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:346 en/git-fast-import.txt:933
+#: en/git-fast-import.txt:353 en/git-fast-import.txt:968
#, ignore-same, no-wrap, priority:100
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
-#: en/git-fast-import.txt:350
+#: en/git-fast-import.txt:357
#, priority:100
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:351 en/git-fast-import.txt:1143
+#: en/git-fast-import.txt:358 en/git-fast-import.txt:1175
#, ignore-same, no-wrap, priority:100
msgid "`done`"
msgstr "`done`"
#. type: Plain text
-#: en/git-fast-import.txt:355
+#: en/git-fast-import.txt:362
#, priority:100
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:356 en/git-fast-import.txt:958
+#: en/git-fast-import.txt:363 en/git-fast-import.txt:993
#, ignore-same, no-wrap, priority:100
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
-#: en/git-fast-import.txt:360
+#: en/git-fast-import.txt:367
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:361 en/git-fast-import.txt:977
+#: en/git-fast-import.txt:368 en/git-fast-import.txt:1008
#, ignore-same, no-wrap, priority:100
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
-#: en/git-fast-import.txt:365
+#: en/git-fast-import.txt:372
#, priority:100
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:366 en/git-fast-import.txt:1007
+#: en/git-fast-import.txt:373 en/git-fast-import.txt:1039
#, ignore-same, no-wrap, priority:100
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
-#: en/git-fast-import.txt:370
+#: en/git-fast-import.txt:377
#, priority:100
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:371 en/git-fast-import.txt:1060
+#: en/git-fast-import.txt:378 en/git-fast-import.txt:1092
#, ignore-same, no-wrap, priority:100
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
#, priority:100
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:1147
#, ignore-same, no-wrap, priority:100
msgid "`option`"
msgstr "`option`"
#. type: Plain text
-#: en/git-fast-import.txt:379
+#: en/git-fast-import.txt:386
#, priority:100
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:384
+#: en/git-fast-import.txt:391
#, priority:100
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:396
+#: en/git-fast-import.txt:404
#, no-wrap, priority:100
msgid ""
"\t'commit' SP <ref> LF\n"
@@ -19843,237 +20526,250 @@ msgid ""
"\toriginal-oid?\n"
"\t('author' (SP <name>)? SP LT <email> GT SP <when> LF)?\n"
"\t'committer' (SP <name>)? SP LT <email> GT SP <when> LF\n"
+"\t('encoding' SP <encoding>)?\n"
"\tdata\n"
"\t('from' SP <commit-ish> LF)?\n"
-"\t('merge' SP <commit-ish> LF)?\n"
+"\t('merge' SP <commit-ish> LF)*\n"
"\t(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*\n"
"\tLF?\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:404
+#: en/git-fast-import.txt:412
#, priority:100
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:410
+#: en/git-fast-import.txt:418
#, priority:100
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:416
+#: en/git-fast-import.txt:424
#, priority:100
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:424
+#: en/git-fast-import.txt:432
#, priority:100
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:426 en/git-fast-import.txt:819 en/git-fast-import.txt:931
+#: en/git-fast-import.txt:439
#, priority:100
-msgid "The `LF` after the command is optional (it used to be required)."
+msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:428
+#: en/git-fast-import.txt:441
#, ignore-same, no-wrap, priority:100
msgid "`author`"
msgstr "`author`"
#. type: Plain text
-#: en/git-fast-import.txt:434
+#: en/git-fast-import.txt:447
#, priority:100
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:436
+#: en/git-fast-import.txt:449
#, ignore-same, no-wrap, priority:100
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
-#: en/git-fast-import.txt:439
+#: en/git-fast-import.txt:452
#, priority:100
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:447
+#: en/git-fast-import.txt:460
#, priority:100
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:452
+#: en/git-fast-import.txt:465
#, priority:100
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:454
+#: en/git-fast-import.txt:467
+#, ignore-same, no-wrap, priority:100
+msgid "`encoding`"
+msgstr "`encoding`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:471
+#, priority:100
+msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
+msgstr ""
+
+#. type: Title ^
+#: en/git-fast-import.txt:473
#, ignore-same, no-wrap, priority:100
msgid "`from`"
msgstr "`from`"
#. type: Plain text
-#: en/git-fast-import.txt:460
+#: en/git-fast-import.txt:479
#, priority:100
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:470
+#: en/git-fast-import.txt:489
#, priority:100
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:473
+#: en/git-fast-import.txt:492
#, priority:100
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:475
+#: en/git-fast-import.txt:494
#, priority:100
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:479
+#: en/git-fast-import.txt:498
#, priority:100
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:481
+#: en/git-fast-import.txt:500
#, priority:100
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:506
#, priority:100
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:489
+#: en/git-fast-import.txt:508
#, priority:100
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:491
+#: en/git-fast-import.txt:510
#, priority:100
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:494
+#: en/git-fast-import.txt:513
#, priority:100
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:497
+#: en/git-fast-import.txt:516
#, priority:100
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:500
+#: en/git-fast-import.txt:519
#, priority:100
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-import.txt:502
+#: en/git-fast-import.txt:521
#, no-wrap, priority:100
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:509
+#: en/git-fast-import.txt:528
#, priority:100
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:511
+#: en/git-fast-import.txt:530
#, ignore-same, no-wrap, priority:100
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
-#: en/git-fast-import.txt:519
+#: en/git-fast-import.txt:538
#, priority:100
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:522
+#: en/git-fast-import.txt:541
#, priority:100
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:524
+#: en/git-fast-import.txt:543
#, ignore-same, no-wrap, priority:100
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:528
+#: en/git-fast-import.txt:547
#, priority:100
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:529 en/git-fast-import.txt:696
+#: en/git-fast-import.txt:548 en/git-fast-import.txt:715
#, no-wrap, priority:100
msgid "External data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:532
+#: en/git-fast-import.txt:551
#, priority:100
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:535
+#: en/git-fast-import.txt:554
#, no-wrap, priority:100
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:542
+#: en/git-fast-import.txt:561
#, priority:100
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:543 en/git-fast-import.txt:709
+#: en/git-fast-import.txt:562 en/git-fast-import.txt:728
#, no-wrap, priority:100
msgid "Inline data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:547
+#: en/git-fast-import.txt:566
#, priority:100
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:551
+#: en/git-fast-import.txt:570
#, no-wrap, priority:100
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -20081,259 +20777,259 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:554 en/git-fast-import.txt:720
+#: en/git-fast-import.txt:573 en/git-fast-import.txt:739
#, priority:100
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:557
+#: en/git-fast-import.txt:576
#, priority:100
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:561
+#: en/git-fast-import.txt:580
#, priority:100
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:562
+#: en/git-fast-import.txt:581
#, priority:100
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:582
#, priority:100
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:566
+#: en/git-fast-import.txt:585
#, priority:100
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:568
+#: en/git-fast-import.txt:587
#, priority:100
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:571
+#: en/git-fast-import.txt:590
#, priority:100
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:575
+#: en/git-fast-import.txt:594
#, priority:100
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:582
+#: en/git-fast-import.txt:601
#, priority:100
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:584
+#: en/git-fast-import.txt:603
#, priority:100
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:586
+#: en/git-fast-import.txt:605
#, priority:100
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:587
+#: en/git-fast-import.txt:606
#, priority:100
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:588
+#: en/git-fast-import.txt:607
#, priority:100
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:590
+#: en/git-fast-import.txt:609
#, priority:100
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:592
+#: en/git-fast-import.txt:611
#, priority:100
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:594
+#: en/git-fast-import.txt:613
#, priority:100
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:615
#, ignore-same, no-wrap, priority:100
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
-#: en/git-fast-import.txt:602
+#: en/git-fast-import.txt:621
#, priority:100
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:605
+#: en/git-fast-import.txt:624
#, no-wrap, priority:100
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:610
+#: en/git-fast-import.txt:629
#, priority:100
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:612
+#: en/git-fast-import.txt:631
#, ignore-same, no-wrap, priority:100
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:636
#, priority:100
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:620
+#: en/git-fast-import.txt:639
#, no-wrap, priority:100
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:626 en/git-fast-import.txt:646
+#: en/git-fast-import.txt:645 en/git-fast-import.txt:665
#, priority:100
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:631
+#: en/git-fast-import.txt:650
#, priority:100
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:633
+#: en/git-fast-import.txt:652
#, ignore-same, no-wrap, priority:100
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
-#: en/git-fast-import.txt:637
+#: en/git-fast-import.txt:656
#, priority:100
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:640
+#: en/git-fast-import.txt:659
#, no-wrap, priority:100
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:651
+#: en/git-fast-import.txt:670
#, priority:100
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:660
+#: en/git-fast-import.txt:679
#, priority:100
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:662
+#: en/git-fast-import.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
-#: en/git-fast-import.txt:667
+#: en/git-fast-import.txt:686
#, priority:100
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:670
+#: en/git-fast-import.txt:689
#, no-wrap, priority:100
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:676
+#: en/git-fast-import.txt:695
#, priority:100
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:684
+#: en/git-fast-import.txt:703
#, priority:100
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:686
+#: en/git-fast-import.txt:705
#, ignore-same, no-wrap, priority:100
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:695
+#: en/git-fast-import.txt:714
#, priority:100
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:700
+#: en/git-fast-import.txt:719
#, priority:100
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:703
+#: en/git-fast-import.txt:722
#, no-wrap, priority:100
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:708
+#: en/git-fast-import.txt:727
#, priority:100
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:713
+#: en/git-fast-import.txt:732
#, priority:100
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:717
+#: en/git-fast-import.txt:736
#, no-wrap, priority:100
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -20341,76 +21037,77 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:723
+#: en/git-fast-import.txt:742
#, priority:100
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:725
+#: en/git-fast-import.txt:744
#, ignore-same, no-wrap, priority:100
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
-#: en/git-fast-import.txt:731
+#: en/git-fast-import.txt:750
#, priority:100
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:734
+#: en/git-fast-import.txt:753
#, no-wrap, priority:100
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:740
+#: en/git-fast-import.txt:759
#, priority:100
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:744
+#: en/git-fast-import.txt:763
#, priority:100
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:746
+#: en/git-fast-import.txt:765
#, ignore-same, no-wrap, priority:100
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
-#: en/git-fast-import.txt:751
+#: en/git-fast-import.txt:770
#, priority:100
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:754
+#: en/git-fast-import.txt:773
#, no-wrap, priority:100
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:757
+#: en/git-fast-import.txt:776
#, priority:100
msgid "where `<object-identifer>` is any string not containing LF."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:762
+#: en/git-fast-import.txt:781
#, priority:100
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:769
+#: en/git-fast-import.txt:789
#, no-wrap, priority:100
msgid ""
"\t'tag' SP <name> LF\n"
+"\tmark?\n"
"\t'from' SP <commit-ish> LF\n"
"\toriginal-oid?\n"
"\t'tagger' (SP <name>)? SP LT <email> GT SP <when> LF\n"
@@ -20418,55 +21115,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:772
+#: en/git-fast-import.txt:792
#, priority:100
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:777
+#: en/git-fast-import.txt:797
#, priority:100
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:781
+#: en/git-fast-import.txt:801
#, priority:100
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:784
+#: en/git-fast-import.txt:804
#, priority:100
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:787
+#: en/git-fast-import.txt:807
#, priority:100
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:793
+#: en/git-fast-import.txt:813
#, priority:100
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:801
+#: en/git-fast-import.txt:821
#, priority:100
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:808
+#: en/git-fast-import.txt:828
#, priority:100
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:813
+#: en/git-fast-import.txt:833
#, no-wrap, priority:100
msgid ""
"\t'reset' SP <ref> LF\n"
@@ -20475,19 +21172,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:817
+#: en/git-fast-import.txt:837
#, priority:100
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:822
+#: en/git-fast-import.txt:839 en/git-fast-import.txt:966
+#, priority:100
+msgid "The `LF` after the command is optional (it used to be required)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:842
#, priority:100
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:826
+#: en/git-fast-import.txt:846
#, no-wrap, priority:100
msgid ""
"\treset refs/tags/938\n"
@@ -20495,19 +21198,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:830
+#: en/git-fast-import.txt:850
#, priority:100
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:837
+#: en/git-fast-import.txt:857
#, priority:100
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:843
+#: en/git-fast-import.txt:863
#, no-wrap, priority:100
msgid ""
"\t'blob' LF\n"
@@ -20517,43 +21220,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:849
+#: en/git-fast-import.txt:869
#, priority:100
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:851
+#: en/git-fast-import.txt:871
#, ignore-same, no-wrap, priority:100
msgid "`data`"
msgstr "`data`"
#. type: Plain text
-#: en/git-fast-import.txt:858
+#: en/git-fast-import.txt:878
#, priority:100
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:883
#, priority:100
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:864
+#: en/git-fast-import.txt:884
#, no-wrap, priority:100
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:866
+#: en/git-fast-import.txt:886
#, priority:100
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:870
+#: en/git-fast-import.txt:890
#, no-wrap, priority:100
msgid ""
"\t'data' SP <count> LF\n"
@@ -20561,31 +21264,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:876
+#: en/git-fast-import.txt:896
#, priority:100
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:881
+#: en/git-fast-import.txt:901
#, priority:100
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:882
+#: en/git-fast-import.txt:902
#, no-wrap, priority:100
msgid "Delimited format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:887
+#: en/git-fast-import.txt:907
#, priority:100
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:893
+#: en/git-fast-import.txt:913
#, no-wrap, priority:100
msgid ""
"\t'data' SP '<<' <delim> LF\n"
@@ -20595,25 +21298,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:901
+#: en/git-fast-import.txt:921
#, priority:100
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:903
+#: en/git-fast-import.txt:923
#, priority:100
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:908
+#: en/git-fast-import.txt:928
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object."
+msgstr ""
+
+#. type: delimited block .
+#: en/git-fast-import.txt:934
+#, no-wrap, priority:100
+msgid ""
+"\t'alias' LF\n"
+"\tmark\n"
+"\t'to' SP <commit-ish> LF\n"
+"\tLF?\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:937
+#, priority:100
+msgid "For a detailed description of `<commit-ish>` see above under `from`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:943
#, priority:100
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:912
+#: en/git-fast-import.txt:947
#, no-wrap, priority:100
msgid ""
"\t'checkpoint' LF\n"
@@ -20621,31 +21346,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:918
+#: en/git-fast-import.txt:953
#, priority:100
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:923
+#: en/git-fast-import.txt:958
#, priority:100
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:929
+#: en/git-fast-import.txt:964
#, priority:100
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:938
+#: en/git-fast-import.txt:973
#, priority:100
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:942
+#: en/git-fast-import.txt:977
#, no-wrap, priority:100
msgid ""
"\t'progress' SP <any> LF\n"
@@ -20653,73 +21378,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:948
+#: en/git-fast-import.txt:983
#, priority:100
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:951
+#: en/git-fast-import.txt:986
#, no-wrap, priority:100
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:956
+#: en/git-fast-import.txt:991
#, priority:100
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:964
+#: en/git-fast-import.txt:999
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:967
+#: en/git-fast-import.txt:1002
#, no-wrap, priority:100
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:972
-#, priority:100
-msgid "This command can be used anywhere in the stream that comments are accepted. In particular, the `get-mark` command can be used in the middle of a commit but not in the middle of a `data` command."
-msgstr ""
-
-#. type: Plain text
-#: en/git-fast-import.txt:975 en/git-fast-import.txt:1005 en/git-fast-import.txt:1058
+#: en/git-fast-import.txt:1006 en/git-fast-import.txt:1037 en/git-fast-import.txt:1090
#, priority:100
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:983
+#: en/git-fast-import.txt:1014
#, priority:100
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:986
+#: en/git-fast-import.txt:1017
#, no-wrap, priority:100
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:991
+#: en/git-fast-import.txt:1022
#, priority:100
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:993
+#: en/git-fast-import.txt:1024
#, priority:100
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:997
+#: en/git-fast-import.txt:1028
#, no-wrap, priority:100
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
@@ -20727,283 +21446,283 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1002
+#: en/git-fast-import.txt:1034
#, priority:100
-msgid "This command can be used anywhere in the stream that comments are accepted. In particular, the `cat-blob` command can be used in the middle of a commit but not in the middle of a `data` command."
+msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1013
+#: en/git-fast-import.txt:1045
#, priority:100
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1016
+#: en/git-fast-import.txt:1048
#, priority:100
-msgid "The `ls` command can be used anywhere in the stream that comments are accepted, including the middle of a commit."
+msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1017
+#: en/git-fast-import.txt:1049
#, no-wrap, priority:100
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1021
+#: en/git-fast-import.txt:1053
#, priority:100
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1024
+#: en/git-fast-import.txt:1056
#, no-wrap, priority:100
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1058
#, no-wrap, priority:100
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1032
+#: en/git-fast-import.txt:1064
#, priority:100
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1035
+#: en/git-fast-import.txt:1067
#, no-wrap, priority:100
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1038
+#: en/git-fast-import.txt:1070
#, priority:100
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1040
+#: en/git-fast-import.txt:1072
#, priority:100
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1043
+#: en/git-fast-import.txt:1075
#, no-wrap, priority:100
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1048
+#: en/git-fast-import.txt:1080
#, priority:100
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1051
+#: en/git-fast-import.txt:1083
#, priority:100
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1054
+#: en/git-fast-import.txt:1086
#, no-wrap, priority:100
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1095
#, priority:100
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1066
+#: en/git-fast-import.txt:1098
#, no-wrap, priority:100
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:1101
#, priority:100
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1070 en/git-fast-import.txt:1137
+#: en/git-fast-import.txt:1102 en/git-fast-import.txt:1169
#, no-wrap, priority:100
msgid "date-format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1071 en/git-fast-import.txt:1139
+#: en/git-fast-import.txt:1103 en/git-fast-import.txt:1171
#, no-wrap, priority:100
msgid "export-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1072
+#: en/git-fast-import.txt:1104
#, no-wrap, priority:100
msgid "relative-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1073
+#: en/git-fast-import.txt:1105
#, no-wrap, priority:100
msgid "no-relative-marks"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1074 en/git-fast-import.txt:1141
+#: en/git-fast-import.txt:1106 en/git-fast-import.txt:1173
#, no-wrap, priority:100
msgid "force"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1078
+#: en/git-fast-import.txt:1110
#, priority:100
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1079 en/git-fast-import.txt:1138
+#: en/git-fast-import.txt:1111 en/git-fast-import.txt:1170
#, no-wrap, priority:100
msgid "import-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1080
+#: en/git-fast-import.txt:1112
#, no-wrap, priority:100
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1088
+#: en/git-fast-import.txt:1120
#, priority:100
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1089
+#: en/git-fast-import.txt:1121
#, no-wrap, priority:100
msgid "get-mark"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1090
+#: en/git-fast-import.txt:1122
#, no-wrap, priority:100
msgid "cat-blob"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1091
+#: en/git-fast-import.txt:1123
#, no-wrap, priority:100
msgid "ls"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1131
#, priority:100
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1100
+#: en/git-fast-import.txt:1132
#, no-wrap, priority:100
msgid "notes"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1105
+#: en/git-fast-import.txt:1137
#, priority:100
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1106
+#: en/git-fast-import.txt:1138
#, no-wrap, priority:100
msgid "done"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1113
+#: en/git-fast-import.txt:1145
#, priority:100
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1120
+#: en/git-fast-import.txt:1152
#, priority:100
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1123
+#: en/git-fast-import.txt:1155
#, no-wrap, priority:100
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1128
+#: en/git-fast-import.txt:1160
#, priority:100
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1132
+#: en/git-fast-import.txt:1164
#, priority:100
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1135
+#: en/git-fast-import.txt:1167
#, priority:100
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1140
+#: en/git-fast-import.txt:1172
#, priority:100
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1146
+#: en/git-fast-import.txt:1178
#, priority:100
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1150
+#: en/git-fast-import.txt:1182
#, priority:100
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1152
+#: en/git-fast-import.txt:1184
#, no-wrap, priority:100
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1159
+#: en/git-fast-import.txt:1191
#, priority:100
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1166
+#: en/git-fast-import.txt:1198
#, priority:100
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1171
+#: en/git-fast-import.txt:1203
#, no-wrap, priority:100
msgid ""
"\tmkfifo fast-import-output\n"
@@ -21012,49 +21731,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1175
+#: en/git-fast-import.txt:1207
#, priority:100
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1179
+#: en/git-fast-import.txt:1211
#, priority:100
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1181
+#: en/git-fast-import.txt:1213
#, no-wrap, priority:100
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1187
+#: en/git-fast-import.txt:1219
#, priority:100
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1194
+#: en/git-fast-import.txt:1226
#, priority:100
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1202
+#: en/git-fast-import.txt:1234
#, priority:100
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1204
+#: en/git-fast-import.txt:1236
#, priority:100
msgid "An example crash:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1220
+#: en/git-fast-import.txt:1252
#, no-wrap, priority:100
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
@@ -21074,7 +21793,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1224
+#: en/git-fast-import.txt:1256
#, no-wrap, priority:100
msgid ""
"\t$ git fast-import <in\n"
@@ -21083,7 +21802,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1230
+#: en/git-fast-import.txt:1262
#, no-wrap, priority:100
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
@@ -21094,13 +21813,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1232
+#: en/git-fast-import.txt:1264
#, no-wrap, priority:100
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1242
+#: en/git-fast-import.txt:1274
#, no-wrap, priority:100
msgid ""
"\tMost Recent Commands Before Crash\n"
@@ -21115,13 +21834,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1243
+#: en/git-fast-import.txt:1275
#, no-wrap, priority:100
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1246
+#: en/git-fast-import.txt:1278
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
@@ -21129,25 +21848,25 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1247
+#: en/git-fast-import.txt:1279
#, no-wrap, priority:100
msgid "active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1250
+#: en/git-fast-import.txt:1282
#, priority:100
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1251
+#: en/git-fast-import.txt:1283
#, priority:100
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1255
+#: en/git-fast-import.txt:1287
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
@@ -21156,7 +21875,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1261
+#: en/git-fast-import.txt:1293
#, no-wrap, priority:100
msgid ""
"status : active loaded dirty\n"
@@ -21168,301 +21887,307 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1265
+#: en/git-fast-import.txt:1297
#, priority:100
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1268
+#: en/git-fast-import.txt:1300
#, no-wrap, priority:100
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1271
+#: en/git-fast-import.txt:1303
#, priority:100
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1273
+#: en/git-fast-import.txt:1305
#, no-wrap, priority:100
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1281
+#: en/git-fast-import.txt:1313
#, priority:100
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1285
+#: en/git-fast-import.txt:1317
#, priority:100
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1287
+#: en/git-fast-import.txt:1319
#, no-wrap, priority:100
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1292
+#: en/git-fast-import.txt:1324
#, priority:100
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1296
+#: en/git-fast-import.txt:1328
#, priority:100
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1298
+#: en/git-fast-import.txt:1330
#, no-wrap, priority:100
msgid "Handling Renames"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1303
+#: en/git-fast-import.txt:1335
#, priority:100
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1305
+#: en/git-fast-import.txt:1337
#, no-wrap, priority:100
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1309
+#: en/git-fast-import.txt:1341
#, priority:100
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1316
+#: en/git-fast-import.txt:1348
#, priority:100
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1322
+#: en/git-fast-import.txt:1354
#, priority:100
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1328
+#: en/git-fast-import.txt:1360
#, priority:100
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1331
+#: en/git-fast-import.txt:1363
#, priority:100
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1333
+#: en/git-fast-import.txt:1365
#, no-wrap, priority:100
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1337
+#: en/git-fast-import.txt:1369
#, priority:100
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1344
+#: en/git-fast-import.txt:1376
#, priority:100
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1349
+#: en/git-fast-import.txt:1381
#, priority:100
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1351
+#: en/git-fast-import.txt:1383
#, no-wrap, priority:100
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1358
+#: en/git-fast-import.txt:1390
#, priority:100
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1360
+#: en/git-fast-import.txt:1392
#, no-wrap, priority:100
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1367
+#: en/git-fast-import.txt:1399
#, priority:100
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1370
+#: en/git-fast-import.txt:1402
#, no-wrap, priority:100
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1408
#, priority:100
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1384
+#: en/git-fast-import.txt:1416
#, priority:100
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1391
+#: en/git-fast-import.txt:1423
#, priority:100
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1398
+#: en/git-fast-import.txt:1430
#, priority:100
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
+#. type: Plain text
+#: en/git-fast-import.txt:1438
+#, priority:100
+msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
+msgstr ""
+
#. type: Title -
-#: en/git-fast-import.txt:1401
+#: en/git-fast-import.txt:1440
#, no-wrap, priority:100
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1407
+#: en/git-fast-import.txt:1446
#, priority:100
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1409
+#: en/git-fast-import.txt:1448
#, no-wrap, priority:100
msgid "per object"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1416
+#: en/git-fast-import.txt:1455
#, priority:100
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1422
+#: en/git-fast-import.txt:1461
#, priority:100
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1424
+#: en/git-fast-import.txt:1463
#, no-wrap, priority:100
msgid "per mark"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1430
+#: en/git-fast-import.txt:1469
#, priority:100
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1432
+#: en/git-fast-import.txt:1471
#, no-wrap, priority:100
msgid "per branch"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1435
+#: en/git-fast-import.txt:1474
#, priority:100
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1441
+#: en/git-fast-import.txt:1480
#, priority:100
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1448
+#: en/git-fast-import.txt:1487
#, priority:100
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1452
+#: en/git-fast-import.txt:1491
#, priority:100
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1457
+#: en/git-fast-import.txt:1496
#, priority:100
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1459
+#: en/git-fast-import.txt:1498
#, no-wrap, priority:100
msgid "per active tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1464
+#: en/git-fast-import.txt:1503
#, priority:100
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1466
+#: en/git-fast-import.txt:1505
#, no-wrap, priority:100
msgid "per active file entry"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1472
+#: en/git-fast-import.txt:1511
#, priority:100
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1477
+#: en/git-fast-import.txt:1516
#, priority:100
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1479
+#: en/git-fast-import.txt:1518
#, no-wrap, priority:100
msgid "SIGNALS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1485
+#: en/git-fast-import.txt:1524
#, priority:100
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -21603,12 +22328,6 @@ msgstr "--deepen-relative"
msgid "Argument --depth specifies the number of commits from the current shallow boundary instead of from the tip of each remote branch history."
msgstr ""
-#. type: Labeled list
-#: en/git-fetch-pack.txt:104 en/merge-options.txt:130
-#, ignore-same, no-wrap, priority:240
-msgid "--no-progress"
-msgstr "--no-progress"
-
#. type: Plain text
#: en/git-fetch-pack.txt:106
#, priority:100
@@ -22029,7 +22748,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1037
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -22091,7 +22810,7 @@ msgstr ""
#. type: Plain text
#: en/git-fetch.txt:267
#, priority:220
-msgid "The `pu` branch will be updated even if it is does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
+msgid "The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
msgstr ""
#. type: Plain text
@@ -22115,9 +22834,9 @@ msgid "The first command fetches the `maint` branch from the repository at `git:
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:292 en/git-pull.txt:255
+#: en/git-fetch.txt:292 en/git-pull.txt:256
#, priority:220
-msgid "Using --recurse-submodules can only fetch new commits in already checked out submodules right now. When e.g. upstream added a new submodule in the just fetched commits of the superproject the submodule itself can not be fetched, making it impossible to check out that submodule later without having to do a fetch again. This is expected to be fixed in a future Git version."
+msgid "Using --recurse-submodules can only fetch new commits in already checked out submodules right now. When e.g. upstream added a new submodule in the just fetched commits of the superproject the submodule itself cannot be fetched, making it impossible to check out that submodule later without having to do a fetch again. This is expected to be fixed in a future Git version."
msgstr ""
#. type: Title =
@@ -22145,20 +22864,32 @@ msgid ""
"\t[--state-branch <branch>] [--] [<rev-list options>...]\n"
msgstr ""
+#. type: Title -
+#: en/git-filter-branch.txt:20
+#, no-wrap, priority:100
+msgid "WARNING"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:31
+#, priority:100
+msgid "'git filter-branch' has a plethora of pitfalls that can produce non-obvious manglings of the intended history rewrite (and can leave you with little time to investigate such problems since it has such abysmal performance). These safety and performance issues cannot be backward compatibly fixed and as such, its use is not recommended. Please use an alternative history filtering tool such as https://github.com/newren/git-filter-repo/[git filter-repo]. If you still need to use 'git filter-branch', please carefully read <<SAFETY>> (and <<PERFORMANCE>>) to learn about the land mines of filter-branch, and then vigilantly avoid as many of the hazards listed there as reasonably possible."
+msgstr ""
+
#. type: Plain text
-#: en/git-filter-branch.txt:27
+#: en/git-filter-branch.txt:40
#, priority:100
msgid "Lets you rewrite Git revision history by rewriting the branches mentioned in the <rev-list options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge information) will be preserved."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:34
+#: en/git-filter-branch.txt:47
#, priority:100
msgid "The command will only rewrite the _positive_ refs mentioned in the command line (e.g. if you pass 'a..b', only 'b' will be rewritten). If you specify no filters, the commits will be recommitted without any changes, which would normally have no effect. Nevertheless, this may be useful in the future for compensating for some Git bugs or such, therefore such a usage is permitted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:39
+#: en/git-filter-branch.txt:52
#, no-wrap, priority:100
msgid ""
"*NOTE*: This command honors `.git/info/grafts` file and refs in\n"
@@ -22168,7 +22899,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:48
+#: en/git-filter-branch.txt:61
#, no-wrap, priority:100
msgid ""
"*WARNING*! The rewritten history will have different object names for all\n"
@@ -22182,337 +22913,337 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:52
+#: en/git-filter-branch.txt:65
#, priority:100
msgid "Always verify that the rewritten version is correct: The original refs, if different from the rewritten ones, will be stored in the namespace 'refs/original/'."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:56
+#: en/git-filter-branch.txt:69
#, priority:100
msgid "Note that since this operation is very I/O expensive, it might be a good idea to redirect the temporary directory off-disk with the `-d` option, e.g. on tmpfs. Reportedly the speedup is very noticeable."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:59
+#: en/git-filter-branch.txt:72
#, no-wrap, priority:100
msgid "Filters"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:71
+#: en/git-filter-branch.txt:84
#, priority:100
msgid "The filters are applied in the order as listed below. The <command> argument is always evaluated in the shell context using the 'eval' command (with the notable exception of the commit filter, for technical reasons). Prior to that, the `$GIT_COMMIT` environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, and GIT_COMMITTER_DATE are taken from the current commit and exported to the environment, in order to affect the author and committer identities of the replacement commit created by linkgit:git-commit-tree[1] after the filters have run."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:74
+#: en/git-filter-branch.txt:87
#, priority:100
msgid "If any evaluation of <command> returns a non-zero exit status, the whole operation will be aborted."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:80
+#: en/git-filter-branch.txt:93
#, priority:100
msgid "A 'map' function is available that takes an \"original sha1 id\" argument and outputs a \"rewritten sha1 id\" if the commit has been already rewritten, and \"original sha1 id\" otherwise; the 'map' function can return several ids on separate lines if your commit filter emitted multiple commits."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:85
+#: en/git-filter-branch.txt:98
#, no-wrap, priority:100
msgid "--setup <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:91
+#: en/git-filter-branch.txt:104
#, priority:100
msgid "This is not a real filter executed for each commit but a one time setup just before the loop. Therefore no commit-specific variables are defined yet. Functions or variables defined here can be used or modified in the following filter steps except the commit filter, for technical reasons."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:92
+#: en/git-filter-branch.txt:105
#, no-wrap, priority:100
msgid "--subdirectory-filter <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:96
+#: en/git-filter-branch.txt:109
#, priority:100
msgid "Only look at the history which touches the given subdirectory. The result will contain that directory (and only that) as its project root. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:97
+#: en/git-filter-branch.txt:110
#, no-wrap, priority:100
msgid "--env-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:102
+#: en/git-filter-branch.txt:115
#, priority:100
msgid "This filter may be used if you only need to modify the environment in which the commit will be performed. Specifically, you might want to rewrite the author/committer name/email/time environment variables (see linkgit:git-commit-tree[1] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:103
+#: en/git-filter-branch.txt:116
#, no-wrap, priority:100
msgid "--tree-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:110
+#: en/git-filter-branch.txt:123
#, priority:100
msgid "This is the filter for rewriting the tree and its contents. The argument is evaluated in shell with the working directory set to the root of the checked out tree. The new tree is then used as-is (new files are auto-added, disappeared files are auto-removed - neither .gitignore files nor any other ignore rules *HAVE ANY EFFECT*!)."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:111
+#: en/git-filter-branch.txt:124
#, no-wrap, priority:100
msgid "--index-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:117
+#: en/git-filter-branch.txt:130
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the index. It is similar to the tree filter but does not check out the tree, which makes it much faster. Frequently used with `git rm --cached --ignore-unmatch ...`, see EXAMPLES below. For hairy cases, see linkgit:git-update-index[1]."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:118
+#: en/git-filter-branch.txt:131
#, no-wrap, priority:100
msgid "--parent-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:125
+#: en/git-filter-branch.txt:138
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the commit's parent list. It will receive the parent string on stdin and shall output the new parent string on stdout. The parent string is in the format described in linkgit:git-commit-tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and \"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:126
+#: en/git-filter-branch.txt:139
#, no-wrap, priority:100
msgid "--msg-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:131
+#: en/git-filter-branch.txt:144
#, priority:100
msgid "This is the filter for rewriting the commit messages. The argument is evaluated in the shell with the original commit message on standard input; its standard output is used as the new commit message."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:132
+#: en/git-filter-branch.txt:145
#, no-wrap, priority:100
msgid "--commit-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:138
+#: en/git-filter-branch.txt:151
#, ignore-ellipsis, priority:100
msgid "This is the filter for performing the commit. If this filter is specified, it will be called instead of the 'git commit-tree' command, with arguments of the form \"<TREE_ID> [(-p <PARENT_COMMIT_ID>)...]\" and the log message on stdin. The commit id is expected on stdout."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:142
+#: en/git-filter-branch.txt:155
#, priority:100
msgid "As a special extension, the commit filter may emit multiple commit ids; in that case, the rewritten children of the original commit will have all of them as parents."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:147
+#: en/git-filter-branch.txt:160
#, priority:100
msgid "You can use the 'map' convenience function in this filter, and other convenience functions, too. For example, calling 'skip_commit \"$@\"' will leave out the current commit (but not its changes! If you want that, use 'git rebase' instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:151
+#: en/git-filter-branch.txt:164
#, priority:100
msgid "You can also use the `git_commit_non_empty_tree \"$@\"` instead of `git commit-tree \"$@\"` if you don't wish to keep commits with a single parent and that makes no change to the tree."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:152
+#: en/git-filter-branch.txt:165
#, no-wrap, priority:100
msgid "--tag-name-filter <command>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:158
+#: en/git-filter-branch.txt:171
#, priority:100
msgid "This is the filter for rewriting tag names. When passed, it will be called for every tag ref that points to a rewritten object (or to a tag object which points to a rewritten object). The original tag name is passed via standard input, and the new tag name is expected on standard output."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:163
+#: en/git-filter-branch.txt:176
#, priority:100
msgid "The original tags are not deleted, but can be overwritten; use \"--tag-name-filter cat\" to simply update the tags. In this case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:174
+#: en/git-filter-branch.txt:187
#, priority:100
msgid "Nearly proper rewriting of tag objects is supported. If the tag has a message attached, a new tag object will be created with the same message, author, and timestamp. If the tag has a signature attached, the signature will be stripped. It is by definition impossible to preserve signatures. The reason this is \"nearly\" proper, is because ideally if the tag did not change (points to the same object, has the same name, etc.) it should retain any signature. That is not the case, signatures will always be removed, buyer beware. There is also no support for changing the author or timestamp (or the tag message for that matter). Tags which point to other tags will be rewritten to point to the underlying commit."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:175
+#: en/git-filter-branch.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--prune-empty"
msgstr "--prune-empty"
#. type: Plain text
-#: en/git-filter-branch.txt:182
+#: en/git-filter-branch.txt:195
#, priority:100
msgid "Some filters will generate empty commits that leave the tree untouched. This option instructs git-filter-branch to remove such commits if they have exactly one or zero non-pruned parents; merge commits will therefore remain intact. This option cannot be used together with `--commit-filter`, though the same effect can be achieved by using the provided `git_commit_non_empty_tree` function in a commit filter."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:183
+#: en/git-filter-branch.txt:196
#, no-wrap, priority:100
msgid "--original <namespace>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:186
+#: en/git-filter-branch.txt:199
#, priority:100
msgid "Use this option to set the namespace where the original commits will be stored. The default value is 'refs/original'."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:187
+#: en/git-filter-branch.txt:200
#, no-wrap, priority:100
msgid "-d <directory>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:194
+#: en/git-filter-branch.txt:207
#, priority:100
-msgid "Use this option to set the path to the temporary directory used for rewriting. When applying a tree filter, the command needs to temporarily check out the tree to some directory, which may consume considerable space in case of large projects. By default it does this in the '.git-rewrite/' directory but you can override that choice by this parameter."
+msgid "Use this option to set the path to the temporary directory used for rewriting. When applying a tree filter, the command needs to temporarily check out the tree to some directory, which may consume considerable space in case of large projects. By default it does this in the `.git-rewrite/` directory but you can override that choice by this parameter."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:200
+#: en/git-filter-branch.txt:213
#, priority:100
msgid "'git filter-branch' refuses to start with an existing temporary directory or when there are already refs starting with 'refs/original/', unless forced."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:201
+#: en/git-filter-branch.txt:214
#, no-wrap, priority:100
msgid "--state-branch <branch>"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:206
+#: en/git-filter-branch.txt:219
#, priority:100
msgid "This option will cause the mapping from old to new objects to be loaded from named branch upon startup and saved as a new commit to that branch upon exit, enabling incremental of large trees. If '<branch>' does not exist it will be created."
msgstr ""
#. type: Labeled list
-#: en/git-filter-branch.txt:207
+#: en/git-filter-branch.txt:220
#, ignore-ellipsis, no-wrap, priority:100
msgid "<rev-list options>..."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:212
+#: en/git-filter-branch.txt:225
#, priority:100
msgid "Arguments for 'git rev-list'. All positive refs included by these options are rewritten. You may also specify options such as `--all`, but you must use `--` to separate them from the 'git filter-branch' options. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Title ~
-#: en/git-filter-branch.txt:216
+#: en/git-filter-branch.txt:229
#, no-wrap, priority:100
msgid "Remap to ancestor"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:223
+#: en/git-filter-branch.txt:236
#, priority:100
msgid "By using linkgit:git-rev-list[1] arguments, e.g., path limiters, you can limit the set of revisions which get rewritten. However, positive refs on the command line are distinguished: we don't let them be excluded by such limiters. For this purpose, they are instead rewritten to point at the nearest ancestor that was not excluded."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:231
+#: en/git-filter-branch.txt:244
#, priority:100
msgid "On success, the exit status is `0`. If the filter can't find any commits to rewrite, the exit status is `2`. On any other error, the exit status may be any other non-zero value."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:238
+#: en/git-filter-branch.txt:251
#, priority:100
msgid "Suppose you want to remove a file (containing confidential information or copyright violation) from all commits:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:241
+#: en/git-filter-branch.txt:254
#, no-wrap, priority:100
msgid "git filter-branch --tree-filter 'rm filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:246
+#: en/git-filter-branch.txt:259
#, priority:100
msgid "However, if the file is absent from the tree of some commit, a simple `rm filename` will fail for that tree and commit. Thus you may instead want to use `rm -f filename` as the script."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:252
+#: en/git-filter-branch.txt:265
#, priority:100
msgid "Using `--index-filter` with 'git rm' yields a significantly faster version. Like with using `rm filename`, `git rm --cached filename` will fail if the file is absent from the tree of a commit. If you want to \"completely forget\" a file, it does not matter when it entered history, so we also add `--ignore-unmatch`:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:255
+#: en/git-filter-branch.txt:268
#, no-wrap, priority:100
msgid "git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:258
+#: en/git-filter-branch.txt:271
#, priority:100
msgid "Now, you will get the rewritten history saved in HEAD."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:261
+#: en/git-filter-branch.txt:274
#, priority:100
msgid "To rewrite the repository to look as if `foodir/` had been its project root, and discard all other history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:264
+#: en/git-filter-branch.txt:277
#, no-wrap, priority:100
msgid "git filter-branch --subdirectory-filter foodir -- --all\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:269
+#: en/git-filter-branch.txt:282
#, priority:100
msgid "Thus you can, e.g., turn a library subdirectory into a repository of its own. Note the `--` that separates 'filter-branch' options from revision options, and the `--all` to rewrite all branches and tags."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:273
+#: en/git-filter-branch.txt:286
#, priority:100
msgid "To set a commit (which typically is at the tip of another history) to be the parent of the current initial commit, in order to paste the other history behind the current history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:276
+#: en/git-filter-branch.txt:289
#, no-wrap, priority:100
msgid "git filter-branch --parent-filter 'sed \"s/^\\$/-p <graft-id>/\"' HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:282
+#: en/git-filter-branch.txt:295
#, priority:100
msgid "(if the parent string is empty - which happens when we are dealing with the initial commit - add graftcommit as a parent). Note that this assumes history with a single root (that is, no merge without common ancestors happened). If this is not the case, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:286
+#: en/git-filter-branch.txt:299
#, no-wrap, priority:100
msgid ""
"git filter-branch --parent-filter \\\n"
@@ -22520,13 +23251,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:289
+#: en/git-filter-branch.txt:302
#, priority:100
msgid "or even simpler:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:293
+#: en/git-filter-branch.txt:306
#, no-wrap, priority:100
msgid ""
"git replace --graft $commit-id $graft-id\n"
@@ -22534,13 +23265,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:296
+#: en/git-filter-branch.txt:309
#, priority:100
msgid "To remove commits authored by \"Darl McBribe\" from the history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:305
+#: en/git-filter-branch.txt:318
#, no-wrap, priority:100
msgid ""
"git filter-branch --commit-filter '\n"
@@ -22553,13 +23284,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:308
+#: en/git-filter-branch.txt:321
#, priority:100
msgid "The function 'skip_commit' is defined as follows:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:320
+#: en/git-filter-branch.txt:333
#, no-wrap, priority:100
msgid ""
"skip_commit()\n"
@@ -22575,13 +23306,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:327
+#: en/git-filter-branch.txt:340
#, priority:100
msgid "The shift magic first throws away the tree id and then the -p parameters. Note that this handles merges properly! In case Darl committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 as their parents instead of the merge commit."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:332
+#: en/git-filter-branch.txt:345
#, no-wrap, priority:100
msgid ""
"*NOTE* the changes introduced by the commits, and which are not reverted\n"
@@ -22591,13 +23322,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:336
+#: en/git-filter-branch.txt:349
#, priority:100
msgid "You can rewrite the commit log messages using `--msg-filter`. For example, 'git svn-id' strings in a repository created by 'git svn' can be removed this way:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:341
+#: en/git-filter-branch.txt:354
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -22606,13 +23337,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:345
+#: en/git-filter-branch.txt:358
#, priority:100
msgid "If you need to add 'Acked-by' lines to, say, the last 10 commits (none of which is a merge), use this command:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:351
+#: en/git-filter-branch.txt:364
#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
@@ -22622,13 +23353,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:357
+#: en/git-filter-branch.txt:370
#, priority:100
msgid "The `--env-filter` option can be used to modify committer and/or author identity. For example, if you found out that your commits have the wrong identity due to a misconfigured user.email, you can make a correction, before publishing the project, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:369
+#: en/git-filter-branch.txt:382
#, no-wrap, priority:100
msgid ""
"git filter-branch --env-filter '\n"
@@ -22644,19 +23375,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:375
+#: en/git-filter-branch.txt:388
#, priority:100
msgid "To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will point to the top-most revision that a 'git rev-list' of this range will print."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:377
+#: en/git-filter-branch.txt:390
#, priority:100
msgid "Consider this history:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:382
+#: en/git-filter-branch.txt:395
#, no-wrap, priority:100
msgid ""
" D--E--F--G--H\n"
@@ -22665,25 +23396,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:385
+#: en/git-filter-branch.txt:398
#, priority:100
msgid "To rewrite only commits D,E,F,G,H, but leave A, B and C alone, use:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:388
+#: en/git-filter-branch.txt:401
#, ignore-ellipsis, no-wrap, priority:100
msgid "git filter-branch ... C..H\n"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:391
+#: en/git-filter-branch.txt:404
#, priority:100
msgid "To rewrite commits E,F,G,H, use one of these:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:395
+#: en/git-filter-branch.txt:408
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"git filter-branch ... C..H --not D\n"
@@ -22691,13 +23422,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:398
+#: en/git-filter-branch.txt:411
#, priority:100
msgid "To move the whole tree into a subdirectory, or remove it from there:"
msgstr ""
#. type: delimited block -
-#: en/git-filter-branch.txt:405
+#: en/git-filter-branch.txt:418
#, no-wrap, priority:100
msgid ""
"git filter-branch --index-filter \\\n"
@@ -22708,87 +23439,279 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-filter-branch.txt:410
+#: en/git-filter-branch.txt:423
#, no-wrap, priority:100
msgid "CHECKLIST FOR SHRINKING A REPOSITORY"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:418
+#: en/git-filter-branch.txt:431
#, priority:100
msgid "git-filter-branch can be used to get rid of a subset of files, usually with some combination of `--index-filter` and `--subdirectory-filter`. People expect the resulting repository to be smaller than the original, but you need a few more steps to actually make it smaller, because Git tries hard not to lose your objects until you tell it to. First make sure that:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:422
+#: en/git-filter-branch.txt:435
#, priority:100
msgid "You really removed all variants of a filename, if a blob was moved over its lifetime. `git log --name-only --follow --all -- filename` can help you find renames."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:425
+#: en/git-filter-branch.txt:438
#, priority:100
msgid "You really filtered all refs: use `--tag-name-filter cat -- --all` when calling git-filter-branch."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:428
+#: en/git-filter-branch.txt:441
#, priority:100
msgid "Then there are two ways to get a smaller repository. A safer way is to clone, that keeps your original intact."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:432
+#: en/git-filter-branch.txt:445
#, priority:100
msgid "Clone it with `git clone file:///path/to/repo`. The clone will not have the removed objects. See linkgit:git-clone[1]. (Note that cloning with a plain path just hardlinks everything!)"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:437
+#: en/git-filter-branch.txt:450
#, priority:100
msgid "If you really don't want to clone it, for whatever reasons, check the following points instead (in this order). This is a very destructive approach, so *make a backup* or go back to cloning it. You have been warned."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:441
+#: en/git-filter-branch.txt:454
#, priority:100
msgid "Remove the original refs backed up by git-filter-branch: say `git for-each-ref --format=\"%(refname)\" refs/original/ | xargs -n 1 git update-ref -d`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:443
+#: en/git-filter-branch.txt:456
#, priority:100
msgid "Expire all reflogs with `git reflog expire --expire=now --all`."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:447
+#: en/git-filter-branch.txt:460
#, priority:100
msgid "Garbage collect all unreferenced objects with `git gc --prune=now` (or if your git-gc is not new enough to support arguments to `--prune`, use `git repack -ad; git prune` instead)."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:459
+#: en/git-filter-branch.txt:467
#, priority:100
-msgid "git-filter-branch allows you to make complex shell-scripted rewrites of your Git history, but you probably don't need this flexibility if you're simply _removing unwanted data_ like large files or passwords. For those operations you may want to consider http://rtyley.github.io/bfg-repo-cleaner/[The BFG Repo-Cleaner], a JVM-based alternative to git-filter-branch, typically at least 10-50x faster for those use-cases, and with quite different characteristics:"
+msgid "The performance of git-filter-branch is glacially slow; its design makes it impossible for a backward-compatible implementation to ever be fast:"
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:467
+#: en/git-filter-branch.txt:473
#, priority:100
-msgid "Any particular version of a file is cleaned exactly _once_. The BFG, unlike git-filter-branch, does not give you the opportunity to handle a file differently based on where or when it was committed within your history. This constraint gives the core performance benefit of The BFG, and is well-suited to the task of cleansing bad data - you don't care _where_ the bad data is, you just want it _gone_."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:473
+#: en/git-filter-branch.txt:476
+#, priority:100
+msgid "If you try and cheat and try to make git-filter-branch only work on files modified in a commit, then two things happen"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:482
+#, priority:100
+msgid "you run into problems with deletions whenever the user is simply trying to rename files (because attempting to delete files that don't exist looks like a no-op; it takes some chicanery to remap deletes across file renames when the renames happen via arbitrary user-provided shell)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:488
+#, priority:100
+msgid "even if you succeed at the map-deletes-for-renames chicanery, you still technically violate backward compatibility because users are allowed to filter files in ways that depend upon topology of commits instead of filtering solely based on file contents or names (though this has not been observed in the wild)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:494
+#, priority:100
+msgid "Even if you don't need to edit files but only want to e.g. rename or remove some and thus can avoid checking out each file (i.e. you can use --index-filter), you still are passing shell snippets for your filters. This means that for every commit, you have to have a prepared git repo where those filters can be run. That's a significant setup."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:505
+#, priority:100
+msgid "Further, several additional files are created or updated per commit by git-filter-branch. Some of these are for supporting the convenience functions provided by git-filter-branch (such as map()), while others are for keeping track of internal state (but could have also been accessed by user filters; one of git-filter-branch's regression tests does so). This essentially amounts to using the filesystem as an IPC mechanism between git-filter-branch and the user-provided filters. Disks tend to be a slow IPC mechanism, and writing these files also effectively represents a forced synchronization point between separate processes that we hit with every commit."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:511
+#, priority:100
+msgid "The user-provided shell commands will likely involve a pipeline of commands, resulting in the creation of many processes per commit. Creating and running another process takes a widely varying amount of time between operating systems, but on any platform it is very slow relative to invoking a function."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:517
+#, priority:100
+msgid "git-filter-branch itself is written in shell, which is kind of slow. This is the one performance issue that could be backward-compatibly fixed, but compared to the above problems that are intrinsic to the design of git-filter-branch, the language of the tool itself is a relatively minor issue."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:528
+#, priority:100
+msgid "Side note: Unfortunately, people tend to fixate on the written-in-shell aspect and periodically ask if git-filter-branch could be rewritten in another language to fix the performance issues. Not only does that ignore the bigger intrinsic problems with the design, it'd help less than you'd expect: if git-filter-branch itself were not shell, then the convenience functions (map(), skip_commit(), etc) and the `--setup` argument could no longer be executed once at the beginning of the program but would instead need to be prepended to every user filter (and thus re-executed with every commit)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:539
+#, priority:100
+msgid "The https://github.com/newren/git-filter-repo/[git filter-repo] tool is an alternative to git-filter-branch which does not suffer from these performance problems or the safety problems (mentioned below). For those with existing tooling which relies upon git-filter-branch, 'git repo-filter' also provides https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], a drop-in git-filter-branch replacement (with a few caveats). While filter-lamely suffers from all the same safety issues as git-filter-branch, it at least ameloriates the performance issues a little."
+msgstr ""
+
+#. type: Title -
+#: en/git-filter-branch.txt:542
+#, no-wrap, priority:100
+msgid "SAFETY"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:547
+#, priority:100
+msgid "git-filter-branch is riddled with gotchas resulting in various ways to easily corrupt repos or end up with a mess worse than what you started with:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:560
+#, priority:100
+msgid "Someone can have a set of \"working and tested filters\" which they document or provide to a coworker, who then runs them on a different OS where the same commands are not working/tested (some examples in the git-filter-branch manpage are also affected by this). BSD vs. GNU userland differences can really bite. If lucky, error messages are spewed. But just as likely, the commands either don't do the filtering requested, or silently corrupt by making some unwanted change. The unwanted change may only affect a few commits, so it's not necessarily obvious either. (The fact that problems won't necessarily be obvious means they are likely to go unnoticed until the rewritten history is in use for quite a while, at which point it's really hard to justify another flag-day for another rewrite.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:570
+#, priority:100
+msgid "Filenames with spaces are often mishandled by shell snippets since they cause problems for shell pipelines. Not everyone is familiar with find -print0, xargs -0, git-ls-files -z, etc. Even people who are familiar with these may assume such flags are not relevant because someone else renamed any such files in their repo back before the person doing the filtering joined the project. And often, even those familiar with handling arguments with spaces may not do so just because they aren't in the mindset of thinking about everything that could possibly go wrong."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:580
+#, priority:100
+msgid "Non-ascii filenames can be silently removed despite being in a desired directory. Keeping only wanted paths is often done using pipelines like `git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`. ls-files will only quote filenames if needed, so folks may not notice that one of the files didn't match the regex (at least not until it's much too late). Yes, someone who knows about core.quotePath can avoid this (unless they have other special characters like \\t, \\n, or \"), and people who use ls-files -z with something other than grep can avoid this, but that doesn't mean they will."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:586
+#, priority:100
+msgid "Similarly, when moving files around, one can find that filenames with non-ascii or special characters end up in a different directory, one that includes a double quote character. (This is technically the same issue as above with quoting, but perhaps an interesting different way that it can and has manifested as a problem.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:594
+#, priority:100
+msgid "It's far too easy to accidentally mix up old and new history. It's still possible with any tool, but git-filter-branch almost invites it. If lucky, the only downside is users getting frustrated that they don't know how to shrink their repo and remove the old stuff. If unlucky, they merge old and new history and end up with multiple \"copies\" of each commit, some of which have unwanted or sensitive files and others which don't. This comes about in multiple different ways:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:597
+#, priority:100
+msgid "the default to only doing a partial history rewrite ('--all' is not the default and few examples show it)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:599
+#, priority:100
+msgid "the fact that there's no automatic post-run cleanup"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:602
+#, priority:100
+msgid "the fact that --tag-name-filter (when used to rename tags) doesn't remove the old tags but just adds new ones with the new name"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:611
+#, priority:100
+msgid "the fact that little educational information is provided to inform users of the ramifications of a rewrite and how to avoid mixing old and new history. For example, this man page discusses how users need to understand that they need to rebase their changes for all their branches on top of new history (or delete and reclone), but that's only one of multiple concerns to consider. See the \"DISCUSSION\" section of the git filter-repo manual page for more details."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:614
+#, priority:100
+msgid "Annotated tags can be accidentally converted to lightweight tags, due to either of two issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:619
+#, priority:100
+msgid "Someone can do a history rewrite, realize they messed up, restore from the backups in refs/original/, and then redo their git-filter-branch command. (The backup in refs/original/ is not a real backup; it dereferences tags first.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:624
+#, priority:100
+msgid "Running git-filter-branch with either --tags or --all in your <rev-list options>. In order to retain annotated tags as annotated, you must use --tag-name-filter (and must not have restored from refs/original/ in a previously botched rewrite)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:629
+#, priority:100
+msgid "Any commit messages that specify an encoding will become corrupted by the rewrite; git-filter-branch ignores the encoding, takes the original bytes, and feeds it to commit-tree without telling it the proper encoding. (This happens whether or not --msg-filter is used.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:633
+#, priority:100
+msgid "Commit messages (even if they are all UTF-8) by default become corrupted due to not being updated -- any references to other commit hashes in commit messages will now refer to no-longer-extant commits."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:644
+#, priority:100
+msgid "There are no facilities for helping users find what unwanted crud they should delete, which means they are much more likely to have incomplete or partial cleanups that sometimes result in confusion and people wasting time trying to understand. (For example, folks tend to just look for big files to delete instead of big directories or extensions, and once they do so, then sometime later folks using the new repository who are going through history will notice a build artifact directory that has some files but not others, or a cache of dependencies (node_modules or similar) which couldn't have ever been functional since it's missing some files.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:647
+#, priority:100
+msgid "If --prune-empty isn't specified, then the filtering process can create hoards of confusing empty commits"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:651
+#, priority:100
+msgid "If --prune-empty is specified, then intentionally placed empty commits from before the filtering operation are also pruned instead of just pruning commits that became empty due to filtering rules."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:654
+#, ignore-ellipsis, priority:100
+msgid "If --prune empty is specified, sometimes empty commits are missed and left around anyway (a somewhat rare bug, but it happens...)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:658
+#, priority:100
+msgid "A minor issue, but users who have a goal to update all names and emails in a repository may be led to --env-filter which will only update authors and committers, missing taggers."
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:664
+#, priority:100
+msgid "If the user provides a --tag-name-filter that maps multiple tags to the same name, no warning or error is provided; git-filter-branch simply overwrites each tag in some undocumented pre-defined order resulting in only one tag at the end. (A git-filter-branch regression test requires this surprising behavior.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:667
+#, priority:100
+msgid "Also, the poor performance of git-filter-branch often leads to safety issues:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-filter-branch.txt:683
#, priority:100
-msgid "By default The BFG takes full advantage of multi-core machines, cleansing commit file-trees in parallel. git-filter-branch cleans commits sequentially (i.e. in a single-threaded manner), though it _is_ possible to write filters that include their own parallelism, in the scripts executed against each commit."
+msgid "Coming up with the correct shell snippet to do the filtering you want is sometimes difficult unless you're just doing a trivial modification such as deleting a couple files. Unfortunately, people often learn if the snippet is right or wrong by trying it out, but the rightness or wrongness can vary depending on special circumstances (spaces in filenames, non-ascii filenames, funny author names or emails, invalid timezones, presence of grafts or replace objects, etc.), meaning they may have to wait a long time, hit an error, then restart. The performance of git-filter-branch is so bad that this cycle is painful, reducing the time available to carefully re-check (to say nothing about what it does to the patience of the person doing the rewrite even if they do technically have more time available). This problem is extra compounded because errors from broken filters may not be shown for a long time and/or get lost in a sea of output. Even worse, broken filters often just result in silent incorrect rewrites."
msgstr ""
#. type: Plain text
-#: en/git-filter-branch.txt:478
+#: en/git-filter-branch.txt:691
#, priority:100
-msgid "The http://rtyley.github.io/bfg-repo-cleaner/#examples[command options] are much more restrictive than git-filter branch, and dedicated just to the tasks of removing unwanted data- e.g: `--strip-blobs-bigger-than 1M`."
+msgid "To top it all off, even when users finally find working commands, they naturally want to share them. But they may be unaware that their repo didn't have some special cases that someone else's does. So, when someone else with a different repository runs the same commands, they get hit by the problems above. Or, the user just runs commands that really were vetted for special cases, but they run it on a different OS where it doesn't work, as noted above."
msgstr ""
#. type: Title =
@@ -22824,7 +23747,7 @@ msgid "This command is intended mostly for internal use by scripts automatically
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:52
+#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:68
#, no-wrap, priority:240
msgid "--log[=<n>]"
msgstr ""
@@ -22836,7 +23759,7 @@ msgid "In addition to branch names, populate the log message with one-line descr
msgstr ""
#. type: Labeled list
-#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:53
+#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:69
#, ignore-same, no-wrap, priority:240
msgid "--no-log"
msgstr "--no-log"
@@ -22969,7 +23892,7 @@ msgid "A field name to sort on. Prefix `-` to sort in descending order of the v
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:47 en/git-replace.txt:106 en/git-tag.txt:190 en/pretty-options.txt:2
+#: en/git-for-each-ref.txt:47 en/git-replace.txt:106 en/git-tag.txt:197 en/pretty-options.txt:2
#, no-wrap, priority:260
msgid "--format=<format>"
msgstr ""
@@ -22981,7 +23904,7 @@ msgid "A string that interpolates `%(fieldname)` from a ref being shown and the
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:64 en/git-tag.txt:122
+#: en/git-for-each-ref.txt:64 en/git-tag.txt:129
#, priority:240
msgid "Respect any colors specified in the `--format` option. The `<when>` field must be one of `always`, `never`, or `auto` (if `<when>` is absent, behave as if `always` was given)."
msgstr ""
@@ -23203,7 +24126,7 @@ msgid "The name of a local ref which represents the `@{push}` location for the d
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:173 en/git.txt:340
+#: en/git-for-each-ref.txt:173 en/git.txt:362
#, no-wrap, priority:100
msgid "HEAD"
msgstr ""
@@ -23256,80 +24179,93 @@ msgstr ""
msgid "The ref which the given symbolic ref refers to. If not a symbolic ref, nothing is printed. Respects the `:short`, `:lstrip` and `:rstrip` options in the same way as `refname` above."
msgstr ""
+#. type: Labeled list
+#: en/git-for-each-ref.txt:217
+#, fuzzy, no-wrap, priority:100
+#| msgid "--worktree"
+msgid "worktreepath"
+msgstr "--worktree"
+
#. type: Plain text
-#: en/git-for-each-ref.txt:220
+#: en/git-for-each-ref.txt:221
#, priority:100
-msgid "In addition to the above, for commit and tag objects, the header field names (`tree`, `parent`, `object`, `type`, and `tag`) can be used to specify the value in the header field."
+msgid "The absolute path to the worktree in which the ref is checked out, if it is checked out in any linked worktree. Empty string otherwise."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:225
#, priority:100
+msgid "In addition to the above, for commit and tag objects, the header field names (`tree`, `parent`, `object`, `type`, and `tag`) can be used to specify the value in the header field."
+msgstr ""
+
+#. type: Plain text
+#: en/git-for-each-ref.txt:230
+#, priority:100
msgid "For commit and tag objects, the special `creatordate` and `creator` fields will correspond to the appropriate date or name-email-date tuple from the `committer` or `tagger` fields depending on the object type. These are intended for working on a mix of annotated and lightweight tags."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:229
+#: en/git-for-each-ref.txt:234
#, priority:100
msgid "Fields that have name-email-date tuple as its value (`author`, `committer`, and `tagger`) can be suffixed with `name`, `email`, and `date` to extract the named component."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:242
+#: en/git-for-each-ref.txt:247
#, priority:100
msgid "The complete message in a commit and tag object is `contents`. Its first line is `contents:subject`, where subject is the concatenation of all lines of the commit message up to the first blank line. The next line is `contents:body`, where body is all of the lines after the first blank line. The optional GPG signature is `contents:signature`. The first `N` lines of the message is obtained using `contents:lines=N`. Additionally, the trailers as interpreted by linkgit:git-interpret-trailers[1] are obtained as `trailers` (or by using the historical alias `contents:trailers`). Non-trailer lines from the trailer block can be omitted with `trailers:only`. Whitespace-continuations can be removed from trailers so that each trailer appears on a line by itself with its full content with `trailers:unfold`. Both can be used together as `trailers:unfold,only`."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:246
+#: en/git-for-each-ref.txt:251
#, priority:100
msgid "For sorting purposes, fields with numeric values sort in numeric order (`objectsize`, `authordate`, `committerdate`, `creatordate`, `taggerdate`). All other fields are used to sort in their byte-value order."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:249
+#: en/git-for-each-ref.txt:254
#, priority:100
msgid "There is also an option to sort by versions, this can be done by using the fieldname `version:refname` or its alias `v:refname`."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:253
+#: en/git-for-each-ref.txt:258
#, priority:100
msgid "In any case, a field name that refers to a field inapplicable to the object referred by the ref does not cause an error. It returns an empty string instead."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:257
+#: en/git-for-each-ref.txt:262
#, priority:100
msgid "As a special case for the date-type fields, you may specify a format for the date by adding `:` followed by date format name (see the values the `--date` option to linkgit:git-rev-list[1] takes)."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:260
+#: en/git-for-each-ref.txt:265
#, priority:100
msgid "Some atoms like %(align) and %(if) always require a matching %(end). We call them \"opening atoms\" and sometimes denote them as %($open)."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:265
+#: en/git-for-each-ref.txt:270
#, priority:100
msgid "When a scripting language specific quoting is in effect, everything between a top-level opening atom and its matching %(end) is evaluated according to the semantics of the opening atom and only its result from the top-level is quoted."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:272
+#: en/git-for-each-ref.txt:277
#, priority:100
msgid "An example directly producing formatted text. Show the most recent 3 tagged commits:"
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:275 en/git-for-each-ref.txt:291 en/git-for-each-ref.txt:305
+#: en/git-for-each-ref.txt:280 en/git-for-each-ref.txt:296 en/git-for-each-ref.txt:310
#, no-wrap, priority:100
msgid "#!/bin/sh\n"
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:281
+#: en/git-for-each-ref.txt:286
#, no-wrap, priority:100
msgid ""
"git for-each-ref --count=3 --sort='-*authordate' \\\n"
@@ -23340,7 +24276,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:284
+#: en/git-for-each-ref.txt:289
#, no-wrap, priority:100
msgid ""
"%(*body)\n"
@@ -23348,13 +24284,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:289
+#: en/git-for-each-ref.txt:294
#, priority:100
msgid "A simple example showing the use of shell eval on the output, demonstrating the use of --shell. List the prefixes of all heads:"
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:298
+#: en/git-for-each-ref.txt:303
#, no-wrap, priority:100
msgid ""
"git for-each-ref --shell --format=\"ref=%(refname)\" refs/heads | \\\n"
@@ -23366,13 +24302,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:303
+#: en/git-for-each-ref.txt:308
#, priority:100
msgid "A bit more elaborate report on tags, demonstrating that the format may be an entire script:"
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:310
+#: en/git-for-each-ref.txt:315
#, no-wrap, priority:100
msgid ""
"fmt='\n"
@@ -23382,7 +24318,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:317
+#: en/git-for-each-ref.txt:322
#, no-wrap, priority:100
msgid ""
"\to=%(*objectname)\n"
@@ -23394,7 +24330,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:336
+#: en/git-for-each-ref.txt:341
#, no-wrap, priority:100
msgid ""
"\tkind=Tag\n"
@@ -23418,13 +24354,13 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:338
+#: en/git-for-each-ref.txt:343
#, no-wrap, priority:100
msgid " $s\n"
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:345
+#: en/git-for-each-ref.txt:350
#, no-wrap, priority:100
msgid ""
"Its message reads as:\n"
@@ -23436,7 +24372,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:351
+#: en/git-for-each-ref.txt:356
#, no-wrap, priority:100
msgid ""
"eval=`git for-each-ref --shell --format=\"$fmt\" \\\n"
@@ -23447,25 +24383,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:356
+#: en/git-for-each-ref.txt:361
#, ignore-ellipsis, priority:100
msgid "An example to show the usage of %(if)...%(then)...%(else)...%(end). This prefixes the current branch with a star."
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:359
+#: en/git-for-each-ref.txt:364
#, no-wrap, priority:100
msgid "git for-each-ref --format=\"%(if)%(HEAD)%(then)* %(else) %(end)%(refname:short)\" refs/heads/\n"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:364
+#: en/git-for-each-ref.txt:369
#, ignore-ellipsis, priority:100
msgid "An example to show the usage of %(if)...%(then)...%(end). This prints the authorname, if present."
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:367
+#: en/git-for-each-ref.txt:372
#, no-wrap, priority:100
msgid "git for-each-ref --format=\"%(refname)%(if)%(authorname)%(then) Authored by: %(authorname)%(end)\"\n"
msgstr ""
@@ -23483,7 +24419,7 @@ msgid "git-format-patch - Prepare patches for e-mail submission"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:31
+#: en/git-format-patch.txt:32
#, no-wrap, priority:100
msgid ""
"'git format-patch' [-k] [(-o|--output-directory) <dir> | --stdout]\n"
@@ -23494,12 +24430,13 @@ msgid ""
"\t\t [--signature-file=<file>]\n"
"\t\t [-n | --numbered | -N | --no-numbered]\n"
"\t\t [--start-number <n>] [--numbered-files]\n"
-"\t\t [--in-reply-to=Message-Id] [--suffix=.<sfx>]\n"
+"\t\t [--in-reply-to=<message id>] [--suffix=.<sfx>]\n"
"\t\t [--ignore-if-in-upstream]\n"
-"\t\t [--rfc] [--subject-prefix=Subject-Prefix]\n"
+"\t\t [--rfc] [--subject-prefix=<subject prefix>]\n"
"\t\t [(--reroll-count|-v) <n>]\n"
"\t\t [--to=<email>] [--cc=<email>]\n"
-"\t\t [--[no-]cover-letter] [--quiet] [--notes[=<ref>]]\n"
+"\t\t [--[no-]cover-letter] [--quiet]\n"
+"\t\t [--no-notes | --notes[=<ref>]]\n"
"\t\t [--interdiff=<previous>]\n"
"\t\t [--range-diff=<previous> [--creation-factor=<percent>]]\n"
"\t\t [--progress]\n"
@@ -23508,547 +24445,560 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:39
+#: en/git-format-patch.txt:40
#, priority:100
msgid "Prepare each commit with its patch in one file per commit, formatted to resemble UNIX mailbox format. The output of this command is convenient for e-mail submission or for use with 'git am'."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:41
+#: en/git-format-patch.txt:42
#, priority:100
msgid "There are two ways to specify which commits to operate on."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:45
+#: en/git-format-patch.txt:46
#, priority:100
msgid "A single commit, <since>, specifies that the commits leading to the tip of the current branch that are not in the history that leads to the <since> to be output."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:49
+#: en/git-format-patch.txt:50
#, priority:100
msgid "Generic <revision range> expression (see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]) means the commits in the specified range."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:55
+#: en/git-format-patch.txt:56
#, priority:100
msgid "The first rule takes precedence in the case of a single <commit>. To apply the second rule, i.e., format everything since the beginning of history up until <commit>, use the `--root` option: `git format-patch --root <commit>`. If you want to format only <commit> itself, you can do this with `git format-patch -1 <commit>`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:62
+#: en/git-format-patch.txt:63
#, priority:100
msgid "By default, each output file is numbered sequentially from 1, and uses the first line of the commit message (massaged for pathname safety) as the filename. With the `--numbered-files` option, the output file names will only be numbers, without the first line of the commit appended. The names of the output files are printed to standard output, unless the `--stdout` option is specified."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:69
+#: en/git-format-patch.txt:71
#, priority:100
-msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`."
+msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`. All directory components will be created."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:73
+#: en/git-format-patch.txt:75
#, priority:100
msgid "By default, the subject of a single patch is \"[PATCH] \" followed by the concatenation of lines from the commit message up to the first blank line (see the DISCUSSION section of linkgit:git-commit[1])."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:77
+#: en/git-format-patch.txt:79
#, priority:100
msgid "When multiple patches are output, the subject prefix will instead be \"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. To omit patch numbers from the subject, use `-N`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:82
+#: en/git-format-patch.txt:84
#, priority:100
msgid "If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a `Message-Id` header to reference."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:88
+#: en/git-format-patch.txt:90
#, no-wrap, priority:100
msgid "-<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:90
+#: en/git-format-patch.txt:92
#, priority:100
msgid "Prepare patches from the topmost <n> commits."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:91
+#: en/git-format-patch.txt:93
#, no-wrap, priority:100
msgid "-o <dir>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:92
+#: en/git-format-patch.txt:94
#, no-wrap, priority:100
msgid "--output-directory <dir>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:95
+#: en/git-format-patch.txt:97
#, priority:100
msgid "Use <dir> to store the resulting files, instead of the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:97 en/git-shortlog.txt:30
+#: en/git-format-patch.txt:99 en/git-shortlog.txt:30
#, ignore-same, no-wrap, priority:260
msgid "--numbered"
msgstr "--numbered"
#. type: Plain text
-#: en/git-format-patch.txt:99
+#: en/git-format-patch.txt:101
#, priority:100
msgid "Name output in '[PATCH n/m]' format, even with a single patch."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:101
+#: en/git-format-patch.txt:103
#, ignore-same, no-wrap, priority:100
msgid "--no-numbered"
msgstr "--no-numbered"
#. type: Plain text
-#: en/git-format-patch.txt:103
+#: en/git-format-patch.txt:105
#, priority:100
msgid "Name output in '[PATCH]' format."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:104
+#: en/git-format-patch.txt:106
#, no-wrap, priority:100
msgid "--start-number <n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:106
+#: en/git-format-patch.txt:108
#, priority:100
msgid "Start numbering the patches at <n> instead of 1."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:107
+#: en/git-format-patch.txt:109
#, ignore-same, no-wrap, priority:100
msgid "--numbered-files"
msgstr "--numbered-files"
#. type: Plain text
-#: en/git-format-patch.txt:110
+#: en/git-format-patch.txt:112
#, priority:100
msgid "Output file names will be a simple number sequence without the default first line of the commit appended."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:112
+#: en/git-format-patch.txt:114
#, ignore-same, no-wrap, priority:100
msgid "--keep-subject"
msgstr "--keep-subject"
#. type: Plain text
-#: en/git-format-patch.txt:115
+#: en/git-format-patch.txt:117
#, priority:100
msgid "Do not strip/add '[PATCH]' from the first line of the commit log message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:121
+#: en/git-format-patch.txt:123
#, priority:100
msgid "Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:122 en/git-pack-objects.txt:59
+#: en/git-format-patch.txt:124 en/git-pack-objects.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--stdout"
msgstr "--stdout"
#. type: Plain text
-#: en/git-format-patch.txt:125
+#: en/git-format-patch.txt:127
#, priority:100
msgid "Print all commits to the standard output in mbox format, instead of creating a file for each one."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:126
+#: en/git-format-patch.txt:128
#, no-wrap, priority:100
msgid "--attach[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:130
+#: en/git-format-patch.txt:132
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: attachment`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:131
+#: en/git-format-patch.txt:133
#, ignore-same, no-wrap, priority:100
msgid "--no-attach"
msgstr "--no-attach"
#. type: Plain text
-#: en/git-format-patch.txt:134
+#: en/git-format-patch.txt:136
#, priority:100
msgid "Disable the creation of an attachment, overriding the configuration setting."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:135
+#: en/git-format-patch.txt:137
#, no-wrap, priority:100
msgid "--inline[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:139
+#: en/git-format-patch.txt:141
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: inline`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:140
+#: en/git-format-patch.txt:142
#, no-wrap, priority:100
msgid "--thread[=<style>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:141
+#: en/git-format-patch.txt:143
#, ignore-same, no-wrap, priority:100
msgid "--no-thread"
msgstr "--no-thread"
#. type: Plain text
-#: en/git-format-patch.txt:146
+#: en/git-format-patch.txt:148
#, priority:100
msgid "Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the first. Also controls generation of the `Message-Id` header to reference."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:152
+#: en/git-format-patch.txt:154
#, priority:100
msgid "The optional <style> argument can be either `shallow` or `deep`. 'shallow' threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order. 'deep' threading makes every mail a reply to the previous one."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:156
+#: en/git-format-patch.txt:158
#, priority:100
msgid "The default is `--no-thread`, unless the `format.thread` configuration is set. If `--thread` is specified without a style, it defaults to the style specified by `format.thread` if any, or else `shallow`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:160
+#: en/git-format-patch.txt:162
#, priority:100
msgid "Beware that the default for 'git send-email' is to thread emails itself. If you want `git format-patch` to take care of threading, you will want to ensure that threading is disabled for `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:161
-#, no-wrap, priority:100
-msgid "--in-reply-to=Message-Id"
-msgstr ""
+#: en/git-format-patch.txt:163
+#, fuzzy, no-wrap, priority:100
+#| msgid "--no-message-id"
+msgid "--in-reply-to=<message id>"
+msgstr "--no-message-id"
#. type: Plain text
-#: en/git-format-patch.txt:165
+#: en/git-format-patch.txt:167
#, priority:100
-msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given Message-Id, which avoids breaking threads to provide a new patch series."
+msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given <message id>, which avoids breaking threads to provide a new patch series."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:166
+#: en/git-format-patch.txt:168
#, ignore-same, no-wrap, priority:100
msgid "--ignore-if-in-upstream"
msgstr "--ignore-if-in-upstream"
#. type: Plain text
-#: en/git-format-patch.txt:172
+#: en/git-format-patch.txt:174
#, priority:100
msgid "Do not include a patch that matches a commit in <until>..<since>. This will examine all patches reachable from <since> but not from <until> and compare them with the patches being generated, and any patch that matches is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:173
+#: en/git-format-patch.txt:175
#, no-wrap, priority:100
-msgid "--subject-prefix=<Subject-Prefix>"
+msgid "--subject-prefix=<subject prefix>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:178
+#: en/git-format-patch.txt:180
#, priority:100
-msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<Subject-Prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
+msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<subject prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:179
+#: en/git-format-patch.txt:181
#, ignore-same, no-wrap, priority:100
msgid "--rfc"
msgstr "--rfc"
#. type: Plain text
-#: en/git-format-patch.txt:183
+#: en/git-format-patch.txt:185
#, priority:100
msgid "Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For Comments\"; use this when sending an experimental patch for discussion rather than application."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:184
+#: en/git-format-patch.txt:186
#, no-wrap, priority:100
msgid "-v <n>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:185
+#: en/git-format-patch.txt:187
#, no-wrap, priority:100
msgid "--reroll-count=<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:192
+#: en/git-format-patch.txt:194
#, priority:100
msgid "Mark the series as the <n>-th iteration of the topic. The output filenames have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default, but configurable via the `--subject-prefix` option) has ` v<n>` appended to it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:193
+#: en/git-format-patch.txt:195
#, no-wrap, priority:100
msgid "--to=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:198
+#: en/git-format-patch.txt:200
#, priority:100
msgid "Add a `To:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-to` discards all `To:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:199
+#: en/git-format-patch.txt:201
#, no-wrap, priority:100
msgid "--cc=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:204
+#: en/git-format-patch.txt:206
#, priority:100
msgid "Add a `Cc:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-cc` discards all `Cc:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:205
+#: en/git-format-patch.txt:207
#, ignore-same, no-wrap, priority:100
msgid "--from"
msgstr "--from"
#. type: Labeled list
-#: en/git-format-patch.txt:206
+#: en/git-format-patch.txt:208
#, no-wrap, priority:100
msgid "--from=<ident>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:212
+#: en/git-format-patch.txt:214
#, priority:100
msgid "Use `ident` in the `From:` header of each commit email. If the author ident of the commit is not textually identical to the provided `ident`, place a `From:` header in the body of the message with the original author. If no `ident` is given, use the committer ident."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:219
+#: en/git-format-patch.txt:221
#, priority:100
msgid "Note that this option is only useful if you are actually sending the emails and want to identify yourself as the sender, but retain the original author (and `git am` will correctly pick up the in-body header). Note also that `git send-email` already handles this transformation for you, and this option should not be used if you are feeding the result to `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:220
+#: en/git-format-patch.txt:222
#, no-wrap, priority:100
msgid "--add-header=<header>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:227
+#: en/git-format-patch.txt:229
#, priority:100
msgid "Add an arbitrary header to the email headers. This is in addition to any configured headers, and may be used multiple times. For example, `--add-header=\"Organization: git-foo\"`. The negated form `--no-add-header` discards *all* (`To:`, `Cc:`, and custom) headers added so far from config or command line."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:228
+#: en/git-format-patch.txt:230
#, ignore-same, no-wrap, priority:100
msgid "--[no-]cover-letter"
msgstr "--[no-]cover-letter"
#. type: Plain text
-#: en/git-format-patch.txt:232
+#: en/git-format-patch.txt:234
#, priority:100
msgid "In addition to the patches, generate a cover letter file containing the branch description, shortlog and the overall diffstat. You can fill in a description in the file before sending it out."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:233
+#: en/git-format-patch.txt:235
#, no-wrap, priority:100
msgid "--interdiff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:241
+#: en/git-format-patch.txt:243
#, priority:100
msgid "As a reviewer aid, insert an interdiff into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` is a single revision naming the tip of the previous series which shares a common base with the series being formatted (for example `git format-patch --cover-letter --interdiff=feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:242
+#: en/git-format-patch.txt:244
#, no-wrap, priority:100
msgid "--range-diff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:253
+#: en/git-format-patch.txt:255
#, priority:100
msgid "As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1]) into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` can be a single revision naming the tip of the previous series if it shares a common base with the series being formatted (for example `git format-patch --cover-letter --range-diff=feature/v1 -3 feature/v2`), or a revision range if the two versions of the series are disjoint (for example `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:258
+#: en/git-format-patch.txt:260
#, priority:100
msgid "Note that diff options passed to the command affect how the primary product of `format-patch` is generated, and they are not passed to the underlying `range-diff` machinery used to generate the cover-letter material (this may change in the future)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:259
+#: en/git-format-patch.txt:261
#, no-wrap, priority:100
msgid "--creation-factor=<percent>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:264
+#: en/git-format-patch.txt:266
#, priority:100
msgid "Used with `--range-diff`, tweak the heuristic which matches up commits between the previous and current series of patches by adjusting the creation/deletion cost fudge factor. See linkgit:git-range-diff[1]) for details."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:265
+#: en/git-format-patch.txt:267
#, no-wrap, priority:100
msgid "--notes[=<ref>]"
msgstr ""
+#. type: Labeled list
+#: en/git-format-patch.txt:268 en/pretty-options.txt:81
+#, ignore-same, no-wrap, priority:260
+msgid "--no-notes"
+msgstr "--no-notes"
+
#. type: Plain text
-#: en/git-format-patch.txt:268
+#: en/git-format-patch.txt:271
#, priority:100
msgid "Append the notes (see linkgit:git-notes[1]) for the commit after the three-dash line."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:276
+#: en/git-format-patch.txt:279
#, priority:100
msgid "The expected use case of this is to write supporting explanation for the commit that does not belong to the commit log message proper, and include it with the patch submission. While one can simply write these explanations after `format-patch` has run but before sending, keeping them as Git notes allows them to be maintained between versions of the patch series (but see the discussion of the `notes.rewrite` configuration options in linkgit:git-notes[1] to use this workflow)."
msgstr ""
+#. type: Plain text
+#: en/git-format-patch.txt:282
+#, priority:100
+msgid "The default is `--no-notes`, unless the `format.notes` configuration is set."
+msgstr ""
+
#. type: Labeled list
-#: en/git-format-patch.txt:277
+#: en/git-format-patch.txt:283
#, no-wrap, priority:100
msgid "--[no-]signature=<signature>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:282
+#: en/git-format-patch.txt:288
#, priority:100
msgid "Add a signature to each message produced. Per RFC 3676 the signature is separated from the body by a line with '-- ' on it. If the signature option is omitted the signature defaults to the Git version number."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:283
+#: en/git-format-patch.txt:289
#, no-wrap, priority:100
msgid "--signature-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:285
+#: en/git-format-patch.txt:291
#, priority:100
msgid "Works just like --signature except the signature is read from a file."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:286
+#: en/git-format-patch.txt:292
#, no-wrap, priority:100
msgid "--suffix=.<sfx>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:291
+#: en/git-format-patch.txt:297
#, priority:100
msgid "Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is `--suffix=.txt`. Leaving this empty will remove the `.patch` suffix."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:294
+#: en/git-format-patch.txt:300
#, priority:100
msgid "Note that the leading character does not have to be a dot; for example, you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:298
+#: en/git-format-patch.txt:304
#, priority:100
msgid "Do not print the names of the generated files to standard output."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:299
+#: en/git-format-patch.txt:305
#, ignore-same, no-wrap, priority:100
msgid "--no-binary"
msgstr "--no-binary"
#. type: Plain text
-#: en/git-format-patch.txt:304
+#: en/git-format-patch.txt:310
#, priority:100
msgid "Do not output contents of changes in binary files, instead display a notice that those files changed. Patches generated using this option cannot be applied properly, but they are still useful for code review."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:305
+#: en/git-format-patch.txt:311
#, ignore-same, no-wrap, priority:100
msgid "--zero-commit"
msgstr "--zero-commit"
#. type: Plain text
-#: en/git-format-patch.txt:308
+#: en/git-format-patch.txt:314
#, priority:100
msgid "Output an all-zero hash in each patch's From header instead of the hash of the commit."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:309
+#: en/git-format-patch.txt:315
#, no-wrap, priority:100
msgid "--base=<commit>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:313
+#: en/git-format-patch.txt:320
#, priority:100
-msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details."
+msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details. If <commit> is \"auto\", a base commit is automatically chosen."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:320
+#: en/git-format-patch.txt:327
#, priority:100
msgid "Treat the revision argument as a <revision range>, even if it is just a single commit (that would normally be treated as a <since>). Note that root commits included in the specified range are always formatted as creation patches, independently of this flag."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:323
+#: en/git-format-patch.txt:330
#, priority:100
msgid "Show progress reports on stderr as patches are generated."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:330
+#: en/git-format-patch.txt:338
#, priority:100
-msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To\" or \"Cc:\" headers, configure attachments, and sign off patches with configuration variables."
+msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To:\" or \"Cc:\" headers, configure attachments, change the patch output directory, and sign off patches with configuration variables."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:342
+#: en/git-format-patch.txt:351
#, no-wrap, priority:100
msgid ""
"[format]\n"
@@ -24060,17 +25010,18 @@ msgid ""
"\tcc = <email>\n"
"\tattach [ = mime-boundary-string ]\n"
"\tsignOff = true\n"
-"\tcoverletter = auto\n"
+"\toutputDirectory = <directory>\n"
+"\tcoverLetter = auto\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:351
+#: en/git-format-patch.txt:360
#, priority:100
msgid "The patch produced by 'git format-patch' is in UNIX mailbox format, with a fixed \"magic\" time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:361
+#: en/git-format-patch.txt:370
#, no-wrap, priority:100
msgid ""
"From 8f72bad1baf19a53459661343e21d6491c3908d3 Mon Sep 17 00:00:00 2001\n"
@@ -24084,7 +25035,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:364
+#: en/git-format-patch.txt:373
#, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -24092,7 +25043,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:367
+#: en/git-format-patch.txt:376
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"Do the same for ia64 so we can have sleek & trim looking\n"
@@ -24100,19 +25051,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:375
+#: en/git-format-patch.txt:384
#, ignore-ellipsis, priority:100
msgid "Typically it will be placed in a MUA's drafts folder, edited to add timely commentary that should not go in the changelog after the three dashes, and then sent as a message whose body, in our example, starts with \"arch/arm config files were...\". On the receiving end, readers can save interesting patches in a UNIX mailbox and apply them with linkgit:git-am[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:381
+#: en/git-format-patch.txt:390
#, priority:100
msgid "When a patch is part of an ongoing discussion, the patch generated by 'git format-patch' can be tweaked to take advantage of the 'git am --scissors' feature. After your response to the discussion comes a line that consists solely of \"`-- >8 --`\" (scissors and perforation), followed by the patch with unnecessary header fields removed:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:385
+#: en/git-format-patch.txt:394
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"...\n"
@@ -24120,13 +25071,13 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:387
+#: en/git-format-patch.txt:396
#, no-wrap, priority:100
msgid "Makes sense to me. How about this patch?\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:390
+#: en/git-format-patch.txt:399
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
@@ -24134,7 +25085,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:393
+#: en/git-format-patch.txt:402
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -24142,239 +25093,239 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:401
+#: en/git-format-patch.txt:410
#, priority:100
msgid "When sending a patch this way, most often you are sending your own patch, so in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit `From:` and `Date:` lines from the patch file. The patch title is likely to be different from the subject of the discussion the patch is in response to, so it is likely that you would want to keep the Subject: line, like the example above."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:403
+#: en/git-format-patch.txt:412
#, no-wrap, priority:100
msgid "Checking for patch corruption"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:406
+#: en/git-format-patch.txt:415
#, priority:100
msgid "Many mailers if not set up properly will corrupt whitespace. Here are two common types of corruption:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:408
+#: en/git-format-patch.txt:417
#, priority:100
msgid "Empty context lines that do not have _any_ whitespace."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:411
+#: en/git-format-patch.txt:420
#, priority:100
msgid "Non-empty context lines that have one extra whitespace at the beginning."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:413
+#: en/git-format-patch.txt:422
#, priority:100
msgid "One way to test if your MUA is set up correctly is:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:417
+#: en/git-format-patch.txt:426
#, priority:100
msgid "Send the patch to yourself, exactly the way you would, except with To: and Cc: lines that do not contain the list and maintainer address."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:420
+#: en/git-format-patch.txt:429
#, priority:100
msgid "Save that patch to a file in UNIX mailbox format. Call it a.patch, say."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:422
+#: en/git-format-patch.txt:431
#, priority:100
msgid "Apply it:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:427
+#: en/git-format-patch.txt:436
#, no-wrap, priority:100
msgid ""
"$ git fetch <project> master:test-apply\n"
-"$ git checkout test-apply\n"
-"$ git reset --hard\n"
+"$ git switch test-apply\n"
+"$ git restore --source=HEAD --staged --worktree :/\n"
"$ git am a.patch\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:429
+#: en/git-format-patch.txt:438
#, priority:100
msgid "If it does not apply correctly, there can be various reasons."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:434
+#: en/git-format-patch.txt:443
#, priority:100
msgid "The patch itself does not apply cleanly. That is _bad_ but does not have much to do with your MUA. You might want to rebase the patch with linkgit:git-rebase[1] before regenerating it in this case."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:439
+#: en/git-format-patch.txt:448
#, priority:100
msgid "The MUA corrupted your patch; \"am\" would complain that the patch does not apply. Look in the .git/rebase-apply/ subdirectory and see what 'patch' file contains and check for the common corruption patterns mentioned above."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:447
+#: en/git-format-patch.txt:456
#, priority:100
msgid "While at it, check the 'info' and 'final-commit' files as well. If what is in 'final-commit' is not exactly what you would want to see in the commit log message, it is very likely that the receiver would end up hand editing the log message when applying your patch. Things like \"Hi, this is my first patch.\\n\" in the patch e-mail should come after the three-dash line that signals the end of the commit message."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:449
+#: en/git-format-patch.txt:458
#, no-wrap, priority:100
msgid "MUA-SPECIFIC HINTS"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:452
+#: en/git-format-patch.txt:461
#, priority:100
msgid "Here are some hints on how to successfully submit patches inline using various mailers."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:454
+#: en/git-format-patch.txt:463
#, no-wrap, priority:100
msgid "GMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:460
+#: en/git-format-patch.txt:469
#, priority:100
msgid "GMail does not have any way to turn off line wrapping in the web interface, so it will mangle any emails that you send. You can however use \"git send-email\" and send your patches through the GMail SMTP server, or use any IMAP email client to connect to the google IMAP server and forward the emails through that."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:463
+#: en/git-format-patch.txt:472
#, priority:100
msgid "For hints on using 'git send-email' to send your patches through the GMail SMTP server, see the EXAMPLE section of linkgit:git-send-email[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:466
+#: en/git-format-patch.txt:475
#, priority:100
msgid "For hints on submission using the IMAP interface, see the EXAMPLE section of linkgit:git-imap-send[1]."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:468
+#: en/git-format-patch.txt:477
#, no-wrap, priority:100
msgid "Thunderbird"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:472
+#: en/git-format-patch.txt:481
#, priority:100
msgid "By default, Thunderbird will both wrap emails as well as flag them as being 'format=flowed', both of which will make the resulting email unusable by Git."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:476
+#: en/git-format-patch.txt:485
#, priority:100
msgid "There are three different approaches: use an add-on to turn off line wraps, configure Thunderbird to not mangle patches, or use an external editor to keep Thunderbird from mangling the patches."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:478
+#: en/git-format-patch.txt:487
#, no-wrap, priority:100
msgid "Approach #1 (add-on)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:486
+#: en/git-format-patch.txt:495
#, priority:100
msgid "Install the Toggle Word Wrap add-on that is available from https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you can tick off. Now you can compose the message as you otherwise do (cut + paste, 'git format-patch' | 'git imap-send', etc), but you have to insert line breaks manually in any text that you type."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:488
+#: en/git-format-patch.txt:497
#, no-wrap, priority:100
msgid "Approach #2 (configuration)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:490
+#: en/git-format-patch.txt:499
#, priority:100
msgid "Three steps:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:494
+#: en/git-format-patch.txt:503
#, ignore-ellipsis, priority:100
msgid "Configure your mail server composition as plain text: Edit...Account Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:496
+#: en/git-format-patch.txt:505
#, priority:100
msgid "Configure your general composition window to not wrap."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:499
+#: en/git-format-patch.txt:508
#, priority:100
msgid "In Thunderbird 2: Edit..Preferences..Composition, wrap plain text messages at 0"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:505
+#: en/git-format-patch.txt:514
#, priority:100
msgid "In Thunderbird 3: Edit..Preferences..Advanced..Config Editor. Search for \"mail.wrap_long_lines\". Toggle it to make sure it is set to `false`. Also, search for \"mailnews.wraplength\" and set the value to 0."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:510
+#: en/git-format-patch.txt:519
#, priority:100
msgid "Disable the use of format=flowed: Edit..Preferences..Advanced..Config Editor. Search for \"mailnews.send_plaintext_flowed\". Toggle it to make sure it is set to `false`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:514
+#: en/git-format-patch.txt:523
#, priority:100
msgid "After that is done, you should be able to compose email as you otherwise would (cut + paste, 'git format-patch' | 'git imap-send', etc), and the patches will not be mangled."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:516
+#: en/git-format-patch.txt:525
#, no-wrap, priority:100
msgid "Approach #3 (external editor)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:521
+#: en/git-format-patch.txt:530
#, priority:100
msgid "The following Thunderbird extensions are needed: AboutConfig from http://aboutconfig.mozdev.org/ and External Editor from http://globs.org/articles.php?lng=en&pg=8"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:523
+#: en/git-format-patch.txt:532
#, priority:100
msgid "Prepare the patch as a text file using your method of choice."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:528
+#: en/git-format-patch.txt:537
#, priority:100
msgid "Before opening a compose window, use Edit->Account Settings to uncheck the \"Compose messages in HTML format\" setting in the \"Composition & Addressing\" panel of the account to be used to send the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:532
+#: en/git-format-patch.txt:541
#, priority:100
msgid "In the main Thunderbird window, 'before' you open the compose window for the patch, use Tools->about:config to set the following to the indicated values:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:536
+#: en/git-format-patch.txt:545
#, no-wrap, priority:100
msgid ""
"\tmailnews.send_plaintext_flowed => false\n"
@@ -24382,25 +25333,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:539
+#: en/git-format-patch.txt:548
#, priority:100
msgid "Open a compose window and click the external editor icon."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:542
+#: en/git-format-patch.txt:551
#, priority:100
msgid "In the external editor window, read in the patch file and exit the editor normally."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:545
+#: en/git-format-patch.txt:554
#, priority:100
msgid "Side note: it may be possible to do step 2 with about:config and the following settings but no one's tried yet."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:550
+#: en/git-format-patch.txt:559
#, no-wrap, priority:100
msgid ""
"\tmail.html_compose => false\n"
@@ -24409,91 +25360,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:555
+#: en/git-format-patch.txt:564
#, priority:100
msgid "There is a script in contrib/thunderbird-patch-inline which can help you include patches with Thunderbird in an easy way. To use it, do the steps above and then use the script as the external editor."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:557
+#: en/git-format-patch.txt:566
#, no-wrap, priority:100
msgid "KMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:559
+#: en/git-format-patch.txt:568
#, priority:100
msgid "This should help you to submit patches inline using KMail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:561
+#: en/git-format-patch.txt:570
#, priority:100
msgid "Prepare the patch as a text file."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:563
+#: en/git-format-patch.txt:572
#, priority:100
msgid "Click on New Mail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:566
+#: en/git-format-patch.txt:575
#, priority:100
msgid "Go under \"Options\" in the Composer window and be sure that \"Word wrap\" is not set."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:568
+#: en/git-format-patch.txt:577
#, ignore-ellipsis, priority:100
msgid "Use Message -> Insert file... and insert the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:571
+#: en/git-format-patch.txt:580
#, priority:100
msgid "Back in the compose window: add whatever other text you wish to the message, complete the addressing and subject fields, and press send."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:573
+#: en/git-format-patch.txt:582
#, no-wrap, priority:100
msgid "BASE TREE INFORMATION"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:582
+#: en/git-format-patch.txt:591
#, priority:100
msgid "The base tree information block is used for maintainers or third party testers to know the exact state the patch series applies to. It consists of the 'base commit', which is a well-known commit that is part of the stable part of the project history everybody else works off of, and zero or more 'prerequisite patches', which are well-known patches in flight that is not yet part of the 'base commit' that need to be applied on top of 'base commit' in topological order before the patches can be applied."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:588
+#: en/git-format-patch.txt:597
#, priority:100
msgid "The 'base commit' is shown as \"base-commit: \" followed by the 40-hex of the commit object name. A 'prerequisite patch' is shown as \"prerequisite-patch-id: \" followed by the 40-hex 'patch id', which can be obtained by passing the patch through the `git patch-id --stable` command."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:592
+#: en/git-format-patch.txt:601
#, priority:100
msgid "Imagine that on top of the public commit P, you applied well-known patches X, Y and Z from somebody else, and then built your three-patch series A, B, C, the history would be like:"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:595
+#: en/git-format-patch.txt:604
#, no-wrap, priority:100
msgid "---P---X---Y---Z---A---B---C\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:602
+#: en/git-format-patch.txt:611
#, priority:100
msgid "With `git format-patch --base=P -3 C` (or variants thereof, e.g. with `--cover-letter` or using `Z..C` instead of `-3 C` to specify the range), the base tree information block is shown at the end of the first message the command outputs (either the first patch, or the cover letter), like this:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:608
+#: en/git-format-patch.txt:617
#, no-wrap, priority:100
msgid ""
"base-commit: P\n"
@@ -24503,13 +25454,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:611
+#: en/git-format-patch.txt:620
#, priority:100
msgid "For non-linear topology, such as"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:616
+#: en/git-format-patch.txt:625
#, no-wrap, priority:100
msgid ""
"---P---X---A---M---C\n"
@@ -24518,91 +25469,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:621
+#: en/git-format-patch.txt:630
#, priority:100
msgid "You can also use `git format-patch --base=P -3 C` to generate patches for A, B and C, and the identifiers for P, X, Y, Z are appended at the end of the first message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:627
+#: en/git-format-patch.txt:636
#, priority:100
msgid "If set `--base=auto` in cmdline, it will track base commit automatically, the base commit will be the merge base of tip commit of the remote-tracking branch and revision-range specified in cmdline. For a local branch, you need to track a remote branch by `git branch --set-upstream-to` before using this option."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:633
+#: en/git-format-patch.txt:642
#, priority:100
msgid "Extract commits between revisions R1 and R2, and apply them on top of the current branch using 'git am' to cherry-pick them:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:636
+#: en/git-format-patch.txt:645
#, no-wrap, priority:100
msgid "$ git format-patch -k --stdout R1..R2 | git am -3 -k\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:640
+#: en/git-format-patch.txt:649
#, priority:100
msgid "Extract all commits which are in the current branch but not in the origin branch:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:643
+#: en/git-format-patch.txt:652
#, no-wrap, priority:100
msgid "$ git format-patch origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:646
+#: en/git-format-patch.txt:655
#, priority:100
msgid "For each commit a separate file is created in the current directory."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:649
+#: en/git-format-patch.txt:658
#, priority:100
msgid "Extract all commits that lead to 'origin' since the inception of the project:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:652
+#: en/git-format-patch.txt:661
#, no-wrap, priority:100
msgid "$ git format-patch --root origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:655
+#: en/git-format-patch.txt:664
#, priority:100
msgid "The same as the previous one:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:658
+#: en/git-format-patch.txt:667
#, no-wrap, priority:100
msgid "$ git format-patch -M -B origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:665
+#: en/git-format-patch.txt:674
#, priority:100
msgid "Additionally, it detects and handles renames and complete rewrites intelligently to produce a renaming patch. A renaming patch reduces the amount of text output, and generally makes it easier to review. Note that non-Git \"patch\" programs won't understand renaming patches, so use it only when you know the recipient uses Git to apply your patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:668
+#: en/git-format-patch.txt:677
#, priority:100
msgid "Extract three topmost commits from the current branch and format them as e-mailable patches:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:671
+#: en/git-format-patch.txt:680
#, no-wrap, priority:100
msgid "$ git format-patch -3\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:676
+#: en/git-format-patch.txt:685
#, ignore-same, priority:100
msgid "linkgit:git-am[1], linkgit:git-send-email[1]"
msgstr "linkgit:git-am[1], linkgit:git-send-email[1]"
@@ -24744,193 +25695,199 @@ msgid "--connectivity-only"
msgstr "--connectivity-only"
#. type: Plain text
-#: en/git-fsck.txt:68
+#: en/git-fsck.txt:72
+#, priority:100
+msgid "Check only the connectivity of reachable objects, making sure that any objects referenced by a reachable tag, commit, or tree is present. This speeds up the operation by avoiding reading blobs entirely (though it does still check that referenced blobs exist). This will detect corruption in commits and trees, but not do any semantic checks (e.g., for format errors). Corruption in blob objects will not be detected at all."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fsck.txt:76
#, priority:100
-msgid "Check only the connectivity of tags, commits and tree objects. By avoiding to unpack blobs, this speeds up the operation, at the expense of missing corrupt objects or other problematic issues."
+msgid "Unreachable tags, commits, and trees will also be accessed to find the tips of dangling segments of history. Use `--no-dangling` if you don't care about this output and want to speed it up further."
msgstr ""
#. type: Labeled list
-#: en/git-fsck.txt:69 en/git-index-pack.txt:74 en/git-unpack-objects.txt:44
+#: en/git-fsck.txt:77 en/git-index-pack.txt:74 en/git-unpack-objects.txt:44
#, ignore-same, no-wrap, priority:100
msgid "--strict"
msgstr "--strict"
#. type: Plain text
-#: en/git-fsck.txt:76
+#: en/git-fsck.txt:84
#, priority:100
msgid "Enable more strict checking, namely to catch a file mode recorded with g+w bit set, which was created by older versions of Git. Existing repositories, including the Linux kernel, Git itself, and sparse repository have old objects that triggers this check, but it is recommended to check new projects with this flag."
msgstr ""
#. type: Plain text
-#: en/git-fsck.txt:79
+#: en/git-fsck.txt:87
#, priority:100
msgid "Be chatty."
msgstr ""
#. type: Labeled list
-#: en/git-fsck.txt:80
+#: en/git-fsck.txt:88
#, ignore-same, no-wrap, priority:100
msgid "--lost-found"
msgstr "--lost-found"
#. type: Plain text
-#: en/git-fsck.txt:85
+#: en/git-fsck.txt:93
#, priority:100
msgid "Write dangling objects into .git/lost-found/commit/ or .git/lost-found/other/, depending on type. If the object is a blob, the contents are written into the file, rather than its object name."
msgstr ""
#. type: Labeled list
-#: en/git-fsck.txt:86
+#: en/git-fsck.txt:94
#, ignore-same, no-wrap, priority:100
msgid "--name-objects"
msgstr "--name-objects"
#. type: Plain text
-#: en/git-fsck.txt:91
+#: en/git-fsck.txt:99
#, priority:100
msgid "When displaying names of reachable objects, in addition to the SHA-1 also display a name that describes *how* they are reachable, compatible with linkgit:git-rev-parse[1], e.g. `HEAD@{1234567890}~25^2:src/`."
msgstr ""
#. type: Plain text
-#: en/git-fsck.txt:98
+#: en/git-fsck.txt:106
#, priority:100
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless --no-progress or --verbose is specified. --progress forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Plain text
-#: en/git-fsck.txt:108
+#: en/git-fsck.txt:121
#, priority:100
msgid "git-fsck tests SHA-1 and general object sanity, and it does full tracking of the resulting reachability and everything else. It prints out any corruption it finds (missing or bad objects), and if you use the `--unreachable` flag it will also print out objects that exist but that aren't reachable from any of the specified head nodes (or the default set, as mentioned above)."
msgstr ""
#. type: Plain text
-#: en/git-fsck.txt:112
+#: en/git-fsck.txt:125
#, priority:100
msgid "Any corrupt objects you will have to find in backups or other archives (i.e., you can just remove them and do an 'rsync' with some other site in the hopes that somebody else has the object you have corrupted)."
msgstr ""
#. type: Plain text
-#: en/git-fsck.txt:115
+#: en/git-fsck.txt:128
#, priority:100
msgid "If core.commitGraph is true, the commit-graph file will also be inspected using 'git commit-graph verify'. See linkgit:git-commit-graph[1]."
msgstr ""
#. type: Title -
-#: en/git-fsck.txt:117
+#: en/git-fsck.txt:130
#, no-wrap, priority:100
msgid "Extracted Diagnostics"
msgstr ""
#. type: Labeled list
-#: en/git-fsck.txt:119
+#: en/git-fsck.txt:132
#, no-wrap, priority:100
msgid "expect dangling commits - potential heads - due to lack of head information"
msgstr ""
#. type: Plain text
-#: en/git-fsck.txt:123
+#: en/git-fsck.txt:136
#, priority:100
msgid "You haven't specified any nodes as heads so it won't be possible to differentiate between un-parented commits and root nodes."
msgstr ""
#. type: Labeled list
-#: en/git-fsck.txt:124
+#: en/git-fsck.txt:137
#, no-wrap, priority:100
msgid "missing sha1 directory '<dir>'"
msgstr ""
#. type: Plain text
-#: en/git-fsck.txt:126
+#: en/git-fsck.txt:139
#, priority:100
msgid "The directory holding the sha1 objects is missing."
msgstr ""
#. type: Labeled list
-#: en/git-fsck.txt:127
+#: en/git-fsck.txt:140
#, no-wrap, priority:100
msgid "unreachable <type> <object>"
msgstr ""
#. type: Plain text
-#: en/git-fsck.txt:134
+#: en/git-fsck.txt:147
#, priority:100
msgid "The <type> object <object>, isn't actually referred to directly or indirectly in any of the trees or commits seen. This can mean that there's another root node that you're not specifying or that the tree is corrupt. If you haven't missed a root node then you might as well delete unreachable nodes since they can't be used."
msgstr ""
#. type: Labeled list
-#: en/git-fsck.txt:135
+#: en/git-fsck.txt:148
#, no-wrap, priority:100
msgid "missing <type> <object>"
msgstr ""
#. type: Plain text
-#: en/git-fsck.txt:138
+#: en/git-fsck.txt:151
#, priority:100
msgid "The <type> object <object>, is referred to but isn't present in the database."
msgstr ""
#. type: Labeled list
-#: en/git-fsck.txt:139
+#: en/git-fsck.txt:152
#, no-wrap, priority:100
msgid "dangling <type> <object>"
msgstr ""
#. type: Plain text
-#: en/git-fsck.txt:142
+#: en/git-fsck.txt:155
#, priority:100
msgid "The <type> object <object>, is present in the database but never 'directly' used. A dangling commit could be a root node."
msgstr ""
#. type: Labeled list
-#: en/git-fsck.txt:143
+#: en/git-fsck.txt:156
#, no-wrap, priority:100
msgid "hash mismatch <object>"
msgstr ""
#. type: Plain text
-#: en/git-fsck.txt:147
+#: en/git-fsck.txt:160
#, priority:100
msgid "The database has an object whose hash doesn't match the object database value. This indicates a serious data integrity problem."
msgstr ""
#. type: Title -
-#: en/git-fsck.txt:149 en/git.txt:372
+#: en/git-fsck.txt:162 en/git.txt:394
#, no-wrap, priority:100
msgid "Environment Variables"
msgstr ""
#. type: Labeled list
-#: en/git-fsck.txt:151
+#: en/git-fsck.txt:164
#, ignore-same, no-wrap, priority:100
msgid "GIT_OBJECT_DIRECTORY"
msgstr "GIT_OBJECT_DIRECTORY"
#. type: Plain text
-#: en/git-fsck.txt:153
+#: en/git-fsck.txt:166
#, priority:100
msgid "used to specify the object database root (usually $GIT_DIR/objects)"
msgstr ""
#. type: Labeled list
-#: en/git-fsck.txt:154
+#: en/git-fsck.txt:167
#, ignore-same, no-wrap, priority:100
msgid "GIT_INDEX_FILE"
msgstr "GIT_INDEX_FILE"
#. type: Plain text
-#: en/git-fsck.txt:156
+#: en/git-fsck.txt:169
#, priority:100
msgid "used to specify the index file of the index"
msgstr ""
#. type: Labeled list
-#: en/git-fsck.txt:157
+#: en/git-fsck.txt:170
#, ignore-same, no-wrap, priority:100
msgid "GIT_ALTERNATE_OBJECT_DIRECTORIES"
msgstr "GIT_ALTERNATE_OBJECT_DIRECTORIES"
#. type: Plain text
-#: en/git-fsck.txt:159
+#: en/git-fsck.txt:172
#, priority:100
msgid "used to specify additional object database roots (usually unset)"
msgstr ""
@@ -24960,226 +25917,175 @@ msgid "Runs a number of housekeeping tasks within the current repository, such a
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:26
+#: en/git-gc.txt:27
#, priority:100
-msgid "Users are encouraged to run this task on a regular basis within each repository to maintain good disk space utilization and good operating performance."
+msgid "When common porcelain operations that create objects are run, they will check whether the repository has grown substantially since the last maintenance, and if so run `git gc` automatically. See `gc.auto` below for how to disable this behavior."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:30
-#, priority:100
-msgid "Some git commands may automatically run 'git gc'; see the `--auto` flag below for details. If you know what you're doing and all you want is to disable this behavior permanently without further considerations, just do:"
-msgstr ""
-
-#. type: delimited block -
#: en/git-gc.txt:33
-#, no-wrap, priority:100
-msgid "$ git config --global gc.auto 0\n"
+#, priority:100
+msgid "Running `git gc` manually should only be needed when adding objects to a repository without regularly running such porcelain commands, to do a one-off repository optimization, or e.g. to clean up a suboptimal mass-import. See the \"PACKFILE OPTIMIZATION\" section in linkgit:git-fast-import[1] for more details on the import case."
msgstr ""
#. type: Labeled list
-#: en/git-gc.txt:38 en/git-read-tree.txt:71
+#: en/git-gc.txt:37 en/git-read-tree.txt:72
#, ignore-same, no-wrap, priority:100
msgid "--aggressive"
msgstr "--aggressive"
#. type: Plain text
-#: en/git-gc.txt:45
+#: en/git-gc.txt:43
#, priority:100
-msgid "Usually 'git gc' runs very quickly while providing good disk space utilization and performance. This option will cause 'git gc' to more aggressively optimize the repository at the expense of taking much more time. The effects of this optimization are persistent, so this option only needs to be used occasionally; every few hundred changesets or so."
+msgid "Usually 'git gc' runs very quickly while providing good disk space utilization and performance. This option will cause 'git gc' to more aggressively optimize the repository at the expense of taking much more time. The effects of this optimization are mostly persistent. See the \"AGGRESSIVE\" section below for details."
msgstr ""
#. type: Labeled list
-#: en/git-gc.txt:46
+#: en/git-gc.txt:44
#, ignore-same, no-wrap, priority:100
msgid "--auto"
msgstr "--auto"
#. type: Plain text
-#: en/git-gc.txt:53
+#: en/git-gc.txt:47
#, priority:100
-msgid "With this option, 'git gc' checks whether any housekeeping is required; if not, it exits without performing any work. Some git commands run `git gc --auto` after performing operations that could create many loose objects. Housekeeping is required if there are too many loose objects or too many packs in the repository."
+msgid "With this option, 'git gc' checks whether any housekeeping is required; if not, it exits without performing any work."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:58
+#: en/git-gc.txt:50
#, priority:100
-msgid "If the number of loose objects exceeds the value of the `gc.auto` configuration variable, then all loose objects are combined into a single pack using `git repack -d -l`. Setting the value of `gc.auto` to 0 disables automatic packing of loose objects."
+msgid "See the `gc.auto` option in the \"CONFIGURATION\" section below for how this heuristic works."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:70
-#, priority:100
-msgid "If the number of packs exceeds the value of `gc.autoPackLimit`, then existing packs (except those marked with a `.keep` file or over `gc.bigPackThreshold` limit) are consolidated into a single pack by using the `-A` option of 'git repack'. If the amount of memory is estimated not enough for `git repack` to run smoothly and `gc.bigPackThreshold` is not set, the largest pack will also be excluded (this is the equivalent of running `git gc` with `--keep-base-pack`). Setting `gc.autoPackLimit` to 0 disables automatic consolidation of packs."
-msgstr ""
-
-#. type: Plain text
-#: en/git-gc.txt:74
+#: en/git-gc.txt:55
#, ignore-ellipsis, priority:100
-msgid "If houskeeping is required due to many loose objects or packs, all other housekeeping tasks (e.g. rerere, working trees, reflog...) will be performed as well."
+msgid "Once housekeeping is triggered by exceeding the limits of configuration options such as `gc.auto` and `gc.autoPackLimit`, all other housekeeping tasks (e.g. rerere, working trees, reflog...) will be performed as well."
msgstr ""
#. type: Labeled list
-#: en/git-gc.txt:76
+#: en/git-gc.txt:57
#, no-wrap, priority:100
msgid "--prune=<date>"
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:83
+#: en/git-gc.txt:64
#, priority:100
-msgid "Prune loose objects older than date (default is 2 weeks ago, overridable by the config variable `gc.pruneExpire`). --prune=all prunes loose objects regardless of their age and increases the risk of corruption if another process is writing to the repository concurrently; see \"NOTES\" below. --prune is on by default."
+msgid "Prune loose objects older than date (default is 2 weeks ago, overridable by the config variable `gc.pruneExpire`). --prune=now prunes loose objects regardless of their age and increases the risk of corruption if another process is writing to the repository concurrently; see \"NOTES\" below. --prune is on by default."
msgstr ""
#. type: Labeled list
-#: en/git-gc.txt:84 en/git-pack-refs.txt:57
+#: en/git-gc.txt:65 en/git-pack-refs.txt:57
#, ignore-same, no-wrap, priority:100
msgid "--no-prune"
msgstr "--no-prune"
#. type: Plain text
-#: en/git-gc.txt:86
+#: en/git-gc.txt:67
#, priority:100
msgid "Do not prune any loose objects."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:89
+#: en/git-gc.txt:70
#, priority:100
msgid "Suppress all progress reports."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:93
+#: en/git-gc.txt:74
#, priority:100
msgid "Force `git gc` to run even if there may be another `git gc` instance running on this repository."
msgstr ""
#. type: Labeled list
-#: en/git-gc.txt:94
+#: en/git-gc.txt:75
#, ignore-same, no-wrap, priority:100
msgid "--keep-largest-pack"
msgstr "--keep-largest-pack"
#. type: Plain text
-#: en/git-gc.txt:98
+#: en/git-gc.txt:79
#, priority:100
msgid "All packs except the largest pack and those marked with a `.keep` files are consolidated into a single pack. When this option is used, `gc.bigPackThreshold` is ignored."
msgstr ""
-#. type: Plain text
-#: en/git-gc.txt:107
-#, priority:100
-msgid "The optional configuration variable `gc.reflogExpire` can be set to indicate how long historical entries within each branch's reflog should remain available in this repository. The setting is expressed as a length of time, for example '90 days' or '3 months'. It defaults to '90 days'."
-msgstr ""
-
-#. type: Plain text
-#: en/git-gc.txt:116
-#, priority:100
-msgid "The optional configuration variable `gc.reflogExpireUnreachable` can be set to indicate how long historical reflog entries which are not part of the current branch should remain available in this repository. These types of entries are generally created as a result of using `git commit --amend` or `git rebase` and are the commits prior to the amend or rebase occurring. Since these changes are not part of the current project most users will want to expire them sooner. This option defaults to '30 days'."
-msgstr ""
-
-#. type: Plain text
-#: en/git-gc.txt:120
-#, priority:100
-msgid "The above two configuration variables can be given to a pattern. For example, this sets non-default expiry values only to remote-tracking branches:"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-gc.txt:125
+#. type: Title -
+#: en/git-gc.txt:81
#, no-wrap, priority:100
-msgid ""
-"[gc \"refs/remotes/*\"]\n"
-"\treflogExpire = never\n"
-"\treflogExpireUnreachable = 3 days\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gc.txt:130
-#, priority:100
-msgid "The optional configuration variable `gc.rerereResolved` indicates how long records of conflicted merge you resolved earlier are kept. This defaults to 60 days."
+msgid "AGGRESSIVE"
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:134
+#: en/git-gc.txt:88
#, priority:100
-msgid "The optional configuration variable `gc.rerereUnresolved` indicates how long records of conflicted merge you have not resolved are kept. This defaults to 15 days."
+msgid "When the `--aggressive` option is supplied, linkgit:git-repack[1] will be invoked with the `-f` flag, which in turn will pass `--no-reuse-delta` to linkgit:git-pack-objects[1]. This will throw away any existing deltas and re-compute them, at the expense of spending much more time on the repacking."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:139
-#, priority:100
-msgid "The optional configuration variable `gc.packRefs` determines if 'git gc' runs 'git pack-refs'. This can be set to \"notbare\" to enable it within all non-bare repos or it can be set to a boolean value. This defaults to true."
-msgstr ""
-
-#. type: Plain text
-#: en/git-gc.txt:143
-#, priority:100
-msgid "The optional configuration variable `gc.writeCommitGraph` determines if 'git gc' should run 'git commit-graph write'. This can be set to a boolean value. This defaults to false."
-msgstr ""
-
-#. type: Plain text
-#: en/git-gc.txt:150
+#: en/git-gc.txt:93
#, priority:100
-msgid "The optional configuration variable `gc.aggressiveWindow` controls how much time is spent optimizing the delta compression of the objects in the repository when the --aggressive option is specified. The larger the value, the more time is spent optimizing the delta compression. See the documentation for the --window option in linkgit:git-repack[1] for more details. This defaults to 250."
+msgid "The effects of this are mostly persistent, e.g. when packs and loose objects are coalesced into one another pack the existing deltas in that pack might get re-used, but there are also various cases where we might pick a sub-optimal delta from a newer pack instead."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:153
+#: en/git-gc.txt:99
#, priority:100
-msgid "Similarly, the optional configuration variable `gc.aggressiveDepth` controls --depth option in linkgit:git-repack[1]. This defaults to 50."
+msgid "Furthermore, supplying `--aggressive` will tweak the `--depth` and `--window` options passed to linkgit:git-repack[1]. See the `gc.aggressiveDepth` and `gc.aggressiveWindow` settings below. By using a larger window size we're more likely to find more optimal deltas."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:157
+#: en/git-gc.txt:105
#, priority:100
-msgid "The optional configuration variable `gc.pruneExpire` controls how old the unreferenced loose objects have to be before they are pruned. The default is \"2 weeks ago\"."
+msgid "It's probably not worth it to use this option on a given repository without running tailored performance benchmarks on it. It takes a lot more time, and the resulting space/delta optimization may or may not be worth it. Not using this at all is the right trade-off for most users and their repositories."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:161
+#: en/git-gc.txt:111
#, priority:100
-msgid "Optional configuration variable `gc.worktreePruneExpire` controls how old a stale working tree should be before `git worktree prune` deletes it. Default is \"3 months ago\"."
+msgid "The below documentation is the same as what's found in linkgit:git-config[1]:"
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:176
+#: en/git-gc.txt:126
#, priority:100
-msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, refs saved by 'git filter-branch' in refs/original/, or reflogs (which may reference commits in branches that were later amended or rewound). If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
+msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, notes saved by 'git notes' under refs/notes/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:183
+#: en/git-gc.txt:133
#, priority:100
msgid "On the other hand, when 'git gc' runs concurrently with another process, there is a risk of it deleting an object that the other process is using but hasn't created a reference to. This may just cause the other process to fail or may corrupt the repository if the other process later adds a reference to the deleted object. Git has two features that significantly mitigate this problem:"
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:186
+#: en/git-gc.txt:136
#, priority:100
msgid "Any object with modification time newer than the `--prune` date is kept, along with everything reachable from it."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:190
+#: en/git-gc.txt:140
#, priority:100
msgid "Most operations that add an object to the database update the modification time of the object if it is already present so that #1 applies."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:195
+#: en/git-gc.txt:144
#, priority:100
-msgid "However, these features fall short of a complete solution, so users who run commands concurrently have to live with some risk of corruption (which seems to be low in practice) unless they turn off automatic garbage collection with 'git config gc.auto 0'."
+msgid "However, these features fall short of a complete solution, so users who run commands concurrently have to live with some risk of corruption (which seems to be low in practice)."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:201
+#: en/git-gc.txt:150
#, priority:100
msgid "The 'git gc --auto' command will run the 'pre-auto-gc' hook. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-gc.txt:209
+#: en/git-gc.txt:158
#, ignore-same, priority:100
msgid "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
msgstr "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
@@ -25387,15 +26293,9 @@ msgstr "--exclude-standard"
#. type: Plain text
#: en/git-grep.txt:94
#, priority:100
-msgid "Do not pay attention to ignored files specified via the\t`.gitignore` mechanism. Only useful when searching files in the current directory with `--no-index`."
+msgid "Do not pay attention to ignored files specified via the `.gitignore` mechanism. Only useful when searching files in the current directory with `--no-index`."
msgstr ""
-#. type: Labeled list
-#: en/git-grep.txt:95 en/git-ls-files.txt:148
-#, ignore-same, no-wrap, priority:100
-msgid "--recurse-submodules"
-msgstr "--recurse-submodules"
-
#. type: Plain text
#: en/git-grep.txt:100
#, priority:100
@@ -25451,7 +26351,7 @@ msgid "For each <pathspec> given on command line, descend at most <depth> levels
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:387
+#: en/git-grep.txt:128 en/git-submodule.txt:400
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
@@ -25505,13 +26405,13 @@ msgid "By default, the command shows the filename for each match. `-h` option i
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:152 en/git-ls-files.txt:142 en/git-ls-tree.txt:68
+#: en/git-grep.txt:152 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
#, ignore-same, no-wrap, priority:100
msgid "--full-name"
msgstr "--full-name"
#. type: Plain text
-#: en/git-grep.txt:157 en/git-ls-files.txt:147
+#: en/git-grep.txt:157 en/git-ls-files.txt:149
#, priority:100
msgid "When run from a subdirectory, the command usually outputs paths relative to the current directory. This option forces paths to be output relative to the project top directory."
msgstr ""
@@ -25667,7 +26567,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:932
+#: en/git-grep.txt:217 en/rev-list-options.txt:967
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -25817,127 +26717,151 @@ msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:280
+#: en/git-grep.txt:277
+#, priority:100
+msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:282
+#, priority:100
+msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:287
+#, priority:100
+msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:291
+#, priority:100
+msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:297
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:281
+#: en/git-grep.txt:298
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:282
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:283 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:284
+#: en/git-grep.txt:301
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:289
+#: en/git-grep.txt:306
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:290 en/rev-list-options.txt:65
+#: en/git-grep.txt:307 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:294
+#: en/git-grep.txt:311
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:299
+#: en/git-grep.txt:316
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:300
+#: en/git-grep.txt:317
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:303
+#: en/git-grep.txt:320
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:307
+#: en/git-grep.txt:324
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:328
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:318
+#: en/git-grep.txt:335
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:321
+#: en/git-grep.txt:338
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:322
+#: en/git-grep.txt:339
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:325
+#: en/git-grep.txt:342
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:326
+#: en/git-grep.txt:343
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:329
+#: en/git-grep.txt:346
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:330
+#: en/git-grep.txt:347
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:332
+#: en/git-grep.txt:349
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
@@ -25979,7 +26903,7 @@ msgid "'git gui' is known to work on all popular UNIX systems, Mac OS X, and Win
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-submodule.txt:30 en/git-svn.txt:29 en/git-worktree.txt:46
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-submodule.txt:32 en/git-svn.txt:29 en/git-worktree.txt:46
#, no-wrap, priority:240
msgid "COMMANDS"
msgstr ""
@@ -26155,25 +27079,13 @@ msgstr ""
#. type: Plain text
#: en/git-gui.txt:116
#, priority:100
-msgid "A 'git gui' development repository can be obtained from:"
+msgid "The official repository of the 'git gui' project can be found at:"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:118
#, no-wrap, priority:100
-msgid " git clone git://repo.or.cz/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:122
-#, no-wrap, priority:100
-msgid " git clone http://repo.or.cz/r/git-gui.git\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-gui.txt:124
-#, priority:100
-msgid "or browsed online at http://repo.or.cz/w/git-gui.git/[]."
+msgid " https://github.com/prati0100/git-gui.git/\n"
msgstr ""
#. type: Title =
@@ -26197,73 +27109,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-hash-object.txt:24
+#: en/git-hash-object.txt:22
#, priority:100
-msgid "Computes the object ID value for an object with specified type with the contents of the named file (which can be outside of the work tree), and optionally writes the resulting object into the object database. Reports its object ID to its standard output. This is used by 'git cvsimport' to update the index without modifying files in the work tree. When <type> is not specified, it defaults to \"blob\"."
+msgid "Computes the object ID value for an object with specified type with the contents of the named file (which can be outside of the work tree), and optionally writes the resulting object into the object database. Reports its object ID to its standard output. When <type> is not specified, it defaults to \"blob\"."
msgstr ""
#. type: Labeled list
-#: en/git-hash-object.txt:28
+#: en/git-hash-object.txt:26
#, no-wrap, priority:100
msgid "-t <type>"
msgstr ""
#. type: Plain text
-#: en/git-hash-object.txt:30
+#: en/git-hash-object.txt:28
#, priority:100
msgid "Specify the type (default: \"blob\")."
msgstr ""
#. type: Plain text
-#: en/git-hash-object.txt:33
+#: en/git-hash-object.txt:31
#, priority:100
msgid "Actually write the object into the object database."
msgstr ""
#. type: Plain text
-#: en/git-hash-object.txt:36
+#: en/git-hash-object.txt:34
#, priority:100
msgid "Read the object from standard input instead of from a file."
msgstr ""
#. type: Labeled list
-#: en/git-hash-object.txt:37
+#: en/git-hash-object.txt:35
#, ignore-same, no-wrap, priority:100
msgid "--stdin-paths"
msgstr "--stdin-paths"
#. type: Plain text
-#: en/git-hash-object.txt:40
+#: en/git-hash-object.txt:38
#, priority:100
msgid "Read file names from the standard input, one per line, instead of from the command-line."
msgstr ""
#. type: Plain text
-#: en/git-hash-object.txt:50
+#: en/git-hash-object.txt:48
#, priority:100
msgid "Hash object as it were located at the given path. The location of file does not directly influence on the hash value, but path is used to determine what Git filters should be applied to the object before it can be placed to the object database, and, as result of applying filters, the actual blob put into the object database may differ from the given file. This option is mainly useful for hashing temporary files located outside of the working directory or files read from stdin."
msgstr ""
#. type: Labeled list
-#: en/git-hash-object.txt:51
+#: en/git-hash-object.txt:49
#, ignore-same, no-wrap, priority:100
msgid "--no-filters"
msgstr "--no-filters"
#. type: Plain text
-#: en/git-hash-object.txt:56
+#: en/git-hash-object.txt:54
#, priority:100
msgid "Hash the contents as is, ignoring any input filter that would have been chosen by the attributes mechanism, including the end-of-line conversion. If the file is read from standard input then this is always implied, unless the `--path` option is given."
msgstr ""
#. type: Labeled list
-#: en/git-hash-object.txt:57
+#: en/git-hash-object.txt:55
#, ignore-same, no-wrap, priority:100
msgid "--literally"
msgstr "--literally"
#. type: Plain text
-#: en/git-hash-object.txt:62
+#: en/git-hash-object.txt:60
#, priority:100
msgid "Allow `--stdin` to hash any garbage into a loose object which might not otherwise pass standard object parsing or git-fsck checks. Useful for stress-testing Git itself or reproducing characteristics of corrupt or bogus objects encountered in the wild."
msgstr ""
@@ -26576,7 +27488,7 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:176
#, priority:100
-msgid "For consistency, we also try such a trick if 'man.konqueror.path' is set to something like 'A_PATH_TO/konqueror'. That means we will try to launch 'A_PATH_TO/kfmclient' instead."
+msgid "For consistency, we also try such a trick if 'man.konqueror.path' is set to something like `A_PATH_TO/konqueror`. That means we will try to launch `A_PATH_TO/kfmclient` instead."
msgstr ""
#. type: Plain text
@@ -26871,7 +27783,7 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:168
#, priority:100
-msgid "Similar to the above, but Apache can be used to return static files that are stored on disk.\tOn many systems this may be more efficient as Apache can ask the kernel to copy the file contents from the file system directly to the network:"
+msgid "Similar to the above, but Apache can be used to return static files that are stored on disk. On many systems this may be more efficient as Apache can ask the kernel to copy the file contents from the file system directly to the network:"
msgstr ""
#. type: delimited block -
@@ -28097,7 +29009,7 @@ msgstr "git-interpret-trailers(1)"
#. type: Plain text
#: en/git-interpret-trailers.txt:7
#, priority:100
-msgid "git-interpret-trailers - add or parse structured information in commit messages"
+msgid "git-interpret-trailers - Add or parse structured information in commit messages"
msgstr ""
#. type: Plain text
@@ -28851,8 +29763,8 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:52
#, ignore-same, no-wrap, priority:260
-msgid "--use-mailmap"
-msgstr "--use-mailmap"
+msgid "--[no-]use-mailmap"
+msgstr "--[no-]use-mailmap"
#. type: Plain text
#: en/git-log.txt:56
@@ -29424,181 +30336,181 @@ msgid "This feature is semi-deprecated. For scripting purpose, linkgit:git-statu
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:123
+#: en/git-ls-files.txt:124
#, priority:100
msgid "This option identifies the file status with the following tags (followed by a space) at the start of each line:"
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:124
+#: en/git-ls-files.txt:125
#, no-wrap, priority:100
msgid "H"
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:125
+#: en/git-ls-files.txt:126
#, priority:100
msgid "cached"
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:125
+#: en/git-ls-files.txt:126
#, no-wrap, priority:100
msgid "S"
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:126
+#: en/git-ls-files.txt:127
#, priority:100
msgid "skip-worktree"
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:126
+#: en/git-ls-files.txt:127
#, no-wrap, priority:100
msgid "M"
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:127
+#: en/git-ls-files.txt:128
#, priority:100
msgid "unmerged"
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:127
+#: en/git-ls-files.txt:128
#, no-wrap, priority:100
msgid "R"
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:128
+#: en/git-ls-files.txt:129
#, priority:100
msgid "removed/deleted"
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:128
+#: en/git-ls-files.txt:129
#, no-wrap, priority:100
msgid "C"
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:129
+#: en/git-ls-files.txt:130
#, priority:100
msgid "modified/changed"
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:129
+#: en/git-ls-files.txt:130
#, no-wrap, priority:100
msgid "K"
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:130
+#: en/git-ls-files.txt:131
#, priority:100
msgid "to be killed"
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:130
+#: en/git-ls-files.txt:131
#, no-wrap, priority:100
msgid "?"
msgstr ""
#. type: Title ~
-#: en/git-ls-files.txt:131 en/git.txt:513
+#: en/git-ls-files.txt:132 en/git.txt:535
#, no-wrap, priority:100
msgid "other"
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:136
+#: en/git-ls-files.txt:138
#, priority:100
msgid "Similar to `-t`, but use lowercase letters for files that are marked as 'assume unchanged' (see linkgit:git-update-index[1])."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:141
+#: en/git-ls-files.txt:143
#, priority:100
msgid "Similar to `-t`, but use lowercase letters for files that are marked as 'fsmonitor valid' (see linkgit:git-update-index[1])."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:151
+#: en/git-ls-files.txt:153
#, priority:100
msgid "Recursively calls ls-files on each submodule in the repository. Currently there is only support for the --cached mode."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:156 en/git-ls-tree.txt:67
+#: en/git-ls-files.txt:158 en/git-ls-tree.txt:67
#, priority:100
msgid "Instead of showing the full 40-byte hexadecimal object lines, show only a partial prefix. Non default number of digits can be specified with --abbrev=<n>."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:162
+#: en/git-ls-files.txt:164
#, priority:100
msgid "After each line that describes a file, add more data about its cache entry. This is intended to show as much information as possible for manual inspection; the exact format may change at any time."
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:163
+#: en/git-ls-files.txt:165
#, ignore-same, no-wrap, priority:100
msgid "--eol"
msgstr "--eol"
#. type: Plain text
-#: en/git-ls-files.txt:168
+#: en/git-ls-files.txt:170
#, priority:100
msgid "Show <eolinfo> and <eolattr> of files. <eolinfo> is the file content identification used by Git when the \"text\" attribute is \"auto\" (or not set and core.autocrlf is not false). <eolinfo> is either \"-text\", \"none\", \"lf\", \"crlf\", \"mixed\" or \"\"."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:171
+#: en/git-ls-files.txt:173
#, priority:100
msgid "\"\" means the file is not a regular file, it is not in the index or not accessible in the working tree."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:175
+#: en/git-ls-files.txt:177
#, priority:100
msgid "<eolattr> is the attribute that is used when checking out or committing, it is either \"\", \"-text\", \"text\", \"text=auto\", \"text eol=lf\", \"text eol=crlf\". Since Git 2.10 \"text=auto eol=lf\" and \"text=auto eol=crlf\" are supported."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:179
+#: en/git-ls-files.txt:181
#, priority:100
msgid "Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tree (\"w/<eolinfo>\") are shown for regular files, followed by the (\"attr/<eolattr>\")."
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:183 en/git.txt:331 en/git-update-index.txt:224
+#: en/git-ls-files.txt:185 en/git.txt:353 en/git-update-index.txt:224
#, no-wrap, priority:100
msgid "<file>"
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:186
+#: en/git-ls-files.txt:188
#, priority:100
msgid "Files to show. If no files are given all files which match the other specified criteria are shown."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:191
+#: en/git-ls-files.txt:193
#, priority:100
msgid "'git ls-files' just outputs the filenames unless `--stage` is specified in which case it outputs:"
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:193
+#: en/git-ls-files.txt:195
#, no-wrap, priority:100
msgid " [<tag> ]<mode> <object> <stage> <file>\n"
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:196
+#: en/git-ls-files.txt:198
#, no-wrap, priority:100
msgid ""
"'git ls-files --eol' will show\n"
@@ -29606,61 +30518,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:199
+#: en/git-ls-files.txt:201
#, priority:100
msgid "'git ls-files --unmerged' and 'git ls-files --stage' can be used to examine detailed information on unmerged paths."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:205
+#: en/git-ls-files.txt:207
#, priority:100
msgid "For an unmerged path, instead of recording a single mode/SHA-1 pair, the index records up to three such pairs; one from tree O in stage 1, A in stage 2, and B in stage 3. This information can be used by the user (or the porcelain) to see what should eventually be recorded at the path. (see linkgit:git-read-tree[1] for more information on state)"
msgstr ""
#. type: Title -
-#: en/git-ls-files.txt:213
+#: en/git-ls-files.txt:215
#, no-wrap, priority:100
msgid "EXCLUDE PATTERNS"
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:219
+#: en/git-ls-files.txt:221
#, priority:100
msgid "'git ls-files' can use a list of \"exclude patterns\" when traversing the directory tree and finding files to show when the flags --others or --ignored are specified. linkgit:gitignore[5] specifies the format of exclude patterns."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:221
+#: en/git-ls-files.txt:223
#, priority:100
msgid "These exclude patterns come from these places, in order:"
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:225
+#: en/git-ls-files.txt:227
#, priority:100
msgid "The command-line flag --exclude=<pattern> specifies a single pattern. Patterns are ordered in the same order they appear in the command line."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:229
+#: en/git-ls-files.txt:231
#, priority:100
msgid "The command-line flag --exclude-from=<file> specifies a file containing a list of patterns. Patterns are ordered in the same order they appear in the file."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:235
+#: en/git-ls-files.txt:237
#, priority:100
msgid "The command-line flag --exclude-per-directory=<name> specifies a name of the file in each directory 'git ls-files' examines, normally `.gitignore`. Files in deeper directories take precedence. Patterns are ordered in the same order they appear in the files."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:241
+#: en/git-ls-files.txt:243
#, priority:100
msgid "A pattern specified on the command line with --exclude or read from the file specified with --exclude-from is relative to the top of the directory tree. A pattern read from a file specified by --exclude-per-directory is relative to the directory that the pattern file appears in."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:245
+#: en/git-ls-files.txt:247
#, ignore-same, priority:100
msgid "linkgit:git-read-tree[1], linkgit:gitignore[5]"
msgstr "linkgit:git-read-tree[1], linkgit:gitignore[5]"
@@ -29713,7 +30625,7 @@ msgstr "--refs"
#. type: Plain text
#: en/git-ls-remote.txt:35
#, priority:100
-msgid "Do not show peeled tags or pseudorefs like HEAD\tin the output."
+msgid "Do not show peeled tags or pseudorefs like `HEAD` in the output."
msgstr ""
#. type: Plain text
@@ -29770,6 +30682,12 @@ msgstr ""
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. Supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. See linkgit:git-for-each-ref[1] for more sort options, but be aware keys like `committerdate` that require access to the objects themselves will not work for refs whose objects have not yet been fetched from the remote, and will give a `missing object` error."
msgstr ""
+#. type: Plain text
+#: en/git-ls-remote.txt:80
+#, priority:100
+msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
+msgstr ""
+
#. type: Plain text
#: en/git-ls-remote.txt:85
#, priority:100
@@ -29782,29 +30700,29 @@ msgstr ""
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
-#. type: Plain text
-#: en/git-ls-remote.txt:110
+#. type: delimited block -
+#: en/git-ls-remote.txt:111
#, no-wrap, priority:100
msgid ""
-"\t$ git ls-remote --tags ./.\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"\t$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
-"\t5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"\tc781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
-"\t$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
-"\t$ git ls-remote --tags korg v\\*\n"
-"\td6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-"\tf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-"\tc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-"\t7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"$ git ls-remote --tags ./.\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
+"$ git ls-remote --tags korg v\\*\n"
+"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:114
+#: en/git-ls-remote.txt:116
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -29845,7 +30763,7 @@ msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:35
#, priority:100
-msgid "the behaviour is similar to that of \"/bin/ls\" in that the '<path>' is taken as relative to the current working directory. E.g. when you are in a directory 'sub' that has a directory 'dir', you can run 'git ls-tree -r HEAD dir' to list the contents of the tree (that is 'sub/dir' in `HEAD`). You don't want to give a tree that is not at the root level (e.g. `git ls-tree -r HEAD:sub dir`) in this case, as that would result in asking for 'sub/sub/dir' in the `HEAD` commit. However, the current working directory can be ignored by passing --full-tree option."
+msgid "the behaviour is similar to that of \"/bin/ls\" in that the '<path>' is taken as relative to the current working directory. E.g. when you are in a directory 'sub' that has a directory 'dir', you can run 'git ls-tree -r HEAD dir' to list the contents of the tree (that is `sub/dir` in `HEAD`). You don't want to give a tree that is not at the root level (e.g. `git ls-tree -r HEAD:sub dir`) in this case, as that would result in asking for `sub/sub/dir` in the `HEAD` commit. However, the current working directory can be ignored by passing --full-tree option."
msgstr ""
#. type: Plain text
@@ -30312,7 +31230,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:353
+#: en/git-merge-base.txt:60 en/git-rebase.txt:376
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -30341,235 +31259,235 @@ msgstr ""
msgid "For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:86
+#. type: delimited block .
+#: en/git-merge-base.txt:87
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---B\n"
-"\t /\n"
-"\t---o---1---o---o---o---A\n"
+"\t o---o---o---B\n"
+"\t/\n"
+"---o---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:88
+#: en/git-merge-base.txt:90
#, priority:100
msgid "the merge base between 'A' and 'B' is '1'."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:92
+#: en/git-merge-base.txt:94
#, priority:100
msgid "Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the merge base between 'A' and a hypothetical commit 'M', which is a merge between 'B' and 'C'. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:98
+#. type: delimited block .
+#: en/git-merge-base.txt:101
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---C\n"
-"\t /\n"
-"\t / o---o---o---B\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---C\n"
+" /\n"
+" / o---o---o---B\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:101
+#: en/git-merge-base.txt:105
#, priority:100
msgid "the result of `git merge-base A B C` is '1'. This is because the equivalent topology with a merge commit 'M' between 'B' and 'C' is:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:108
+#. type: delimited block .
+#: en/git-merge-base.txt:113
#, no-wrap, priority:100
msgid ""
-"\t o---o---o---o---o\n"
-"\t / \\\n"
-"\t / o---o---o---o---M\n"
-"\t / /\n"
-"\t---2---1---o---o---o---A\n"
+" o---o---o---o---o\n"
+" / \\\n"
+" / o---o---o---o---M\n"
+" / /\n"
+"---2---1---o---o---o---A\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:112
+#: en/git-merge-base.txt:118
#, priority:100
msgid "and the result of `git merge-base A M` is '1'. Commit '2' is also a common ancestor between 'A' and 'M', but '1' is a better common ancestor, because '2' is an ancestor of '1'. Hence, '2' is not a merge base."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:115
+#: en/git-merge-base.txt:121
#, priority:100
msgid "The result of `git merge-base --octopus A B C` is '2', because '2' is the best common ancestor of all commits."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:118
+#: en/git-merge-base.txt:124
#, priority:100
msgid "When the history involves criss-cross merges, there can be more than one 'best' common ancestor for two commits. For example, with this topology:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:124
+#. type: delimited block .
+#: en/git-merge-base.txt:131
#, no-wrap, priority:100
msgid ""
-"\t---1---o---A\n"
-"\t \\ /\n"
-"\t X\n"
-"\t / \\\n"
-"\t---2---o---o---B\n"
+"---1---o---A\n"
+" \\ /\n"
+" X\n"
+" / \\\n"
+"---2---o---o---B\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:128
+#: en/git-merge-base.txt:136
#, priority:100
msgid "both '1' and '2' are merge-bases of A and B. Neither one is better than the other (both are 'best' merge bases). When the `--all` option is not given, it is unspecified which best one is output."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:133
+#: en/git-merge-base.txt:141
#, priority:100
msgid "A common idiom to check \"fast-forward-ness\" between two commits A and B is (or at least used to be) to compute the merge base between A and B, and check if it is the same as A, in which case, A is an ancestor of B. You will see this idiom used often in older scripts."
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:139
+#. type: delimited block .
+#: en/git-merge-base.txt:148
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tA=$(git rev-parse --verify A)\n"
-"\tif test \"$A\" = \"$(git merge-base A B)\"\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"A=$(git rev-parse --verify A)\n"
+"if test \"$A\" = \"$(git merge-base A B)\"\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:141
+#: en/git-merge-base.txt:151
#, priority:100
msgid "In modern git, you can say this in a more direct way:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:146
+#. type: delimited block .
+#: en/git-merge-base.txt:157
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\tif git merge-base --is-ancestor A B\n"
-"\tthen\n"
-"\t\t... A is an ancestor of B ...\n"
-"\tfi\n"
+"if git merge-base --is-ancestor A B\n"
+"then\n"
+"\t... A is an ancestor of B ...\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:148
+#: en/git-merge-base.txt:160
#, priority:100
msgid "instead."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:150
+#: en/git-merge-base.txt:162
#, no-wrap, priority:100
msgid "Discussion on fork-point mode"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:156
+#: en/git-merge-base.txt:168
#, priority:100
-msgid "After working on the `topic` branch created with `git checkout -b topic origin/master`, the history of remote-tracking branch `origin/master` may have been rewound and rebuilt, leading to a history of this shape:"
+msgid "After working on the `topic` branch created with `git switch -c topic origin/master`, the history of remote-tracking branch `origin/master` may have been rewound and rebuilt, leading to a history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:164
+#. type: delimited block .
+#: en/git-merge-base.txt:177
#, no-wrap, priority:100
msgid ""
-"\t o---B2\n"
-"\t /\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t \\\n"
-"\t B0\n"
-"\t \\\n"
-"\t D0---D1---D (topic)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\\n"
+"\t B0\n"
+"\t \\\n"
+"\t D0---D1---D (topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:170
+#: en/git-merge-base.txt:184
#, priority:100
msgid "where `origin/master` used to point at commits B0, B1, B2 and now it points at B, and your `topic` branch was started on top of it back when `origin/master` was at B0, and you built three commits, D0, D1, and D, on top of it. Imagine that you now want to rebase the work you did on the topic on top of the updated origin/master."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:176
+#: en/git-merge-base.txt:190
#, priority:100
msgid "In such a case, `git merge-base origin/master topic` would return the parent of B0 in the above picture, but B0^..D is *not* the range of commits you would want to replay on top of B (it includes B0, which is not what you wrote; it is a commit the other side discarded when it moved its tip from B0 to B1)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:184
+#: en/git-merge-base.txt:198
#, priority:100
msgid "`git merge-base --fork-point origin/master topic` is designed to help in such a case. It takes not only B but also B0, B1, and B2 (i.e. old tips of the remote-tracking branches your repository's reflog knows about) into account to see on which commit your topic branch was built and finds B0, allowing you to replay only the commits on your topic, excluding the commits the other side later discarded."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:186
+#: en/git-merge-base.txt:200
#, priority:100
msgid "Hence"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:188
+#: en/git-merge-base.txt:202
#, no-wrap, priority:100
msgid " $ fork_point=$(git merge-base --fork-point origin/master topic)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:190
+#: en/git-merge-base.txt:204
#, priority:100
msgid "will find B0, and"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:192
+#: en/git-merge-base.txt:206
#, no-wrap, priority:100
msgid " $ git rebase --onto origin/master $fork_point topic\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:195
+#: en/git-merge-base.txt:209
#, priority:100
msgid "will replay D0, D1 and D on top of B to create a new history of this shape:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-base.txt:203
+#. type: delimited block .
+#: en/git-merge-base.txt:218
#, no-wrap, priority:100
msgid ""
-"\t\t\t o---B2\n"
-"\t\t\t/\n"
-"\t---o---o---B1--o---o---o---B (origin/master)\n"
-"\t\t\\ \\\n"
-"\t\t B0 D0'--D1'--D' (topic - updated)\n"
-"\t\t \\\n"
-"\t\t D0---D1---D (topic - old)\n"
+"\t\t o---B2\n"
+"\t\t/\n"
+"---o---o---B1--o---o---o---B (origin/master)\n"
+"\t\\ \\\n"
+"\t B0 D0'--D1'--D' (topic - updated)\n"
+"\t \\\n"
+"\t D0---D1---D (topic - old)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:210
+#: en/git-merge-base.txt:226
#, priority:100
msgid "A caveat is that older reflog entries in your repository may be expired by `git gc`. If B0 no longer appears in the reflog of the remote-tracking branch `origin/master`, the `--fork-point` mode obviously cannot find it and fails, avoiding to give a random and useless result (such as the parent of B0, like the same command without the `--fork-point` option gives)."
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:221
+#: en/git-merge-base.txt:237
#, priority:100
msgid "Also, the remote-tracking branch you use the `--fork-point` mode with must be the one your topic forked from its tip. If you forked from an older commit than the tip, this mode would not find the fork point (imagine in the above sample history B0 did not exist, origin/master started at B1, moved to B2 and then B, and you forked your topic at origin/master^ when origin/master was B1; the shape of the history would be the same as above, without B0, and the parent of B1 is what `git merge-base origin/master topic` correctly finds, but the `--fork-point` mode will not, because it is not one of the commits that used to be at the tip of origin/master)."
msgstr ""
#. type: Title -
-#: en/git-merge-base.txt:224
+#: en/git-merge-base.txt:240
#, no-wrap, priority:100
msgid "See also"
msgstr ""
#. type: Plain text
-#: en/git-merge-base.txt:228
+#: en/git-merge-base.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
msgstr "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
@@ -30780,31 +31698,31 @@ msgstr ""
msgid "Examples:"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:62
+#. type: delimited block -
+#: en/git-merge-index.txt:63
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
-" This is MM from the original tree.\t\t\t# original\n"
-" This is modified MM in the branch A.\t\t\t# merge1\n"
-" This is modified MM in the branch B.\t\t\t# merge2\n"
-" This is modified MM in the branch B.\t\t\t# current contents\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
+"This is MM from the original tree.\t\t# original\n"
+"This is modified MM in the branch A.\t\t# merge1\n"
+"This is modified MM in the branch B.\t\t# merge2\n"
+"This is modified MM in the branch B.\t\t# current contents\n"
msgstr ""
-#. type: Plain text
-#: en/git-merge-index.txt:71
+#. type: delimited block -
+#: en/git-merge-index.txt:74
#, no-wrap, priority:100
msgid ""
-" torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
-" cat: : No such file or directory\n"
-" This is added AA in the branch A.\n"
-" This is added AA in the branch B.\n"
-" This is added AA in the branch B.\n"
-" fatal: merge program failed\n"
+"torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
+"cat: : No such file or directory\n"
+"This is added AA in the branch A.\n"
+"This is added AA in the branch B.\n"
+"This is added AA in the branch B.\n"
+"fatal: merge program failed\n"
msgstr ""
#. type: Plain text
-#: en/git-merge-index.txt:76
+#: en/git-merge-index.txt:80
#, priority:100
msgid "where the latter example shows how 'git merge-index' will stop trying to merge once anything has returned an error (i.e., `cat` returned an error for the AA file, because it didn't exist in the original, and thus 'git merge-index' didn't even try to merge the MM thing)."
msgstr ""
@@ -30882,43 +31800,43 @@ msgid "get_merge_tool"
msgstr ""
#. type: Plain text
-#: en/git-mergetool--lib.txt:32
+#: en/git-mergetool--lib.txt:34
#, priority:100
-msgid "returns a merge tool."
+msgid "returns a merge tool. the return code is 1 if we returned a guessed merge tool, else 0. '$GIT_MERGETOOL_GUI' may be set to 'true' to search for the appropriate guitool."
msgstr ""
#. type: Labeled list
-#: en/git-mergetool--lib.txt:33
+#: en/git-mergetool--lib.txt:35
#, no-wrap, priority:100
msgid "get_merge_tool_cmd"
msgstr ""
#. type: Plain text
-#: en/git-mergetool--lib.txt:35
+#: en/git-mergetool--lib.txt:37
#, priority:100
msgid "returns the custom command for a merge tool."
msgstr ""
#. type: Labeled list
-#: en/git-mergetool--lib.txt:36
+#: en/git-mergetool--lib.txt:38
#, no-wrap, priority:100
msgid "get_merge_tool_path"
msgstr ""
#. type: Plain text
-#: en/git-mergetool--lib.txt:38
+#: en/git-mergetool--lib.txt:40
#, priority:100
msgid "returns the custom path for a merge tool."
msgstr ""
#. type: Labeled list
-#: en/git-mergetool--lib.txt:39
+#: en/git-mergetool--lib.txt:41
#, no-wrap, priority:100
msgid "run_merge_tool"
msgstr ""
#. type: Plain text
-#: en/git-mergetool--lib.txt:44
+#: en/git-mergetool--lib.txt:46
#, priority:100
msgid "launches a merge tool given the tool name and a true/false flag to indicate whether a merge base is present. '$MERGED', '$LOCAL', '$REMOTE', and '$BASE' must be defined for use by the merge tool."
msgstr ""
@@ -31014,43 +31932,43 @@ msgid "--gui"
msgstr "--gui"
#. type: Plain text
-#: en/git-mergetool.txt:87
+#: en/git-mergetool.txt:89
#, priority:240
-msgid "When 'git-mergetool' is invoked with the `-g` or `--gui` option the default merge tool will be read from the configured `merge.guitool` variable instead of `merge.tool`."
+msgid "When 'git-mergetool' is invoked with the `-g` or `--gui` option the default merge tool will be read from the configured `merge.guitool` variable instead of `merge.tool`. If `merge.guitool` is not set, we will fallback to the tool configured under `merge.tool`."
msgstr ""
#. type: Labeled list
-#: en/git-mergetool.txt:88
+#: en/git-mergetool.txt:90
#, ignore-same, no-wrap, priority:240
msgid "--no-gui"
msgstr "--no-gui"
#. type: Plain text
-#: en/git-mergetool.txt:92
+#: en/git-mergetool.txt:94
#, priority:240
msgid "This overrides a previous `-g` or `--gui` setting and reads the default merge tool will be read from the configured `merge.tool` variable."
msgstr ""
#. type: Plain text
-#: en/git-mergetool.txt:99
+#: en/git-mergetool.txt:101
#, priority:240
msgid "Process files in the order specified in the <orderfile>, which has one shell glob pattern per line. This overrides the `diff.orderFile` configuration variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/dev/null`."
msgstr ""
#. type: Title -
-#: en/git-mergetool.txt:101
+#: en/git-mergetool.txt:103
#, no-wrap, priority:240
msgid "TEMPORARY FILES"
msgstr ""
#. type: Plain text
-#: en/git-mergetool.txt:105
+#: en/git-mergetool.txt:107
#, priority:240
msgid "`git mergetool` creates `*.orig` backup files while resolving merges. These are safe to remove once a file has been merged and its `git mergetool` session has completed."
msgstr ""
#. type: Plain text
-#: en/git-mergetool.txt:109
+#: en/git-mergetool.txt:111
#, priority:240
msgid "Setting the `mergetool.keepBackup` configuration variable to `false` causes `git mergetool` to automatically remove the backup as files are successfully merged."
msgstr ""
@@ -31098,31 +32016,30 @@ msgid "git-merge - Join two or more development histories together"
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:18
+#: en/git-merge.txt:17
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n"
-"\t[-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
+"\t[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
"\t[--[no-]allow-unrelated-histories]\n"
"\t[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]\n"
-"'git merge' --abort\n"
-"'git merge' --continue\n"
+"'git merge' (--continue | --abort | --quit)\n"
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:26
+#: en/git-merge.txt:25
#, priority:240
msgid "Incorporates changes from the named commits (since the time their histories diverged from the current branch) into the current branch. This command is used by 'git pull' to incorporate changes from another repository and can be used by hand to merge changes from one branch into another."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:29 en/git-pull.txt:40
+#: en/git-merge.txt:28 en/git-pull.txt:40
#, priority:240
msgid "Assume the following history exists and the current branch is \"`master`\":"
msgstr ""
#. type: delimited block -
-#: en/git-merge.txt:34
+#: en/git-merge.txt:33
#, no-wrap, priority:240
msgid ""
"\t A---B---C topic\n"
@@ -31131,13 +32048,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:41
+#: en/git-merge.txt:40
#, priority:240
msgid "Then \"`git merge topic`\" will replay the changes made on the `topic` branch since it diverged from `master` (i.e., `E`) until its current commit (`C`) on top of `master`, and record the result in a new commit along with the names of the two parent commits and a log message from the user describing the changes."
msgstr ""
#. type: delimited block -
-#: en/git-merge.txt:46
+#: en/git-merge.txt:45
#, no-wrap, priority:240
msgid ""
"\t A---B---C topic\n"
@@ -31146,13 +32063,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:55
+#: en/git-merge.txt:54
#, priority:240
msgid "The second syntax (\"`git merge --abort`\") can only be run after the merge has resulted in conflicts. 'git merge --abort' will abort the merge process and try to reconstruct the pre-merge state. However, if there were uncommitted changes when the merge started (and especially if those changes were further modified after the merge was started), 'git merge --abort' will in some cases be unable to reconstruct the original (pre-merge) changes. Therefore:"
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:59
+#: en/git-merge.txt:58
#, no-wrap, priority:240
msgid ""
"*Warning*: Running 'git merge' with non-trivial uncommitted changes is\n"
@@ -31161,217 +32078,217 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:62
+#: en/git-merge.txt:61
#, priority:240
msgid "The third syntax (\"`git merge --continue`\") can only be run after the merge has resulted in conflicts."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:70
+#: en/git-merge.txt:69
#, priority:240
msgid "Set the commit message to be used for the merge commit (in case one is created)."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:73 en/git-merge.txt:85
+#: en/git-merge.txt:72 en/git-merge.txt:84
#, priority:240
msgid "If `--log` is specified, a shortlog of the commits being merged will be appended to the specified message."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:77
+#: en/git-merge.txt:76
#, priority:240
msgid "The 'git fmt-merge-msg' command can be used to give a good default for automated 'git merge' invocations. The automated message can include the branch description."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:82
+#: en/git-merge.txt:81
#, priority:240
msgid "Read the commit message to be used for the merge commit (in case one is created)."
msgstr ""
-#. type: Labeled list
-#: en/git-merge.txt:86
-#, ignore-same, no-wrap, priority:240
-msgid "--[no-]rerere-autoupdate"
-msgstr "--[no-]rerere-autoupdate"
-
#. type: Plain text
-#: en/git-merge.txt:89
+#: en/git-merge.txt:94
#, priority:240
-msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
+msgid "Silently overwrite ignored files from the merge result. This is the default behavior. Use `--no-overwrite-ignore` to abort."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:93
+#: en/git-merge.txt:98
#, priority:240
msgid "Abort the current conflict resolution process, and try to reconstruct the pre-merge state."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:98
+#: en/git-merge.txt:103
#, priority:240
msgid "If there were uncommitted worktree changes present when the merge started, 'git merge --abort' will in some cases be unable to reconstruct these changes. It is therefore recommended to always commit or stash your changes before running 'git merge'."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:101
+#: en/git-merge.txt:106
#, priority:240
msgid "'git merge --abort' is equivalent to 'git reset --merge' when `MERGE_HEAD` is present."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:106
+#: en/git-merge.txt:110
+#, priority:240
+msgid "Forget about the current merge in progress. Leave the index and the working tree as-is."
+msgstr ""
+
+#. type: Plain text
+#: en/git-merge.txt:115
#, priority:240
msgid "After a 'git merge' stops due to conflicts you can conclude the merge by running 'git merge --continue' (see \"HOW TO RESOLVE CONFLICTS\" section below)."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:111
+#: en/git-merge.txt:120
#, priority:240
msgid "Commits, usually other branch heads, to merge into our branch. Specifying more than one commit will create a merge with more than two parents (affectionately called an Octopus merge)."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:115
+#: en/git-merge.txt:124
#, priority:240
msgid "If no commit is given from the command line, merge the remote-tracking branches that the current branch is configured to use as its upstream. See also the configuration section of this manual page."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:119
+#: en/git-merge.txt:128
#, priority:240
msgid "When `FETCH_HEAD` (and no other commit) is specified, the branches recorded in the `.git/FETCH_HEAD` file by the previous invocation of `git fetch` for merging are merged to the current branch."
msgstr ""
#. type: Title -
-#: en/git-merge.txt:122
+#: en/git-merge.txt:131
#, no-wrap, priority:240
msgid "PRE-MERGE CHECKS"
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:130
+#: en/git-merge.txt:139
#, priority:240
msgid "Before applying outside changes, you should get your own work in good shape and committed locally, so it will not be clobbered if there are conflicts. See also linkgit:git-stash[1]. 'git pull' and 'git merge' will stop without doing anything when local uncommitted changes overlap with files that 'git pull'/'git merge' may need to update."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:136
+#: en/git-merge.txt:145
#, priority:240
msgid "To avoid recording unrelated changes in the merge commit, 'git pull' and 'git merge' will also abort if there are any changes registered in the index relative to the `HEAD` commit. (Special narrow exceptions to this rule may exist depending on which merge strategy is in use, but generally, the index must match HEAD.)"
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:139
+#: en/git-merge.txt:148
#, priority:240
msgid "If all named commits are already ancestors of `HEAD`, 'git merge' will exit early with the message \"Already up to date.\""
msgstr ""
#. type: Title -
-#: en/git-merge.txt:141
+#: en/git-merge.txt:150
#, no-wrap, priority:240
msgid "FAST-FORWARD MERGE"
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:151
+#: en/git-merge.txt:160
#, priority:240
msgid "Often the current branch head is an ancestor of the named commit. This is the most common case especially when invoked from 'git pull': you are tracking an upstream repository, you have committed no local changes, and now you want to update to a newer upstream revision. In this case, a new commit is not needed to store the combined history; instead, the `HEAD` (along with the index) is updated to point at the named commit, without creating an extra merge commit."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:153
+#: en/git-merge.txt:162
#, priority:240
msgid "This behavior can be suppressed with the `--no-ff` option."
msgstr ""
#. type: Title -
-#: en/git-merge.txt:155
+#: en/git-merge.txt:164
#, no-wrap, priority:240
msgid "TRUE MERGE"
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:160
+#: en/git-merge.txt:169
#, priority:240
msgid "Except in a fast-forward merge (see above), the branches to be merged must be tied together by a merge commit that has both of them as its parents."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:165
+#: en/git-merge.txt:174
#, priority:240
msgid "A merged version reconciling the changes from all branches to be merged is committed, and your `HEAD`, index, and working tree are updated to it. It is possible to have modifications in the working tree as long as they do not overlap; the update will preserve them."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:168
+#: en/git-merge.txt:177
#, priority:240
msgid "When it is not obvious how to reconcile the changes, the following happens:"
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:170
+#: en/git-merge.txt:179
#, priority:240
msgid "The `HEAD` pointer stays the same."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:171
+#: en/git-merge.txt:180
#, priority:240
msgid "The `MERGE_HEAD` ref is set to point to the other branch head."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:173
+#: en/git-merge.txt:182
#, priority:240
msgid "Paths that merged cleanly are updated both in the index file and in your working tree."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:179
+#: en/git-merge.txt:188
#, priority:240
msgid "For conflicting paths, the index file records up to three versions: stage 1 stores the version from the common ancestor, stage 2 from `HEAD`, and stage 3 from `MERGE_HEAD` (you can inspect the stages with `git ls-files -u`). The working tree files contain the result of the \"merge\" program; i.e. 3-way merge results with familiar conflict markers `<<<` `===` `>>>`."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:183
+#: en/git-merge.txt:192
#, priority:240
msgid "No other changes are made. In particular, the local modifications you had before you started merge will stay the same and the index entries for them stay as they were, i.e. matching `HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:186
+#: en/git-merge.txt:195
#, priority:240
msgid "If you tried a merge which resulted in complex conflicts and want to start over, you can recover with `git merge --abort`."
msgstr ""
#. type: Title -
-#: en/git-merge.txt:188
+#: en/git-merge.txt:197
#, no-wrap, priority:240
msgid "MERGING TAG"
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:195
+#: en/git-merge.txt:204
#, priority:240
msgid "When merging an annotated (and possibly signed) tag, Git always creates a merge commit even if a fast-forward merge is possible, and the commit message template is prepared with the tag message. Additionally, if the tag is signed, the signature check is reported as a comment in the message template. See also linkgit:git-tag[1]."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:199
+#: en/git-merge.txt:208
#, priority:240
msgid "When you want to just integrate with the work leading to the commit that happens to be tagged, e.g. synchronizing with an upstream release point, you may not want to make an unnecessary merge commit."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:203
+#: en/git-merge.txt:212
#, priority:240
msgid "In such a case, you can \"unwrap\" the tag yourself before feeding it to `git merge`, or pass `--ff-only` when you do not have any work on your own. e.g."
msgstr ""
#. type: delimited block -
-#: en/git-merge.txt:208
+#: en/git-merge.txt:217
#, no-wrap, priority:240
msgid ""
"git fetch origin\n"
@@ -31380,25 +32297,25 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-merge.txt:212
+#: en/git-merge.txt:221
#, no-wrap, priority:240
msgid "HOW CONFLICTS ARE PRESENTED"
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:221
+#: en/git-merge.txt:230
#, priority:240
msgid "During a merge, the working tree files are updated to reflect the result of the merge. Among the changes made to the common ancestor's version, non-overlapping ones (that is, you changed an area of the file while the other side left that area intact, or vice versa) are incorporated in the final result verbatim. When both sides made changes to the same area, however, Git cannot randomly pick one side over the other, and asks you to resolve it by leaving what both sides did to that area."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:224
+#: en/git-merge.txt:233
#, priority:240
msgid "By default, Git uses the same style as the one used by the \"merge\" program from the RCS suite to present such a conflicted hunk, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-merge.txt:235
+#: en/git-merge.txt:244
#, no-wrap, priority:240
msgid ""
"Here are lines that are either unchanged from the common\n"
@@ -31413,25 +32330,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:240
+#: en/git-merge.txt:249
#, priority:240
msgid "The area where a pair of conflicting changes happened is marked with markers `<<<<<<<`, `=======`, and `>>>>>>>`. The part before the `=======` is typically your side, and the part afterwards is typically their side."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:246
+#: en/git-merge.txt:255
#, priority:240
msgid "The default format does not show what the original said in the conflicting area. You cannot tell how many lines are deleted and replaced with Barbie's remark on your side. The only thing you can tell is that your side wants to say it is hard and you'd prefer to go shopping, while the other side wants to claim it is easy."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:250
+#: en/git-merge.txt:259
#, priority:240
msgid "An alternative style can be used by setting the \"merge.conflictStyle\" configuration variable to \"diff3\". In \"diff3\" style, the above conflict may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-merge.txt:263
+#: en/git-merge.txt:272
#, no-wrap, priority:240
msgid ""
"Here are lines that are either unchanged from the common\n"
@@ -31448,127 +32365,127 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:271
+#: en/git-merge.txt:280
#, priority:240
msgid "In addition to the `<<<<<<<`, `=======`, and `>>>>>>>` markers, it uses another `|||||||` marker that is followed by the original text. You can tell that the original just stated a fact, and your side simply gave in to that statement and gave up, while the other side tried to have a more positive attitude. You can sometimes come up with a better resolution by viewing the original."
msgstr ""
#. type: Title -
-#: en/git-merge.txt:274
+#: en/git-merge.txt:283
#, no-wrap, priority:240
msgid "HOW TO RESOLVE CONFLICTS"
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:277
+#: en/git-merge.txt:286
#, priority:240
msgid "After seeing a conflict, you can do two things:"
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:282
+#: en/git-merge.txt:291
#, priority:240
msgid "Decide not to merge. The only clean-ups you need are to reset the index file to the `HEAD` commit to reverse 2. and to clean up working tree changes made by 2. and 3.; `git merge --abort` can be used for this."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:289
+#: en/git-merge.txt:298
#, priority:240
msgid "Resolve the conflicts. Git will mark the conflicts in the working tree. Edit the files into shape and 'git add' them to the index. Use 'git commit' or 'git merge --continue' to seal the deal. The latter command checks whether there is a (interrupted) merge in progress before calling 'git commit'."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:291
+#: en/git-merge.txt:300
#, priority:240
msgid "You can work through the conflict with a number of tools:"
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:294
+#: en/git-merge.txt:303
#, priority:240
msgid "Use a mergetool. `git mergetool` to launch a graphical mergetool which will work you through the merge."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:298
+#: en/git-merge.txt:307
#, priority:240
msgid "Look at the diffs. `git diff` will show a three-way diff, highlighting changes from both the `HEAD` and `MERGE_HEAD` versions."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:302
+#: en/git-merge.txt:311
#, priority:240
msgid "Look at the diffs from each branch. `git log --merge -p <path>` will show diffs first for the `HEAD` version and then the `MERGE_HEAD` version."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:307
+#: en/git-merge.txt:316
#, priority:240
msgid "Look at the originals. `git show :1:filename` shows the common ancestor, `git show :2:filename` shows the `HEAD` version, and `git show :3:filename` shows the `MERGE_HEAD` version."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:314
+#: en/git-merge.txt:323
#, priority:240
msgid "Merge branches `fixes` and `enhancements` on top of the current branch, making an octopus merge:"
msgstr ""
#. type: delimited block -
-#: en/git-merge.txt:317
+#: en/git-merge.txt:326
#, no-wrap, priority:240
msgid "$ git merge fixes enhancements\n"
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:321
+#: en/git-merge.txt:330
#, priority:240
msgid "Merge branch `obsolete` into the current branch, using `ours` merge strategy:"
msgstr ""
#. type: delimited block -
-#: en/git-merge.txt:324
+#: en/git-merge.txt:333
#, no-wrap, priority:240
msgid "$ git merge -s ours obsolete\n"
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:328
+#: en/git-merge.txt:337
#, priority:240
msgid "Merge branch `maint` into the current branch, but do not make a new commit automatically:"
msgstr ""
#. type: delimited block -
-#: en/git-merge.txt:331
+#: en/git-merge.txt:340
#, no-wrap, priority:240
msgid "$ git merge --no-commit maint\n"
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:335
+#: en/git-merge.txt:344
#, priority:240
msgid "This can be used when you want to include further changes to the merge, or want to write your own merge commit message."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:339
+#: en/git-merge.txt:348
#, priority:240
msgid "You should refrain from abusing this option to sneak substantial changes into a merge commit. Small fixups like bumping release/version name would be acceptable."
msgstr ""
#. type: Labeled list
-#: en/git-merge.txt:347
+#: en/git-merge.txt:356
#, no-wrap, priority:240
msgid "branch.<name>.mergeOptions"
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:351
+#: en/git-merge.txt:360
#, priority:240
msgid "Sets default options for merging into branch <name>. The syntax and supported options are the same as those of 'git merge', but option values containing whitespace characters are currently not supported."
msgstr ""
#. type: Plain text
-#: en/git-merge.txt:360
+#: en/git-merge.txt:369
#, ignore-same, priority:240
msgid "linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5], linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]"
msgstr "linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5], linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]"
@@ -32040,7 +32957,7 @@ msgid "Show the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:97 en/git-submodule.txt:150
+#: en/git-notes.txt:97 en/git-submodule.txt:155
#, no-wrap, priority:220
msgid "merge"
msgstr ""
@@ -32126,7 +33043,7 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:152
#, priority:100
-msgid "Take the given blob object (for\texample, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
+msgid "Take the given blob object (for example, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr ""
#. type: Labeled list
@@ -32184,7 +33101,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:281 en/merge-options.txt:94
+#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -33164,8 +34081,8 @@ msgid "Conflicts can occur when applying a commit to p4. When this happens, the
msgstr ""
#. type: Labeled list
-#: en/git-p4.txt:359
-#, no-wrap, priority:100
+#: en/git-p4.txt:359 en/git-submodule.txt:271
+#, no-wrap, priority:220
msgid "--branch <branch>"
msgstr ""
@@ -34042,7 +34959,7 @@ msgid "Read the revision arguments from the standard input, instead of individua
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:72 en/rev-list-options.txt:707
+#: en/git-pack-objects.txt:72 en/rev-list-options.txt:715
#, ignore-same, no-wrap, priority:260
msgid "--unpacked"
msgstr "--unpacked"
@@ -34122,7 +35039,7 @@ msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:137
#, priority:100
-msgid "This flag causes an object already in the given pack to be ignored, even if it would have otherwise been packed. `<pack-name>` is the the pack file name without leading directory (e.g. `pack-123.pack`). The option could be specified multiple times to keep multiple packs."
+msgid "This flag causes an object already in the given pack to be ignored, even if it would have otherwise been packed. `<pack-name>` is the pack file name without leading directory (e.g. `pack-123.pack`). The option could be specified multiple times to keep multiple packs."
msgstr ""
#. type: Plain text
@@ -34216,7 +35133,7 @@ msgid "Specifies compression level for newly-compressed data in the generated pa
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:199 en/git-show-branch.txt:67 en/rev-list-options.txt:342 en/rev-list-options.txt:475
+#: en/git-pack-objects.txt:199 en/git-show-branch.txt:67 en/rev-list-options.txt:350 en/rev-list-options.txt:483
#, ignore-same, no-wrap, priority:260
msgid "--sparse"
msgstr "--sparse"
@@ -34288,7 +35205,7 @@ msgid "With this option, parents that are hidden by grafts are packed neverthele
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:258 en/rev-list-options.txt:711
+#: en/git-pack-objects.txt:258 en/rev-list-options.txt:729
#, no-wrap, priority:260
msgid "--filter=<filter-spec>"
msgstr ""
@@ -34300,7 +35217,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:263 en/rev-list-options.txt:741
+#: en/git-pack-objects.txt:263 en/rev-list-options.txt:776
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -34312,13 +35229,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:266 en/rev-list-options.txt:748
+#: en/git-pack-objects.txt:266 en/rev-list-options.txt:783
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:269 en/rev-list-options.txt:751
+#: en/git-pack-objects.txt:269 en/rev-list-options.txt:786
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -34330,7 +35247,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:276 en/rev-list-options.txt:758
+#: en/git-pack-objects.txt:276 en/rev-list-options.txt:793
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -34342,7 +35259,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:281 en/rev-list-options.txt:766
+#: en/git-pack-objects.txt:281 en/rev-list-options.txt:801
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -35059,157 +35976,157 @@ msgid "When set to `merges`, rebase using `git rebase --rebase-merges` so that t
msgstr ""
#. type: Plain text
-#: en/git-pull.txt:117
+#: en/git-pull.txt:118
#, priority:220
-msgid "When set to preserve, rebase with the `--preserve-merges` option passed to `git rebase` so that locally created merge commits will not be flattened."
+msgid "When set to `preserve` (deprecated in favor of `merges`), rebase with the `--preserve-merges` option passed to `git rebase` so that locally created merge commits will not be flattened."
msgstr ""
#. type: Plain text
-#: en/git-pull.txt:119
+#: en/git-pull.txt:120
#, priority:220
msgid "When false, merge the current branch into the upstream branch."
msgstr ""
#. type: Plain text
-#: en/git-pull.txt:121
+#: en/git-pull.txt:122
#, priority:220
msgid "When `interactive`, enable the interactive mode of rebase."
msgstr ""
#. type: Plain text
-#: en/git-pull.txt:125
+#: en/git-pull.txt:126
#, priority:220
msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
msgstr ""
#. type: Plain text
-#: en/git-pull.txt:131
+#: en/git-pull.txt:132
#, priority:220
msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:132 en/git-svn.txt:261
+#: en/git-pull.txt:133 en/git-svn.txt:261
#, ignore-same, no-wrap, priority:220
msgid "--no-rebase"
msgstr "--no-rebase"
#. type: Plain text
-#: en/git-pull.txt:134
+#: en/git-pull.txt:135
#, priority:220
msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:135 en/git-rebase.txt:496
+#: en/git-pull.txt:136 en/git-rebase.txt:524
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:497
+#: en/git-pull.txt:137 en/git-rebase.txt:525
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
#. type: Plain text
-#: en/git-pull.txt:141
+#: en/git-pull.txt:142
#, priority:220
msgid "Before starting rebase, stash local modifications away (see linkgit:git-stash[1]) if needed, and apply the stash entry when done. `--no-autostash` is useful to override the `rebase.autoStash` configuration variable (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/git-pull.txt:143
+#: en/git-pull.txt:144
#, priority:220
msgid "This option is only valid when \"--rebase\" is used."
msgstr ""
#. type: Title ~
-#: en/git-pull.txt:145
+#: en/git-pull.txt:146
#, no-wrap, priority:220
msgid "Options related to fetching"
msgstr ""
#. type: Title -
-#: en/git-pull.txt:156
+#: en/git-pull.txt:157
#, no-wrap, priority:220
msgid "DEFAULT BEHAVIOUR"
msgstr ""
#. type: Plain text
-#: en/git-pull.txt:163
+#: en/git-pull.txt:164
#, priority:220
msgid "Often people use `git pull` without giving any parameter. Traditionally, this has been equivalent to saying `git pull origin`. However, when configuration `branch.<name>.remote` is present while on branch `<name>`, that value is used instead of `origin`."
msgstr ""
#. type: Plain text
-#: en/git-pull.txt:168
+#: en/git-pull.txt:169
#, priority:220
msgid "In order to determine what URL to use to fetch from, the value of the configuration `remote.<origin>.url` is consulted and if there is not any such variable, the value on the `URL:` line in `$GIT_DIR/remotes/<origin>` is used."
msgstr ""
#. type: Plain text
-#: en/git-pull.txt:177
+#: en/git-pull.txt:178
#, priority:220
msgid "In order to determine what remote branches to fetch (and optionally store in the remote-tracking branches) when the command is run without any refspec parameters on the command line, values of the configuration variable `remote.<origin>.fetch` are consulted, and if there aren't any, `$GIT_DIR/remotes/<origin>` is consulted and its `Pull:` lines are used. In addition to the refspec formats described in the OPTIONS section, you can have a globbing refspec that looks like this:"
msgstr ""
#. type: delimited block -
-#: en/git-pull.txt:180
+#: en/git-pull.txt:181
#, no-wrap, priority:220
msgid "refs/heads/*:refs/remotes/origin/*\n"
msgstr ""
#. type: Plain text
-#: en/git-pull.txt:187
+#: en/git-pull.txt:188
#, priority:220
msgid "A globbing refspec must have a non-empty RHS (i.e. must store what were fetched in remote-tracking branches), and its LHS and RHS must end with `/*`. The above specifies that all remote branches are tracked using remote-tracking branches in `refs/remotes/origin/` hierarchy under the same name."
msgstr ""
#. type: Plain text
-#: en/git-pull.txt:191
+#: en/git-pull.txt:192
#, priority:220
msgid "The rule to determine which remote branch to merge after fetching is a bit involved, in order not to break backward compatibility."
msgstr ""
#. type: Plain text
-#: en/git-pull.txt:194
+#: en/git-pull.txt:195
#, priority:220
msgid "If explicit refspecs were given on the command line of `git pull`, they are all merged."
msgstr ""
#. type: Plain text
-#: en/git-pull.txt:199
+#: en/git-pull.txt:200
#, priority:220
msgid "When no refspec was given on the command line, then `git pull` uses the refspec from the configuration or `$GIT_DIR/remotes/<origin>`. In such cases, the following rules apply:"
msgstr ""
#. type: Plain text
-#: en/git-pull.txt:203
+#: en/git-pull.txt:204
#, priority:220
msgid "If `branch.<name>.merge` configuration for the current branch `<name>` exists, that is the name of the branch at the remote site that is merged."
msgstr ""
#. type: Plain text
-#: en/git-pull.txt:205
+#: en/git-pull.txt:206
#, priority:220
msgid "If the refspec is a globbing one, nothing is merged."
msgstr ""
#. type: Plain text
-#: en/git-pull.txt:207
+#: en/git-pull.txt:208
#, priority:220
msgid "Otherwise the remote branch of the first refspec is merged."
msgstr ""
#. type: Plain text
-#: en/git-pull.txt:215
+#: en/git-pull.txt:216
#, priority:220
msgid "Update the remote-tracking branches for the repository you cloned from, then merge one of them into your current branch:"
msgstr ""
#. type: delimited block -
-#: en/git-pull.txt:219
+#: en/git-pull.txt:220
#, no-wrap, priority:220
msgid ""
"$ git pull\n"
@@ -35217,31 +36134,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-pull.txt:224
+#: en/git-pull.txt:225
#, priority:220
msgid "Normally the branch merged in is the HEAD of the remote repository, but the choice is determined by the branch.<name>.remote and branch.<name>.merge options; see linkgit:git-config[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-pull.txt:226
+#: en/git-pull.txt:227
#, priority:220
msgid "Merge into the current branch the remote branch `next`:"
msgstr ""
#. type: delimited block -
-#: en/git-pull.txt:229
+#: en/git-pull.txt:230
#, no-wrap, priority:220
msgid "$ git pull origin next\n"
msgstr ""
#. type: Plain text
-#: en/git-pull.txt:234
+#: en/git-pull.txt:235
#, priority:220
msgid "This leaves a copy of `next` temporarily in FETCH_HEAD, but does not update any remote-tracking branches. Using remote-tracking branches, the same can be done by invoking fetch and merge:"
msgstr ""
#. type: delimited block -
-#: en/git-pull.txt:238
+#: en/git-pull.txt:239
#, no-wrap, priority:220
msgid ""
"$ git fetch origin\n"
@@ -35249,13 +36166,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-pull.txt:243
+#: en/git-pull.txt:244
#, priority:220
msgid "If you tried a pull which resulted in complex conflicts and would want to start over, you can recover with 'git reset'."
msgstr ""
#. type: Plain text
-#: en/git-pull.txt:259
+#: en/git-pull.txt:260
#, ignore-same, priority:220
msgid "linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]"
msgstr "linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]"
@@ -35353,7 +36270,7 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:80
#, priority:220
-msgid "If <dst> doesn't start with `refs/` (e.g. `refs/heads/master`) we will try to infer where in `refs/*` on the destination <repository> it belongs based on the the type of <src> being pushed and whether <dst> is ambiguous."
+msgid "If <dst> doesn't start with `refs/` (e.g. `refs/heads/master`) we will try to infer where in `refs/*` on the destination <repository> it belongs based on the type of <src> being pushed and whether <dst> is ambiguous."
msgstr ""
#. type: Plain text
@@ -36320,229 +37237,235 @@ msgid "--reset"
msgstr "--reset"
#. type: Plain text
-#: en/git-read-tree.txt:43
+#: en/git-read-tree.txt:44
#, priority:100
-msgid "Same as -m, except that unmerged entries are discarded instead of failing."
+msgid "Same as -m, except that unmerged entries are discarded instead of failing. When used with `-u`, updates leading to loss of working tree changes will not abort the operation."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:47
+#: en/git-read-tree.txt:48
#, priority:100
msgid "After a successful merge, update the files in the work tree with the result of the merge."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:56
+#: en/git-read-tree.txt:57
#, priority:100
msgid "Usually a merge requires the index file as well as the files in the working tree to be up to date with the current head commit, in order not to lose local changes. This flag disables the check with the working tree and is meant to be used when creating a merge of trees that are not directly related to the current working tree status into a temporary index file."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:61
+#: en/git-read-tree.txt:62
#, priority:100
msgid "Check if the command would error out, without updating the index or the files in the working tree for real."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:64
+#: en/git-read-tree.txt:65
#, priority:100
msgid "Show the progress of checking files out."
msgstr ""
#. type: Labeled list
-#: en/git-read-tree.txt:65
+#: en/git-read-tree.txt:66
#, ignore-same, no-wrap, priority:100
msgid "--trivial"
msgstr "--trivial"
#. type: Plain text
-#: en/git-read-tree.txt:70
+#: en/git-read-tree.txt:71
#, priority:100
msgid "Restrict three-way merge by 'git read-tree' to happen only if there is no file-level merging required, instead of resolving merge for trivial cases and leaving conflicting files unresolved in the index."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:77
+#: en/git-read-tree.txt:78
#, priority:100
msgid "Usually a three-way merge by 'git read-tree' resolves the merge for really trivial cases and leaves other cases unresolved in the index, so that porcelains can implement different merge policies. This flag makes the command resolve a few more cases internally:"
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:80
+#: en/git-read-tree.txt:81
#, priority:100
msgid "when one side removes a path and the other side leaves the path unmodified. The resolution is to remove that path."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:81
+#: en/git-read-tree.txt:82
#, priority:100
msgid "when both sides remove a path. The resolution is to remove that path."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:83
+#: en/git-read-tree.txt:84
#, priority:100
msgid "when both sides add a path identically. The resolution is to add that path."
msgstr ""
#. type: Labeled list
-#: en/git-read-tree.txt:84 en/git-svn.txt:75
+#: en/git-read-tree.txt:85 en/git-svn.txt:75
#, no-wrap, priority:100
msgid "--prefix=<prefix>"
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:89
+#: en/git-read-tree.txt:90
#, priority:100
msgid "Keep the current index contents, and read the contents of the named tree-ish under the directory at `<prefix>`. The command will refuse to overwrite entries that already existed in the original index file."
msgstr ""
#. type: Labeled list
-#: en/git-read-tree.txt:90
+#: en/git-read-tree.txt:91
#, no-wrap, priority:100
msgid "--exclude-per-directory=<gitignore>"
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:104
+#: en/git-read-tree.txt:105
#, priority:100
msgid "When running the command with `-u` and `-m` options, the merge result may need to overwrite paths that are not tracked in the current branch. The command usually refuses to proceed with the merge to avoid losing such a path. However this safety valve sometimes gets in the way. For example, it often happens that the other branch added a file that used to be a generated file in your branch, and the safety valve triggers when you try to switch to that branch after you ran `make` but before running `make clean` to remove the generated file. This option tells the command to read per-directory exclude file (usually '.gitignore') and allows such an untracked but explicitly ignored file to be overwritten."
msgstr ""
#. type: Labeled list
-#: en/git-read-tree.txt:105
+#: en/git-read-tree.txt:106
#, no-wrap, priority:100
msgid "--index-output=<file>"
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:116
+#: en/git-read-tree.txt:117
#, priority:100
msgid "Instead of writing the results out to `$GIT_INDEX_FILE`, write the resulting index in the named file. While the command is operating, the original index file is locked with the same mechanism as usual. The file must allow to be rename(2)ed into from a temporary file that is created next to the usual index file; typically this means it needs to be on the same filesystem as the index file itself, and you need write permission to the directories the index file and index output file are located in."
msgstr ""
+#. type: Labeled list
+#: en/git-read-tree.txt:118
+#, ignore-same, no-wrap, priority:100
+msgid "--[no-]recurse-submodules"
+msgstr "--[no-]recurse-submodules"
+
#. type: Plain text
-#: en/git-read-tree.txt:122
+#: en/git-read-tree.txt:123
#, priority:100
msgid "Using --recurse-submodules will update the content of all initialized submodules according to the commit recorded in the superproject by calling read-tree recursively, also setting the submodules HEAD to be detached at that commit."
msgstr ""
#. type: Labeled list
-#: en/git-read-tree.txt:123
+#: en/git-read-tree.txt:124
#, ignore-same, no-wrap, priority:100
msgid "--no-sparse-checkout"
msgstr "--no-sparse-checkout"
#. type: Plain text
-#: en/git-read-tree.txt:126
+#: en/git-read-tree.txt:127
#, priority:100
msgid "Disable sparse checkout support even if `core.sparseCheckout` is true."
msgstr ""
#. type: Labeled list
-#: en/git-read-tree.txt:127
+#: en/git-read-tree.txt:128
#, ignore-same, no-wrap, priority:100
msgid "--empty"
msgstr "--empty"
#. type: Plain text
-#: en/git-read-tree.txt:130
+#: en/git-read-tree.txt:131
#, priority:100
msgid "Instead of reading tree object(s) into the index, just empty it."
msgstr ""
#. type: Labeled list
-#: en/git-read-tree.txt:131
+#: en/git-read-tree.txt:136
#, no-wrap, priority:100
msgid "<tree-ish#>"
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:133
+#: en/git-read-tree.txt:138
#, priority:100
msgid "The id of the tree object(s) to be read/merged."
msgstr ""
#. type: Title -
-#: en/git-read-tree.txt:136
+#: en/git-read-tree.txt:141
#, no-wrap, priority:100
msgid "MERGING"
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:141
+#: en/git-read-tree.txt:146
#, priority:100
msgid "If `-m` is specified, 'git read-tree' can perform 3 kinds of merge, a single tree merge if only 1 tree is given, a fast-forward merge with 2 trees, or a 3-way merge if 3 or more trees are provided."
msgstr ""
#. type: Title ~
-#: en/git-read-tree.txt:144
+#: en/git-read-tree.txt:149
#, no-wrap, priority:100
msgid "Single Tree Merge"
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:150
+#: en/git-read-tree.txt:155
#, priority:100
msgid "If only 1 tree is specified, 'git read-tree' operates as if the user did not specify `-m`, except that if the original index has an entry for a given pathname, and the contents of the path match with the tree being read, the stat info from the index is used. (In other words, the index's stat()s take precedence over the merged tree's)."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:154
+#: en/git-read-tree.txt:159
#, priority:100
msgid "That means that if you do a `git read-tree -m <newtree>` followed by a `git checkout-index -f -u -a`, the 'git checkout-index' only checks out the stuff that really changed."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:157
+#: en/git-read-tree.txt:162
#, priority:100
msgid "This is used to avoid unnecessary false hits when 'git diff-files' is run after 'git read-tree'."
msgstr ""
#. type: Title ~
-#: en/git-read-tree.txt:160
+#: en/git-read-tree.txt:165
#, no-wrap, priority:100
msgid "Two Tree Merge"
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:166
+#: en/git-read-tree.txt:171
#, priority:100
msgid "Typically, this is invoked as `git read-tree -m $H $M`, where $H is the head commit of the current repository, and $M is the head of a foreign tree, which is simply ahead of $H (i.e. we are in a fast-forward situation)."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:169
+#: en/git-read-tree.txt:174
#, priority:100
msgid "When two trees are specified, the user is telling 'git read-tree' the following:"
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:171
+#: en/git-read-tree.txt:176
#, priority:100
msgid "The current index and work tree is derived from $H, but"
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:172
+#: en/git-read-tree.txt:177
#, priority:100
msgid "the user may have local changes in them since $H."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:174
+#: en/git-read-tree.txt:179
#, priority:100
msgid "The user wants to fast-forward to $M."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:180
+#: en/git-read-tree.txt:185
#, priority:100
msgid "In this case, the `git read-tree -m $H $M` command makes sure that no local change is lost as the result of this \"merge\". Here are the \"carry forward\" rules, where \"I\" denotes the index, \"clean\" means that index and work tree coincide, and \"exists\"/\"nothing\" refer to the presence of a path in the specified commit:"
msgstr ""
#. type: delimited block .
-#: en/git-read-tree.txt:191
+#: en/git-read-tree.txt:196
#, no-wrap, priority:100
msgid ""
"\tI H M Result\n"
@@ -36557,7 +37480,7 @@ msgid ""
msgstr ""
#. type: delimited block .
-#: en/git-read-tree.txt:196
+#: en/git-read-tree.txt:201
#, no-wrap, priority:100
msgid ""
" clean I==H I==M\n"
@@ -36567,7 +37490,7 @@ msgid ""
msgstr ""
#. type: delimited block .
-#: en/git-read-tree.txt:201
+#: en/git-read-tree.txt:206
#, no-wrap, priority:100
msgid ""
" 6 yes N/A yes nothing exists keep index\n"
@@ -36577,7 +37500,7 @@ msgid ""
msgstr ""
#. type: delimited block .
-#: en/git-read-tree.txt:206
+#: en/git-read-tree.txt:211
#, no-wrap, priority:100
msgid ""
" 10 yes yes N/A exists nothing remove path from index\n"
@@ -36587,7 +37510,7 @@ msgid ""
msgstr ""
#. type: delimited block .
-#: en/git-read-tree.txt:211
+#: en/git-read-tree.txt:216
#, no-wrap, priority:100
msgid ""
"\tclean (H==M)\n"
@@ -36597,7 +37520,7 @@ msgid ""
msgstr ""
#. type: delimited block .
-#: en/git-read-tree.txt:220
+#: en/git-read-tree.txt:225
#, no-wrap, priority:100
msgid ""
" clean I==H I==M (H!=M)\n"
@@ -36611,157 +37534,157 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:226
+#: en/git-read-tree.txt:231
#, priority:100
msgid "In all \"keep index\" cases, the index entry stays as in the original index file. If the entry is not up to date, 'git read-tree' keeps the copy in the work tree intact when operating under the -u flag."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:237
+#: en/git-read-tree.txt:242
#, priority:100
msgid "When this form of 'git read-tree' returns successfully, you can see which of the \"local changes\" that you made were carried forward by running `git diff-index --cached $M`. Note that this does not necessarily match what `git diff-index --cached $H` would have produced before such a two tree merge. This is because of cases 18 and 19 --- if you already had the changes in $M (e.g. maybe you picked it up via e-mail in a patch form), `git diff-index --cached $H` would have told you about the change before this merge, but it would not show in `git diff-index --cached $M` output after the two-tree merge."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:244
+#: en/git-read-tree.txt:249
#, priority:100
msgid "Case 3 is slightly tricky and needs explanation. The result from this rule logically should be to remove the path if the user staged the removal of the path and then switching to a new branch. That however will prevent the initial checkout from happening, so the rule is modified to use M (new tree) only when the content of the index is empty. Otherwise the removal of the path is kept as long as $H and $M are the same."
msgstr ""
#. type: Title ~
-#: en/git-read-tree.txt:246
+#: en/git-read-tree.txt:251
#, no-wrap, priority:100
msgid "3-Way Merge"
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:249
+#: en/git-read-tree.txt:254
#, priority:100
msgid "Each \"index\" entry has two bits worth of \"stage\" state. stage 0 is the normal one, and is the only one you'd see in any kind of normal use."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:252
+#: en/git-read-tree.txt:257
#, priority:100
msgid "However, when you do 'git read-tree' with three trees, the \"stage\" starts out at 1."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:254
+#: en/git-read-tree.txt:259
#, priority:100
msgid "This means that you can do"
msgstr ""
#. type: delimited block -
-#: en/git-read-tree.txt:257
+#: en/git-read-tree.txt:262
#, no-wrap, priority:100
msgid "$ git read-tree -m <tree1> <tree2> <tree3>\n"
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:265
+#: en/git-read-tree.txt:270
#, priority:100
msgid "and you will end up with an index with all of the <tree1> entries in \"stage1\", all of the <tree2> entries in \"stage2\" and all of the <tree3> entries in \"stage3\". When performing a merge of another branch into the current branch, we use the common ancestor tree as <tree1>, the current branch head as <tree2>, and the other branch head as <tree3>."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:269
+#: en/git-read-tree.txt:274
#, priority:100
msgid "Furthermore, 'git read-tree' has special-case logic that says: if you see a file that matches in all respects in the following states, it \"collapses\" back to \"stage0\":"
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:273
+#: en/git-read-tree.txt:278
#, priority:100
msgid "stage 2 and 3 are the same; take one or the other (it makes no difference - the same work has been done on our branch in stage 2 and their branch in stage 3)"
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:278
+#: en/git-read-tree.txt:283
#, priority:100
msgid "stage 1 and stage 2 are the same and stage 3 is different; take stage 3 (our branch in stage 2 did not do anything since the ancestor in stage 1 while their branch in stage 3 worked on it)"
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:281
+#: en/git-read-tree.txt:286
#, priority:100
msgid "stage 1 and stage 3 are the same and stage 2 is different take stage 2 (we did something while they did nothing)"
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:285
+#: en/git-read-tree.txt:290
#, priority:100
msgid "The 'git write-tree' command refuses to write a nonsensical tree, and it will complain about unmerged entries if it sees a single entry that is not stage 0."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:291
+#: en/git-read-tree.txt:296
#, priority:100
msgid "OK, this all sounds like a collection of totally nonsensical rules, but it's actually exactly what you want in order to do a fast merge. The different stages represent the \"result tree\" (stage 0, aka \"merged\"), the original tree (stage 1, aka \"orig\"), and the two trees you are trying to merge (stage 2 and 3 respectively)."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:296
+#: en/git-read-tree.txt:301
#, priority:100
msgid "The order of stages 1, 2 and 3 (hence the order of three <tree-ish> command-line arguments) are significant when you start a 3-way merge with an index file that is already populated. Here is an outline of how the algorithm works:"
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:299
+#: en/git-read-tree.txt:304
#, priority:100
msgid "if a file exists in identical format in all three trees, it will automatically collapse to \"merged\" state by 'git read-tree'."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:304
+#: en/git-read-tree.txt:309
#, priority:100
msgid "a file that has _any_ difference what-so-ever in the three trees will stay as separate entries in the index. It's up to \"porcelain policy\" to determine how to remove the non-0 stages, and insert a merged version."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:309
+#: en/git-read-tree.txt:314
#, priority:100
msgid "the index file saves and restores with all this information, so you can merge things incrementally, but as long as it has entries in stages 1/2/3 (i.e., \"unmerged entries\") you can't write the result. So now the merge algorithm ends up being really simple:"
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:312
+#: en/git-read-tree.txt:317
#, priority:100
msgid "you walk the index in order, and ignore all entries of stage 0, since they've already been done."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:316
+#: en/git-read-tree.txt:321
#, priority:100
msgid "if you find a \"stage1\", but no matching \"stage2\" or \"stage3\", you know it's been removed from both trees (it only existed in the original tree), and you remove that entry."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:321
+#: en/git-read-tree.txt:326
#, priority:100
msgid "if you find a matching \"stage2\" and \"stage3\" tree, you remove one of them, and turn the other into a \"stage0\" entry. Remove any matching \"stage1\" entry if it exists too. .. all the normal trivial rules .."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:326
+#: en/git-read-tree.txt:331
#, priority:100
msgid "You would normally use 'git merge-index' with supplied 'git merge-one-file' to do this last step. The script updates the files in the working tree as it merges each path and at the end of a successful merge."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:334
+#: en/git-read-tree.txt:339
#, priority:100
msgid "When you start a 3-way merge with an index file that is already populated, it is assumed that it represents the state of the files in your work tree, and you can even have files with changes unrecorded in the index file. It is further assumed that this state is \"derived\" from the stage 2 tree. The 3-way merge refuses to run if it finds an entry in the original index file that does not match stage 2."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:339
+#: en/git-read-tree.txt:344
#, priority:100
msgid "This is done to prevent you from losing your work-in-progress changes, and mixing your random changes in an unrelated merge commit. To illustrate, suppose you start from what has been committed last to your repository:"
msgstr ""
#. type: delimited block -
-#: en/git-read-tree.txt:343
+#: en/git-read-tree.txt:348
#, no-wrap, priority:100
msgid ""
"$ JC=`git rev-parse --verify \"HEAD^0\"`\n"
@@ -36769,13 +37692,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:348
+#: en/git-read-tree.txt:353
#, priority:100
msgid "You do random edits, without running 'git update-index'. And then you notice that the tip of your \"upstream\" tree has advanced since you pulled from him:"
msgstr ""
#. type: delimited block -
-#: en/git-read-tree.txt:352
+#: en/git-read-tree.txt:357
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git fetch git://.... linus\n"
@@ -36783,13 +37706,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:358
+#: en/git-read-tree.txt:363
#, priority:100
msgid "Your work tree is still based on your HEAD ($JC), but you have some edits since. Three-way merge makes sure that you have not added or modified index entries since $JC, and if you haven't, then does the right thing. So with the following sequence:"
msgstr ""
#. type: delimited block -
-#: en/git-read-tree.txt:364
+#: en/git-read-tree.txt:369
#, no-wrap, priority:100
msgid ""
"$ git read-tree -m -u `git merge-base $JC $LT` $JC $LT\n"
@@ -36799,55 +37722,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:369
+#: en/git-read-tree.txt:374
#, priority:100
msgid "what you would commit is a pure merge between $JC and $LT without your work-in-progress changes, and your work tree would be updated to the result of the merge."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:373
+#: en/git-read-tree.txt:378
#, priority:100
msgid "However, if you have local changes in the working tree that would be overwritten by this merge, 'git read-tree' will refuse to run to prevent your changes from being lost."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:383
+#: en/git-read-tree.txt:388
#, priority:100
msgid "In other words, there is no need to worry about what exists only in the working tree. When you have local changes in a part of the project that is not involved in the merge, your changes do not interfere with the merge, and are kept intact. When they *do* interfere, the merge does not even start ('git read-tree' complains loudly and fails without modifying anything). In such a case, you can simply continue doing what you were in the middle of doing, and when your working tree is ready (i.e. you have finished your work-in-progress), attempt the merge again."
msgstr ""
#. type: Title -
-#: en/git-read-tree.txt:386
+#: en/git-read-tree.txt:391
#, no-wrap, priority:100
msgid "SPARSE CHECKOUT"
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:391
+#: en/git-read-tree.txt:396
#, priority:100
msgid "\"Sparse checkout\" allows populating the working directory sparsely. It uses the skip-worktree bit (see linkgit:git-update-index[1]) to tell Git whether a file in the working directory is worth looking at."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:400
+#: en/git-read-tree.txt:405
#, ignore-ellipsis, priority:100
msgid "'git read-tree' and other merge-based commands ('git merge', 'git checkout'...) can help maintaining the skip-worktree bitmap and working directory update. `$GIT_DIR/info/sparse-checkout` is used to define the skip-worktree reference bitmap. When 'git read-tree' needs to update the working directory, it resets the skip-worktree bit in the index based on this file, which uses the same syntax as .gitignore files. If an entry matches a pattern in this file, skip-worktree will not be set on that entry. Otherwise, skip-worktree will be set."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:404
+#: en/git-read-tree.txt:409
#, priority:100
msgid "Then it compares the new skip-worktree value with the previous one. If skip-worktree turns from set to unset, it will add the corresponding file back. If it turns from unset to set, that file will be removed."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:408
+#: en/git-read-tree.txt:413
#, priority:100
msgid "While `$GIT_DIR/info/sparse-checkout` is usually used to specify what files are in, you can also specify what files are _not_ in, using negate patterns. For example, to remove the file `unwanted`:"
msgstr ""
#. type: delimited block -
-#: en/git-read-tree.txt:412
+#: en/git-read-tree.txt:417
#, no-wrap, priority:100
msgid ""
"/*\n"
@@ -36855,25 +37778,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:420
+#: en/git-read-tree.txt:425
#, priority:100
msgid "Another tricky thing is fully repopulating the working directory when you no longer want sparse checkout. You cannot just disable \"sparse checkout\" because skip-worktree bits are still in the index and your working directory is still sparsely populated. You should re-populate the working directory with the `$GIT_DIR/info/sparse-checkout` file content as follows:"
msgstr ""
#. type: delimited block -
-#: en/git-read-tree.txt:423
+#: en/git-read-tree.txt:428
#, no-wrap, priority:100
msgid "/*\n"
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:429
+#: en/git-read-tree.txt:434
#, priority:100
msgid "Then you can disable sparse checkout. Sparse checkout support in 'git read-tree' and similar commands is disabled by default. You need to turn `core.sparseCheckout` on in order to have sparse checkout support."
msgstr ""
#. type: Plain text
-#: en/git-read-tree.txt:435
+#: en/git-read-tree.txt:440
#, ignore-same, priority:100
msgid "linkgit:git-write-tree[1]; linkgit:git-ls-files[1]; linkgit:gitignore[5]"
msgstr "linkgit:git-write-tree[1]; linkgit:git-ls-files[1]; linkgit:gitignore[5]"
@@ -36894,17 +37817,17 @@ msgstr ""
#: en/git-rebase.txt:16
#, no-wrap, priority:100
msgid ""
-"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
-"\t[<upstream> [<branch>]]\n"
+"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>]\n"
+"\t[--onto <newbase> | --keep-base] [<upstream> [<branch>]]\n"
"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
"\t--root [<branch>]\n"
-"'git rebase' --continue | --skip | --abort | --quit | --edit-todo | --show-current-patch\n"
+"'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch)\n"
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:22
#, priority:100
-msgid "If <branch> is specified, 'git rebase' will perform an automatic `git checkout <branch>` before doing anything else. Otherwise it remains on the current branch."
+msgid "If <branch> is specified, 'git rebase' will perform an automatic `git switch <branch>` before doing anything else. Otherwise it remains on the current branch."
msgstr ""
#. type: Plain text
@@ -37214,512 +38137,542 @@ msgstr ""
msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:220
+#, ignore-same, no-wrap, priority:100
+msgid "--keep-base"
+msgstr "--keep-base"
+
#. type: Plain text
-#: en/git-rebase.txt:224
+#: en/git-rebase.txt:225
+#, ignore-ellipsis, priority:100
+msgid "Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running 'git rebase --keep-base <upstream> <branch>' is equivalent to running 'git rebase --onto <upstream>... <upstream>'."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:230
+#, priority:100
+msgid "This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:235
+#, priority:100
+msgid "Although both this option and --fork-point find the merge base between <upstream> and <branch>, this option uses the merge base as the _starting point_ on which new commits will be created, whereas --fork-point uses the merge base to determine the _set of commits_ which will be rebased."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#, priority:100
+msgid "See also INCOMPATIBLE OPTIONS below."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:242
#, priority:100
msgid "Upstream branch to compare against. May be any valid commit, not just an existing branch name. Defaults to the configured upstream for the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:230
+#: en/git-rebase.txt:248
#, priority:100
msgid "Restart the rebasing process after having resolved a merge conflict."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237
+#: en/git-rebase.txt:255
#, priority:100
msgid "Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:242
+#: en/git-rebase.txt:260
#, priority:100
msgid "Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:243 en/git-rebase.txt:532
+#: en/git-rebase.txt:261 en/git-rebase.txt:560
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:246
+#: en/git-rebase.txt:264
#, priority:100
msgid "Keep the commits that do not change anything from its parents in the result."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:248 en/git-rebase.txt:255 en/git-rebase.txt:280 en/git-rebase.txt:293 en/git-rebase.txt:302 en/git-rebase.txt:339 en/git-rebase.txt:374 en/git-rebase.txt:381 en/git-rebase.txt:388 en/git-rebase.txt:400 en/git-rebase.txt:439 en/git-rebase.txt:464 en/git-rebase.txt:476 en/git-rebase.txt:495
-#, priority:100
-msgid "See also INCOMPATIBLE OPTIONS below."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rebase.txt:253
+#: en/git-rebase.txt:271
#, priority:100
msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:258
+#: en/git-rebase.txt:276
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:259 en/git-rebase.txt:534
+#: en/git-rebase.txt:277 en/git-rebase.txt:561
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:261
+#: en/git-rebase.txt:279
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:266
+#: en/git-rebase.txt:284
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:272
+#: en/git-rebase.txt:290
#, priority:100
msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:278
+#: en/git-rebase.txt:296
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:286
+#: en/git-rebase.txt:304
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:291
+#: en/git-rebase.txt:309
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:294
+#: en/git-rebase.txt:312
#, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:295
+#: en/git-rebase.txt:313
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:300
+#: en/git-rebase.txt:318
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:312
+#: en/git-rebase.txt:335
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:316
+#: en/git-rebase.txt:339
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:320
+#: en/git-rebase.txt:343
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:324
+#: en/git-rebase.txt:347
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:327
+#: en/git-rebase.txt:350
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:328 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:81
+#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:331
+#: en/git-rebase.txt:354
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:340 en/merge-options.txt:35
+#: en/git-rebase.txt:363 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:341
+#: en/git-rebase.txt:364
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:346
+#: en/git-rebase.txt:369
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:352
+#: en/git-rebase.txt:375
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:354
+#: en/git-rebase.txt:377
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:358
+#: en/git-rebase.txt:381
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:364
+#: en/git-rebase.txt:387
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:367
+#: en/git-rebase.txt:390
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:372
+#: en/git-rebase.txt:394
+#, priority:100
+msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:399
#, priority:100
msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:379
+#: en/git-rebase.txt:406
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:386
+#: en/git-rebase.txt:413
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:394
+#: en/git-rebase.txt:421
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:398
+#: en/git-rebase.txt:425
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:402
+#: en/git-rebase.txt:429
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:410
+#: en/git-rebase.txt:437
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:417
+#: en/git-rebase.txt:444
#, priority:100
-msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by gitlink:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
+msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:421
+#: en/git-rebase.txt:448
#, priority:100
-msgid "The `--rebase-merges` mode is similar in spirit to `--preserve-merges`, but in contrast to that option works well in interactive rebases: commits can be reordered, inserted and dropped at will."
+msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges`, but in contrast to that option works well in interactive rebases: commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:425
+#: en/git-rebase.txt:452
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:427
+#: en/git-rebase.txt:454
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:429 en/git-rebase.txt:529 en/git-svn.txt:680
+#: en/git-rebase.txt:456 en/git-rebase.txt:557 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:433
+#: en/git-rebase.txt:461
#, priority:100
-msgid "Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
+msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:437
+#: en/git-rebase.txt:465
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:440
+#: en/git-rebase.txt:468
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:441
+#: en/git-rebase.txt:469
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:446
+#: en/git-rebase.txt:474
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:449
+#: en/git-rebase.txt:477
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:451
+#: en/git-rebase.txt:479
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:453
+#: en/git-rebase.txt:481
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:455
+#: en/git-rebase.txt:483
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:459
+#: en/git-rebase.txt:487
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:462
+#: en/git-rebase.txt:490
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:474
+#: en/git-rebase.txt:502
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
-#. type: Plain text
-#: en/git-rebase.txt:477 en/git-rebase.txt:533
+#. type: Labeled list
+#: en/git-rebase.txt:505
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:478
+#: en/git-rebase.txt:506
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:489
+#: en/git-rebase.txt:517
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:493
+#: en/git-rebase.txt:521
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:503
+#: en/git-rebase.txt:531
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:504
+#: en/git-rebase.txt:532
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:505
+#: en/git-rebase.txt:533
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:508
+#: en/git-rebase.txt:536
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:510
+#: en/git-rebase.txt:538
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:513
+#: en/git-rebase.txt:541
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:517
+#: en/git-rebase.txt:545
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:521
+#: en/git-rebase.txt:549
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:524
+#: en/git-rebase.txt:552
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:525
+#: en/git-rebase.txt:553
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:527
+#: en/git-rebase.txt:555
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Plain text
-#: en/git-rebase.txt:528
+#: en/git-rebase.txt:556
#, ignore-same, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:559
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:535
+#: en/git-rebase.txt:562
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:537
+#: en/git-rebase.txt:564
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:539
+#: en/git-rebase.txt:566
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:540
+#: en/git-rebase.txt:567
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:541
+#: en/git-rebase.txt:568
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:542
+#: en/git-rebase.txt:569
#, priority:100
-msgid "--rebase-merges and --strategy"
+msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:543
+#: en/git-rebase.txt:570
#, priority:100
-msgid "--rebase-merges and --strategy-option"
+msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:572
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:548
+#: en/git-rebase.txt:575
#, no-wrap, priority:100
msgid "There are some subtle differences how the backends behave.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:551
+#: en/git-rebase.txt:578
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -37727,7 +38680,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:556
+#: en/git-rebase.txt:583
#, no-wrap, priority:100
msgid ""
"The am backend drops any \"empty\" commits, regardless of whether the\n"
@@ -37737,13 +38690,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:558
-#, no-wrap, priority:100
-msgid "The merge backend does the same.\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:563
+#: en/git-rebase.txt:588
#, no-wrap, priority:100
msgid ""
"The interactive backend drops commits by default that\n"
@@ -37753,7 +38700,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:591
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -37761,7 +38708,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:570
+#: en/git-rebase.txt:595
#, no-wrap, priority:100
msgid ""
"Directory rename heuristics are enabled in the merge and interactive\n"
@@ -37770,145 +38717,145 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:572
+#: en/git-rebase.txt:597
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:574
+#: en/git-rebase.txt:599
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:579
+#: en/git-rebase.txt:604
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:584
+#: en/git-rebase.txt:609
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:586
+#: en/git-rebase.txt:611
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:593
+#: en/git-rebase.txt:618
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:595
+#: en/git-rebase.txt:620
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:597
+#: en/git-rebase.txt:622
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:598
+#: en/git-rebase.txt:623
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:599
+#: en/git-rebase.txt:624
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:600
+#: en/git-rebase.txt:625
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:602
+#: en/git-rebase.txt:627
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:604
+#: en/git-rebase.txt:629
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:606
+#: en/git-rebase.txt:631
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:607
+#: en/git-rebase.txt:632
#, priority:100
msgid "commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:634
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:611
+#: en/git-rebase.txt:636
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:612
+#: en/git-rebase.txt:637
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:613
+#: en/git-rebase.txt:638
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:619
+#: en/git-rebase.txt:644
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:621
+#: en/git-rebase.txt:646
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:623
+#: en/git-rebase.txt:648
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:628
+#: en/git-rebase.txt:653
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:633
+#: en/git-rebase.txt:658
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -37917,73 +38864,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:638
+#: en/git-rebase.txt:663
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:643
+#: en/git-rebase.txt:668
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:671
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:649
+#: en/git-rebase.txt:674
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:652
+#: en/git-rebase.txt:677
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:660
+#: en/git-rebase.txt:685
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:664
+#: en/git-rebase.txt:689
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:668
+#: en/git-rebase.txt:693
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:696
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:699
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:676
+#: en/git-rebase.txt:702
#, priority:100
-msgid "You might want to preserve merges, if you have a history like this:"
+msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:683
+#: en/git-rebase.txt:709
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -37994,25 +38941,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:687
+#: en/git-rebase.txt:713
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:690
+#: en/git-rebase.txt:716
#, no-wrap, priority:100
-msgid "$ git rebase -i -p --onto Q O\n"
+msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:697
+#: en/git-rebase.txt:723
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:706
+#: en/git-rebase.txt:732
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -38025,31 +38972,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:711
+#: en/git-rebase.txt:737
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:716
+#: en/git-rebase.txt:742
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:719
+#: en/git-rebase.txt:745
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:749
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:733
+#: en/git-rebase.txt:759
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -38063,85 +39010,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:736
+#: en/git-rebase.txt:762
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:742
+#: en/git-rebase.txt:768
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:746
+#: en/git-rebase.txt:772
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:748
+#: en/git-rebase.txt:774
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:752
+#: en/git-rebase.txt:778
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:756
+#: en/git-rebase.txt:782
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:759
+#: en/git-rebase.txt:785
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:761
+#: en/git-rebase.txt:787
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:763
+#: en/git-rebase.txt:789
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:768
+#: en/git-rebase.txt:794
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:771
+#: en/git-rebase.txt:797
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:778
+#: en/git-rebase.txt:804
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:783
+#: en/git-rebase.txt:809
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:790
+#: en/git-rebase.txt:816
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38152,13 +39099,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:793
+#: en/git-rebase.txt:819
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:800
+#: en/git-rebase.txt:826
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38169,13 +39116,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:830
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:811
+#: en/git-rebase.txt:837
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38186,73 +39133,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:818
+#: en/git-rebase.txt:844
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:820
+#: en/git-rebase.txt:846
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:821
+#: en/git-rebase.txt:847
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:825
+#: en/git-rebase.txt:851
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:826
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:832
+#: en/git-rebase.txt:859
#, priority:100
-msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or `filter-branch`."
+msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:835
+#: en/git-rebase.txt:862
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:840
+#: en/git-rebase.txt:867
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:871
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:846
+#: en/git-rebase.txt:873
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:848
+#: en/git-rebase.txt:875
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:854
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -38263,19 +39210,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:858
+#: en/git-rebase.txt:885
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:889
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:867
+#: en/git-rebase.txt:894
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -38285,67 +39232,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:872
+#: en/git-rebase.txt:899
#, priority:100
-msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge-base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
+msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:876
+#: en/git-rebase.txt:903
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:879
+#: en/git-rebase.txt:906
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:882
+#: en/git-rebase.txt:909
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:884
+#: en/git-rebase.txt:911
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:889
+#: en/git-rebase.txt:916
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:891
+#: en/git-rebase.txt:918
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:899
+#: en/git-rebase.txt:926
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:930
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:908
+#: en/git-rebase.txt:935
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:918
+#: en/git-rebase.txt:945
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -38359,25 +39306,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:925
+#: en/git-rebase.txt:952
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:928
+#: en/git-rebase.txt:955
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:931 en/git-rebase.txt:1008
+#: en/git-rebase.txt:958 en/git-rebase.txt:1035
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:937
+#: en/git-rebase.txt:964
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -38388,7 +39335,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:942
+#: en/git-rebase.txt:969
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -38398,7 +39345,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:946
+#: en/git-rebase.txt:973
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -38407,55 +39354,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:950
+#: en/git-rebase.txt:977
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:958
+#: en/git-rebase.txt:985
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:965
+#: en/git-rebase.txt:992
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:971
+#: en/git-rebase.txt:998
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:974
+#: en/git-rebase.txt:1001
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:981
+#: en/git-rebase.txt:1008
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1012
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:992
+#: en/git-rebase.txt:1019
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:999
+#: en/git-rebase.txt:1026
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -38466,13 +39413,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1005
+#: en/git-rebase.txt:1032
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1011
+#: en/git-rebase.txt:1038
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -38480,7 +39427,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1018
+#: en/git-rebase.txt:1045
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -38492,7 +39439,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1022
+#: en/git-rebase.txt:1049
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -38501,37 +39448,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1031
+#: en/git-rebase.txt:1058
#, priority:100
-msgid "The todo list presented by `--preserve-merges --interactive` does not represent the topology of the revision graph. Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
+msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1033
+#: en/git-rebase.txt:1060
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1035
+#: en/git-rebase.txt:1062
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1039
+#: en/git-rebase.txt:1066
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1041
+#: en/git-rebase.txt:1068
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1072
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -38839,117 +39786,118 @@ msgstr ""
msgid "Using this hook, it is easy to generate mails describing the updates to the repository. This example script sends one mail message per ref listing the commits pushed to the repository, and logs the push certificates of signed pushes with good signatures to a logger service:"
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:191
+#. type: delimited block -
+#: en/git-receive-pack.txt:192
#, no-wrap, priority:100
msgid ""
-"\t#!/bin/sh\n"
-"\t# mail out commit update information.\n"
-"\twhile read oval nval ref\n"
-"\tdo\n"
-"\t\tif expr \"$oval\" : '0*$' >/dev/null\n"
-"\t\tthen\n"
-"\t\t\techo \"Created a new ref, with the following commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\"\n"
-"\t\telse\n"
-"\t\t\techo \"New commits:\"\n"
-"\t\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
-"\t\tfi |\n"
-"\t\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
-"\tdone\n"
-"\t# log signed push certificate, if any\n"
-"\tif test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"#!/bin/sh\n"
+"# mail out commit update information.\n"
+"while read oval nval ref\n"
+"do\n"
+"\tif expr \"$oval\" : '0*$' >/dev/null\n"
"\tthen\n"
-"\t\t(\n"
-"\t\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
-"\t\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
-"\t\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
-"\tfi\n"
-"\texit 0\n"
+"\t\techo \"Created a new ref, with the following commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\"\n"
+"\telse\n"
+"\t\techo \"New commits:\"\n"
+"\t\tgit rev-list --pretty \"$nval\" \"^$oval\"\n"
+"\tfi |\n"
+"\tmail -s \"Changes to ref $ref\" commit-list@mydomain\n"
+"done\n"
+"# log signed push certificate, if any\n"
+"if test -n \"${GIT_PUSH_CERT-}\" && test ${GIT_PUSH_CERT_STATUS} = G\n"
+"then\n"
+"\t(\n"
+"\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
+"\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
+"\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
+"fi\n"
+"exit 0\n"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:194
+#: en/git-receive-pack.txt:196
#, priority:100
msgid "The exit code from this hook invocation is ignored, however a non-zero exit code will generate an error message."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:200
+#: en/git-receive-pack.txt:202
#, priority:100
msgid "Note that it is possible for refname to not have sha1-new when this hook runs. This can easily occur if another user modifies the ref after it was updated by 'git-receive-pack', but before the hook was able to evaluate it. It is recommended that hooks rely on sha1-new rather than the current value of refname."
msgstr ""
#. type: Title -
-#: en/git-receive-pack.txt:202
+#: en/git-receive-pack.txt:204
#, no-wrap, priority:100
msgid "POST-UPDATE HOOK"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:207
+#: en/git-receive-pack.txt:209
#, priority:100
msgid "After all other processing, if at least one ref was updated, and if $GIT_DIR/hooks/post-update file exists and is executable, then post-update will be called with the list of refs that have been updated. This can be used to implement any repository wide cleanup tasks."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:211
+#: en/git-receive-pack.txt:213
#, priority:100
msgid "The exit code from this hook invocation is ignored; the only thing left for 'git-receive-pack' to do at that point is to exit itself anyway."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:214
+#: en/git-receive-pack.txt:216
#, priority:100
msgid "This hook can be used, for example, to run `git update-server-info` if the repository is packed and is served via a dumb transport."
msgstr ""
-#. type: Plain text
-#: en/git-receive-pack.txt:217
-#, no-wrap, priority:100
+#. type: delimited block -
+#: en/git-receive-pack.txt:220
+#, fuzzy, no-wrap, priority:100
+#| msgid "git-update-server-info(1)"
msgid ""
-"\t#!/bin/sh\n"
-"\texec git update-server-info\n"
-msgstr ""
+"#!/bin/sh\n"
+"exec git update-server-info\n"
+msgstr "git-update-server-info(1)"
#. type: Title -
-#: en/git-receive-pack.txt:220
+#: en/git-receive-pack.txt:224
#, no-wrap, priority:100
msgid "QUARANTINE ENVIRONMENT"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:227
+#: en/git-receive-pack.txt:231
#, priority:100
msgid "When `receive-pack` takes in objects, they are placed into a temporary \"quarantine\" directory within the `$GIT_DIR/objects` directory and migrated into the main object store only after the `pre-receive` hook has completed. If the push fails before then, the temporary directory is removed entirely."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:229
+#: en/git-receive-pack.txt:233
#, priority:100
msgid "This has a few user-visible effects and caveats:"
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:235
+#: en/git-receive-pack.txt:239
#, priority:100
msgid "Pushes which fail due to problems with the incoming pack, missing objects, or due to the `pre-receive` hook will not leave any on-disk data. This is usually helpful to prevent repeated failed pushes from filling up your disk, but can make debugging more challenging."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:238
+#: en/git-receive-pack.txt:242
#, priority:100
msgid "Any objects created by the `pre-receive` hook will be created in the quarantine directory (and migrated only if it succeeds)."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:244
+#: en/git-receive-pack.txt:248
#, priority:100
msgid "The `pre-receive` hook MUST NOT update any refs to point to quarantined objects. Other programs accessing the repository will not be able to see the objects (and if the pre-receive hook fails, those refs would become corrupted). For safety, any ref updates from within `pre-receive` are automatically rejected."
msgstr ""
#. type: Plain text
-#: en/git-receive-pack.txt:249
+#: en/git-receive-pack.txt:253
#, ignore-same, priority:100
msgid "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
msgstr "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
@@ -39046,7 +39994,7 @@ msgid "Process the reflogs of all references."
msgstr ""
#. type: Labeled list
-#: en/git-reflog.txt:75 en/rev-list-options.txt:185
+#: en/git-reflog.txt:75 en/rev-list-options.txt:193
#, ignore-same, no-wrap, priority:260
msgid "--single-worktree"
msgstr "--single-worktree"
@@ -39202,8 +40150,8 @@ msgid "Literal space in command or argument."
msgstr ""
#. type: Labeled list
-#: en/git-remote-ext.txt:31
-#, no-wrap, priority:100
+#: en/git-remote-ext.txt:31 en/pretty-formats.txt:107
+#, no-wrap, priority:260
msgid "'%%'"
msgstr ""
@@ -39214,8 +40162,8 @@ msgid "Literal percent sign."
msgstr ""
#. type: Labeled list
-#: en/git-remote-ext.txt:34
-#, ignore-same, no-wrap, priority:100
+#: en/git-remote-ext.txt:34 en/pretty-formats.txt:189
+#, ignore-same, no-wrap, priority:260
msgid "'%s'"
msgstr "'%s'"
@@ -39226,8 +40174,8 @@ msgid "Replaced with name (receive-pack, upload-pack, or upload-archive) of the
msgstr ""
#. type: Labeled list
-#: en/git-remote-ext.txt:38
-#, ignore-same, no-wrap, priority:100
+#: en/git-remote-ext.txt:38 en/pretty-formats.txt:186
+#, ignore-same, no-wrap, priority:260
msgid "'%S'"
msgstr "'%S'"
@@ -39378,7 +40326,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:112
#, priority:100
-msgid "Represents a repository with path '/repo with spaces' accessed using the helper program \"git-server-alias foo\". The hostname for the remote server passed in the protocol stream will be \"foo\" (this allows multiple virtual Git servers to share a link-level address)."
+msgid "Represents a repository with path `/repo with spaces` accessed using the helper program \"git-server-alias foo\". The hostname for the remote server passed in the protocol stream will be \"foo\" (this allows multiple virtual Git servers to share a link-level address)."
msgstr ""
#. type: Labeled list
@@ -39394,10 +40342,10 @@ msgid "Represents a repository accessed using the helper program \"git-ssl foo.e
msgstr ""
#. type: Plain text
-#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 en/git-remote-testgit.txt:27
+#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56
#, ignore-same, priority:100
-msgid "linkgit:gitremote-helpers[1]"
-msgstr "linkgit:gitremote-helpers[1]"
+msgid "linkgit:gitremote-helpers[7]"
+msgstr "linkgit:gitremote-helpers[7]"
#. type: Title =
#: en/git-remote-fd.txt:2
@@ -39477,36 +40425,6 @@ msgstr ""
msgid "`git push fd::7,8/bar master`"
msgstr ""
-#. type: Title =
-#: en/git-remote-testgit.txt:2
-#, ignore-same, no-wrap, priority:100
-msgid "git-remote-testgit(1)"
-msgstr "git-remote-testgit(1)"
-
-#. type: Plain text
-#: en/git-remote-testgit.txt:7
-#, priority:100
-msgid "git-remote-testgit - Example remote-helper"
-msgstr ""
-
-#. type: Plain text
-#: en/git-remote-testgit.txt:13
-#, no-wrap, priority:100
-msgid "git clone testgit::<source-repo> [<destination>]\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-remote-testgit.txt:20
-#, priority:100
-msgid "This command is a simple remote-helper, that is used both as a testcase for the remote-helper functionality, and as an example to show remote-helper authors one possible implementation."
-msgstr ""
-
-#. type: Plain text
-#: en/git-remote-testgit.txt:23
-#, priority:100
-msgid "The best way to learn more is to read the comments and source code in 'git-remote-testgit'."
-msgstr ""
-
#. type: Title =
#: en/git-remote.txt:2
#, ignore-same, no-wrap, priority:220
@@ -39863,7 +40781,7 @@ msgid ""
" staging/master\n"
" staging/staging-linus\n"
" staging/staging-next\n"
-"$ git checkout -b staging staging/master\n"
+"$ git switch -c staging staging/master\n"
"...\n"
msgstr ""
@@ -40025,7 +40943,7 @@ msgstr ""
#. type: Plain text
#: en/git-repack.txt:149
#, priority:100
-msgid "Exclude the given pack from repacking. This is the equivalent of having `.keep` file on the pack. `<pack-name>` is the the pack file name without leading directory (e.g. `pack-123.pack`). The option could be specified multiple times to keep multiple packs."
+msgid "Exclude the given pack from repacking. This is the equivalent of having `.keep` file on the pack. `<pack-name>` is the pack file name without leading directory (e.g. `pack-123.pack`). The option could be specified multiple times to keep multiple packs."
msgstr ""
#. type: Labeled list
@@ -40307,7 +41225,7 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:131
#, priority:100
-msgid "linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and linkgit:git-rebase[1], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
+msgid "linkgit:git-hash-object[1], linkgit:git-rebase[1], and https://github.com/newren/git-filter-repo[git-filter-repo], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
msgstr ""
#. type: Plain text
@@ -40330,9 +41248,10 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:158
-#, priority:100
-msgid "linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1]"
-msgstr ""
+#, fuzzy, priority:100
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] https://github.com/newren/git-filter-repo[git-filter-repo]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title =
#: en/git-request-pull.txt:2
@@ -40499,7 +41418,7 @@ msgstr ""
#. type: Plain text
#: en/git-rerere.txt:29
#, priority:100
-msgid "You need to set the configuration variable rerere.enabled in order to enable this command."
+msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
msgstr ""
#. type: Plain text
@@ -40605,7 +41524,7 @@ msgstr ""
#: en/git-rerere.txt:96
#, no-wrap, priority:100
msgid ""
-"\t$ git checkout topic\n"
+"\t$ git switch topic\n"
"\t$ git merge master\n"
msgstr ""
@@ -40634,10 +41553,10 @@ msgstr ""
#: en/git-rerere.txt:121
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\t$ git checkout topic\n"
+"\t$ git switch topic\n"
"\t$ git merge master\n"
"\t$ ... work on both topic and master branches\n"
-"\t$ git checkout master\n"
+"\t$ git switch master\n"
"\t$ git merge topic\n"
msgstr ""
@@ -40666,11 +41585,11 @@ msgstr ""
#: en/git-rerere.txt:145
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"\t$ git checkout topic\n"
+"\t$ git switch topic\n"
"\t$ git merge master\n"
"\t$ git reset --hard HEAD^ ;# rewind the test merge\n"
"\t$ ... work on both topic and master branches\n"
-"\t$ git checkout master\n"
+"\t$ git switch master\n"
"\t$ git merge topic\n"
msgstr ""
@@ -40795,133 +41714,133 @@ msgid "This form resets the index entries for all `<paths>` to their state at `<
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:29
-#, priority:280
-msgid "This means that `git reset <paths>` is the opposite of `git add <paths>`."
+#: en/git-reset.txt:30
+#, ignore-ellipsis, priority:280
+msgid "This means that `git reset <paths>` is the opposite of `git add <paths>`. This command is equivalent to `git restore [--source=<tree-ish>] --staged <paths>...`."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:36
+#: en/git-reset.txt:37
#, priority:280
-msgid "After running `git reset <paths>` to update the index entry, you can use linkgit:git-checkout[1] to check the contents out of the index to the working tree. Alternatively, using linkgit:git-checkout[1] and specifying a commit, you can copy the contents of a path out of a commit to the index and to the working tree in one go."
+msgid "After running `git reset <paths>` to update the index entry, you can use linkgit:git-restore[1] to check the contents out of the index to the working tree. Alternatively, using linkgit:git-restore[1] and specifying a commit with `--source`, you can copy the contents of a path out of a commit to the index and to the working tree in one go."
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:37
+#: en/git-reset.txt:38
#, ignore-ellipsis, no-wrap, priority:280
msgid "'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...]"
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:41
+#: en/git-reset.txt:42
#, priority:280
msgid "Interactively select hunks in the difference between the index and `<tree-ish>` (defaults to `HEAD`). The chosen hunks are applied in reverse to the index."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:45
+#: en/git-reset.txt:46
#, priority:280
msgid "This means that `git reset -p` is the opposite of `git add -p`, i.e. you can use it to selectively reset hunks. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:46
+#: en/git-reset.txt:47
#, no-wrap, priority:280
msgid "'git reset' [<mode>] [<commit>]"
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:51
+#: en/git-reset.txt:52
#, priority:280
msgid "This form resets the current branch head to `<commit>` and possibly updates the index (resetting it to the tree of `<commit>`) and the working tree depending on `<mode>`. If `<mode>` is omitted, defaults to `--mixed`. The `<mode>` must be one of the following:"
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:53
+#: en/git-reset.txt:54
#, ignore-same, no-wrap, priority:280
msgid "--soft"
msgstr "--soft"
#. type: Plain text
-#: en/git-reset.txt:58
+#: en/git-reset.txt:59
#, priority:280
msgid "Does not touch the index file or the working tree at all (but resets the head to `<commit>`, just like all modes do). This leaves all your changed files \"Changes to be committed\", as `git status` would put it."
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:59
+#: en/git-reset.txt:60
#, ignore-same, no-wrap, priority:280
msgid "--mixed"
msgstr "--mixed"
#. type: Plain text
-#: en/git-reset.txt:63
+#: en/git-reset.txt:64
#, priority:280
msgid "Resets the index but not the working tree (i.e., the changed files are preserved but not marked for commit) and reports what has not been updated. This is the default action."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:66
+#: en/git-reset.txt:67
#, priority:280
msgid "If `-N` is specified, removed paths are marked as intent-to-add (see linkgit:git-add[1])."
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:67
+#: en/git-reset.txt:68
#, ignore-same, no-wrap, priority:280
msgid "--hard"
msgstr "--hard"
#. type: Plain text
-#: en/git-reset.txt:70
+#: en/git-reset.txt:71
#, priority:280
msgid "Resets the index and working tree. Any changes to tracked files in the working tree since `<commit>` are discarded."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:78
+#: en/git-reset.txt:79
#, priority:280
msgid "Resets the index and updates the files in the working tree that are different between `<commit>` and `HEAD`, but keeps those which are different between the index and working tree (i.e. which have changes which have not been added). If a file that is different between `<commit>` and the index has unstaged changes, reset is aborted."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:81
+#: en/git-reset.txt:82
#, priority:280
msgid "In other words, `--merge` does something like a `git read-tree -u -m <commit>`, but carries forward unmerged index entries."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:87
+#: en/git-reset.txt:88
#, priority:280
msgid "Resets index entries and updates files in the working tree that are different between `<commit>` and `HEAD`. If a file that is different between `<commit>` and `HEAD` has local changes, reset is aborted."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:91
+#: en/git-reset.txt:92 en/git-restore.txt:30 en/git-revert.txt:33
#, priority:280
-msgid "If you want to undo a commit other than the latest on a branch, linkgit:git-revert[1] is your friend."
+msgid "See \"Reset, restore and revert\" in linkgit:git[1] for the differences between the three commands."
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:98
+#: en/git-reset.txt:99
#, ignore-same, no-wrap, priority:280
msgid "--no-quiet"
msgstr "--no-quiet"
#. type: Plain text
-#: en/git-reset.txt:102
+#: en/git-reset.txt:103
#, priority:280
msgid "Be quiet, only report errors. The default behavior is set by the `reset.quiet` config option. `--quiet` and `--no-quiet` will override the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:107
+#: en/git-reset.txt:108
#, no-wrap, priority:280
msgid "Undo add"
msgstr ""
#. type: delimited block -
-#: en/git-reset.txt:115
+#: en/git-reset.txt:116
#, no-wrap, priority:280
msgid ""
"$ edit <1>\n"
@@ -40932,37 +41851,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:121
+#: en/git-reset.txt:122
#, priority:280
msgid "You are happily working on something, and find the changes in these files are in good order. You do not want to see them when you run `git diff`, because you plan to work on other files and changes with these files are distracting."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:122
+#: en/git-reset.txt:123
#, priority:280
msgid "Somebody asks you to pull, and the changes sound worthy of merging."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:127
+#: en/git-reset.txt:128
#, priority:280
msgid "However, you already dirtied the index (i.e. your index does not match the `HEAD` commit). But you know the pull you are going to make does not affect `frotz.c` or `filfre.c`, so you revert the index changes for these two files. Your changes in working tree remain there."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:129
+#: en/git-reset.txt:130
#, priority:280
msgid "Then you can pull and merge, leaving `frotz.c` and `filfre.c` changes still in the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:130
+#: en/git-reset.txt:131
#, no-wrap, priority:280
msgid "Undo a commit and redo"
msgstr ""
#. type: delimited block -
-#: en/git-reset.txt:137
+#: en/git-reset.txt:138
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git commit ...\n"
@@ -40972,70 +41891,70 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:142
+#: en/git-reset.txt:143
#, priority:280
msgid "This is most often done when you remembered what you just committed is incomplete, or you misspelled your commit message, or both. Leaves working tree as it was before \"reset\"."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:143
+#: en/git-reset.txt:144
#, priority:280
msgid "Make corrections to working tree files."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:146
+#: en/git-reset.txt:147
#, priority:280
msgid "\"reset\" copies the old head to `.git/ORIG_HEAD`; redo the commit by starting with its log message. If you do not need to edit the message further, you can give `-C` option instead."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:148
+#: en/git-reset.txt:149
#, priority:280
msgid "See also the `--amend` option to linkgit:git-commit[1]."
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:149
+#: en/git-reset.txt:150
#, no-wrap, priority:280
msgid "Undo a commit, making it a topic branch"
msgstr ""
#. type: delimited block -
-#: en/git-reset.txt:155
+#: en/git-reset.txt:156
#, no-wrap, priority:280
msgid ""
-"$ git branch topic/wip <1>\n"
-"$ git reset --hard HEAD~3 <2>\n"
-"$ git checkout topic/wip <3>\n"
+"$ git branch topic/wip <1>\n"
+"$ git reset --hard HEAD~3 <2>\n"
+"$ git switch topic/wip <3>\n"
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:161
+#: en/git-reset.txt:162
#, priority:280
msgid "You have made some commits, but realize they were premature to be in the `master` branch. You want to continue polishing them in a topic branch, so create `topic/wip` branch off of the current `HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:162
+#: en/git-reset.txt:163
#, priority:280
msgid "Rewind the master branch to get rid of those three commits."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:163
+#: en/git-reset.txt:164
#, priority:280
msgid "Switch to `topic/wip` branch and keep working."
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:164
+#: en/git-reset.txt:165
#, no-wrap, priority:280
msgid "Undo commits permanently"
msgstr ""
#. type: delimited block -
-#: en/git-reset.txt:169
+#: en/git-reset.txt:170
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git commit ...\n"
@@ -41043,19 +41962,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:176
+#: en/git-reset.txt:177
#, priority:280
msgid "The last three commits (`HEAD`, `HEAD^`, and `HEAD~2`) were bad and you do not want to ever see them again. Do *not* do this if you have already given these commits to somebody else. (See the \"RECOVERING FROM UPSTREAM REBASE\" section in linkgit:git-rebase[1] for the implications of doing so.)"
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:177
+#: en/git-reset.txt:178
#, no-wrap, priority:280
msgid "Undo a merge or pull"
msgstr ""
#. type: delimited block -
-#: en/git-reset.txt:189
+#: en/git-reset.txt:190
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git pull <1>\n"
@@ -41070,37 +41989,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:194
+#: en/git-reset.txt:195
#, priority:280
msgid "Try to update from the upstream resulted in a lot of conflicts; you were not ready to spend a lot of time merging right now, so you decide to do that later."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:197
+#: en/git-reset.txt:198
#, priority:280
msgid "\"pull\" has not made merge commit, so `git reset --hard` which is a synonym for `git reset --hard HEAD` clears the mess from the index file and the working tree."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:199
+#: en/git-reset.txt:200
#, priority:280
msgid "Merge a topic branch into the current branch, which resulted in a fast-forward."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:204
+#: en/git-reset.txt:205
#, priority:280
msgid "But you decided that the topic branch is not ready for public consumption yet. \"pull\" or \"merge\" always leaves the original tip of the current branch in `ORIG_HEAD`, so resetting hard to it brings your index file and the working tree back to that state, and resets the tip of the branch to that commit."
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:205
+#: en/git-reset.txt:206
#, no-wrap, priority:280
msgid "Undo a merge or pull inside a dirty working tree"
msgstr ""
#. type: delimited block -
-#: en/git-reset.txt:214
+#: en/git-reset.txt:215
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git pull <1>\n"
@@ -41112,82 +42031,82 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:220
+#: en/git-reset.txt:221
#, priority:280
msgid "Even if you may have local modifications in your working tree, you can safely say `git pull` when you know that the change in the other branch does not overlap with them."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:225
+#: en/git-reset.txt:226
#, priority:280
msgid "After inspecting the result of the merge, you may find that the change in the other branch is unsatisfactory. Running `git reset --hard ORIG_HEAD` will let you go back to where you were, but it will discard your local changes, which you do not want. `git reset --merge` keeps your local changes."
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:227 en/git-stash.txt:229
+#: en/git-reset.txt:228 en/git-stash.txt:230
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:233
+#: en/git-reset.txt:234
#, priority:280
msgid "Suppose you are interrupted by an urgent fix request while you are in the middle of a large change. The files in your working tree are not in any shape to be committed yet, but you need to get to the other branch for a quick bugfix."
msgstr ""
#. type: delimited block -
-#: en/git-reset.txt:244
+#: en/git-reset.txt:245
#, no-wrap, priority:280
msgid ""
-"$ git checkout feature ;# you were working in \"feature\" branch and\n"
-"$ work work work ;# got interrupted\n"
+"$ git switch feature ;# you were working in \"feature\" branch and\n"
+"$ work work work ;# got interrupted\n"
"$ git commit -a -m \"snapshot WIP\" <1>\n"
-"$ git checkout master\n"
+"$ git switch master\n"
"$ fix fix fix\n"
"$ git commit ;# commit with real log\n"
-"$ git checkout feature\n"
+"$ git switch feature\n"
"$ git reset --soft HEAD^ ;# go back to WIP state <2>\n"
"$ git reset <3>\n"
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:247
+#: en/git-reset.txt:248
#, priority:280
msgid "This commit will get blown away so a throw-away log message is OK."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:249
+#: en/git-reset.txt:250
#, priority:280
msgid "This removes the 'WIP' commit from the commit history, and sets your working tree to the state just before you made that snapshot."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:252
+#: en/git-reset.txt:253
#, priority:280
msgid "At this point the index file still has all the WIP changes you committed as 'snapshot WIP'. This updates the index to show your WIP files as uncommitted."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:254
+#: en/git-reset.txt:255
#, priority:280
msgid "See also linkgit:git-stash[1]."
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:255
+#: en/git-reset.txt:256
#, no-wrap, priority:280
msgid "Reset a single file in the index"
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:260
+#: en/git-reset.txt:261
#, priority:280
msgid "Suppose you have added a file to your index, but later decide you do not want to add it to your commit. You can remove the file from the index while keeping your changes with git reset."
msgstr ""
#. type: delimited block -
-#: en/git-reset.txt:265
+#: en/git-reset.txt:266
#, no-wrap, priority:280
msgid ""
"$ git reset -- frotz.c <1>\n"
@@ -41196,80 +42115,80 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:269
+#: en/git-reset.txt:270
#, priority:280
msgid "This removes the file from the index while keeping it in the working directory."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:270
+#: en/git-reset.txt:271
#, priority:280
msgid "This commits all other changes in the index."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:271
+#: en/git-reset.txt:272
#, priority:280
msgid "Adds the file to the index again."
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:272
+#: en/git-reset.txt:273
#, no-wrap, priority:280
msgid "Keep changes in working tree while discarding some previous commits"
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:279
+#: en/git-reset.txt:280
#, priority:280
msgid "Suppose you are working on something and you commit it, and then you continue working a bit more, but now you think that what you have in your working tree should be in another branch that has nothing to do with what you committed previously. You can start a new branch and reset it while keeping the changes in your working tree."
msgstr ""
#. type: delimited block -
-#: en/git-reset.txt:288
+#: en/git-reset.txt:289
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git tag start\n"
-"$ git checkout -b branch1\n"
+"$ git switch -c branch1\n"
"$ edit\n"
"$ git commit ... <1>\n"
"$ edit\n"
-"$ git checkout -b branch2 <2>\n"
+"$ git switch -c branch2 <2>\n"
"$ git reset --keep start <3>\n"
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:291
+#: en/git-reset.txt:292
#, priority:280
msgid "This commits your first edits in `branch1`."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:295
+#: en/git-reset.txt:296
#, priority:280
-msgid "In the ideal world, you could have realized that the earlier commit did not belong to the new topic when you created and switched to `branch2` (i.e. `git checkout -b branch2 start`), but nobody is perfect."
+msgid "In the ideal world, you could have realized that the earlier commit did not belong to the new topic when you created and switched to `branch2` (i.e. `git switch -c branch2 start`), but nobody is perfect."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:297
+#: en/git-reset.txt:298
#, priority:280
msgid "But you can use `reset --keep` to remove the unwanted commit after you switched to `branch2`."
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:298
+#: en/git-reset.txt:299
#, no-wrap, priority:280
msgid "Split a commit apart into a sequence of commits"
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:306
+#: en/git-reset.txt:307
#, priority:280
msgid "Suppose that you have created lots of logically separate changes and committed them together. Then, later you decide that it might be better to have each logical chunk associated with its own commit. You can use git reset to rewind history without changing the contents of your local files, and then successively use `git add -p` to interactively select which hunks to include into each commit, using `git commit -c` to pre-populate the commit message."
msgstr ""
#. type: delimited block -
-#: en/git-reset.txt:316
+#: en/git-reset.txt:317
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git reset -N HEAD^ <1>\n"
@@ -41283,79 +42202,79 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:322
+#: en/git-reset.txt:323
#, priority:280
msgid "First, reset the history back one commit so that we remove the original commit, but leave the working tree with all the changes. The -N ensures that any new files added with `HEAD` are still marked so that `git add -p` will find them."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:326
+#: en/git-reset.txt:327
#, priority:280
msgid "Next, we interactively select diff hunks to add using the `git add -p` facility. This will ask you about each diff hunk in sequence and you can use simple commands such as \"yes, include this\", \"No don't include this\" or even the very powerful \"edit\" facility."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:330
+#: en/git-reset.txt:331
#, priority:280
msgid "Once satisfied with the hunks you want to include, you should verify what has been prepared for the first commit by using `git diff --cached`. This shows all the changes that have been moved into the index and are about to be committed."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:337
+#: en/git-reset.txt:338
#, priority:280
msgid "Next, commit the changes stored in the index. The `-c` option specifies to pre-populate the commit message from the original message that you started with in the first commit. This is helpful to avoid retyping it. The `HEAD@{1}` is a special notation for the commit that `HEAD` used to be at prior to the original reset commit (1 change ago). See linkgit:git-reflog[1] for more details. You may also use any other valid commit reference."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:339
+#: en/git-reset.txt:340
#, priority:280
msgid "You can repeat steps 2-4 multiple times to break the original code into any number of commits."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:342
+#: en/git-reset.txt:343
#, priority:280
msgid "Now you've split out many of the changes into their own commits, and might no longer use the patch mode of `git add`, in order to select all remaining uncommitted changes."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:345
+#: en/git-reset.txt:346
#, priority:280
msgid "Once again, check to verify that you've included what you want to. You may also wish to verify that git diff doesn't show any remaining changes to be committed later."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:346
+#: en/git-reset.txt:347
#, priority:280
msgid "And finally create the final commit."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:352
+#: en/git-reset.txt:353
#, priority:280
msgid "The tables below show what happens when running:"
msgstr ""
#. type: delimited block -
-#: en/git-reset.txt:355
+#: en/git-reset.txt:356
#, no-wrap, priority:280
msgid "git reset --option target\n"
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:359
+#: en/git-reset.txt:360
#, priority:280
msgid "to reset the `HEAD` to another commit (`target`) with the different reset options depending on the state of the files."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:368
+#: en/git-reset.txt:369
#, priority:280
msgid "In these tables, `A`, `B`, `C` and `D` are some different states of a file. For example, the first line of the first table means that if a file is in state `A` in the working tree, in state `B` in the index, in state `C` in `HEAD` and in state `D` in the target, then `git reset --soft target` will leave the file in the working tree in state `A` and in the index in state `B`. It resets (i.e. moves) the `HEAD` (i.e. the tip of the current branch, if you are on one) to `target` (which has the file in state `D`)."
msgstr ""
#. type: delimited block .
-#: en/git-reset.txt:377
+#: en/git-reset.txt:378
#, no-wrap, priority:280
msgid ""
"working index HEAD target working index HEAD\n"
@@ -41368,7 +42287,7 @@ msgid ""
msgstr ""
#. type: delimited block .
-#: en/git-reset.txt:387
+#: en/git-reset.txt:388
#, no-wrap, priority:280
msgid ""
"working index HEAD target working index HEAD\n"
@@ -41381,7 +42300,7 @@ msgid ""
msgstr ""
#. type: delimited block .
-#: en/git-reset.txt:397
+#: en/git-reset.txt:398
#, no-wrap, priority:280
msgid ""
"working index HEAD target working index HEAD\n"
@@ -41394,7 +42313,7 @@ msgid ""
msgstr ""
#. type: delimited block .
-#: en/git-reset.txt:407
+#: en/git-reset.txt:408
#, no-wrap, priority:280
msgid ""
"working index HEAD target working index HEAD\n"
@@ -41407,7 +42326,7 @@ msgid ""
msgstr ""
#. type: delimited block .
-#: en/git-reset.txt:417
+#: en/git-reset.txt:418
#, no-wrap, priority:280
msgid ""
"working index HEAD target working index HEAD\n"
@@ -41420,7 +42339,7 @@ msgid ""
msgstr ""
#. type: delimited block .
-#: en/git-reset.txt:427
+#: en/git-reset.txt:428
#, no-wrap, priority:280
msgid ""
"working index HEAD target working index HEAD\n"
@@ -41433,25 +42352,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:437
+#: en/git-reset.txt:438
#, priority:280
-msgid "`reset --merge` is meant to be used when resetting out of a conflicted merge. Any mergy operation guarantees that the working tree file that is involved in the merge does not have local change wrt the index before it starts, and that it writes the result out to the working tree. So if we see some difference between the index and the target and also between the index and the working tree, then it means that we are not resetting out from a state that a mergy operation left after failing with a conflict. That is why we disallow `--merge` option in this case."
+msgid "`reset --merge` is meant to be used when resetting out of a conflicted merge. Any mergy operation guarantees that the working tree file that is involved in the merge does not have a local change with respect to the index before it starts, and that it writes the result out to the working tree. So if we see some difference between the index and the target and also between the index and the working tree, then it means that we are not resetting out from a state that a mergy operation left after failing with a conflict. That is why we disallow `--merge` option in this case."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:446
+#: en/git-reset.txt:447
#, priority:280
msgid "`reset --keep` is meant to be used when removing some of the last commits in the current branch while keeping changes in the working tree. If there could be conflicts between the changes in the commit we want to remove and the changes in the working tree we want to keep, the reset is disallowed. That's why it is disallowed if there are both changes between the working tree and `HEAD`, and between `HEAD` and the target. To be safe, it is also disallowed when there are unmerged entries."
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:449
+#: en/git-reset.txt:450
#, priority:280
msgid "The following tables show what happens when there are unmerged entries:"
msgstr ""
#. type: delimited block .
-#: en/git-reset.txt:458
+#: en/git-reset.txt:459
#, no-wrap, priority:280
msgid ""
"working index HEAD target working index HEAD\n"
@@ -41464,7 +42383,7 @@ msgid ""
msgstr ""
#. type: delimited block .
-#: en/git-reset.txt:468
+#: en/git-reset.txt:469
#, no-wrap, priority:280
msgid ""
"working index HEAD target working index HEAD\n"
@@ -41477,11 +42396,265 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-reset.txt:471
+#: en/git-reset.txt:472
#, priority:280
msgid "`X` means any state and `U` means an unmerged index."
msgstr ""
+#. type: Title =
+#: en/git-restore.txt:2
+#, ignore-same, no-wrap, priority:100
+msgid "git-restore(1)"
+msgstr "git-restore(1)"
+
+#. type: Plain text
+#: en/git-restore.txt:7
+#, priority:100
+msgid "git-restore - Restore working tree files"
+msgstr ""
+
+#. type: Plain text
+#: en/git-restore.txt:13
+#, ignore-ellipsis, no-wrap, priority:100
+msgid ""
+"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] <pathspec>...\n"
+"'git restore' (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [<pathspec>...]\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-restore.txt:19
+#, priority:100
+msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
+msgstr ""
+
+#. type: Plain text
+#: en/git-restore.txt:23
+#, priority:100
+msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-restore.txt:27
+#, priority:100
+msgid "By default, the restore sources for working tree and the index are the index and `HEAD` respectively. `--source` could be used to specify a commit as the restore source."
+msgstr ""
+
+#. type: Plain text
+#: en/git-restore.txt:32 en/git-switch.txt:33
+#, priority:100
+msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-restore.txt:35
+#, fuzzy, no-wrap, priority:100
+#| msgid "subtree"
+msgid "-s <tree>"
+msgstr "subtree"
+
+#. type: Labeled list
+#: en/git-restore.txt:36
+#, fuzzy, no-wrap, priority:100
+#| msgid "--source"
+msgid "--source=<tree>"
+msgstr "--source"
+
+#. type: Plain text
+#: en/git-restore.txt:40
+#, priority:100
+msgid "Restore the working tree files with the content from the given tree. It is common to specify the source tree by naming a commit, branch or tag associated with it."
+msgstr ""
+
+#. type: Plain text
+#: en/git-restore.txt:45
+#, priority:100
+msgid "If not specified, the default restore source for the working tree is the index, and the default restore source for the index is `HEAD`. When both `--staged` and `--worktree` are specified, `--source` must also be specified."
+msgstr ""
+
+#. type: Plain text
+#: en/git-restore.txt:52
+#, priority:100
+msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
+msgstr ""
+
+#. type: Plain text
+#: en/git-restore.txt:55
+#, priority:100
+msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-restore.txt:58
+#, no-wrap, priority:100
+msgid "-S"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-restore.txt:59
+#, ignore-same, no-wrap, priority:100
+msgid "--staged"
+msgstr "--staged"
+
+#. type: Plain text
+#: en/git-restore.txt:63
+#, priority:100
+msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
+msgstr ""
+
+#. type: Plain text
+#: en/git-restore.txt:67
+#, priority:100
+msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-restore.txt:79
+#, priority:100
+msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
+msgstr ""
+
+#. type: Plain text
+#: en/git-restore.txt:83
+#, priority:100
+msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
+msgstr ""
+
+#. type: Plain text
+#: en/git-restore.txt:88
+#, priority:100
+msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-restore.txt:96
+#, ignore-same, no-wrap, priority:100
+msgid "--ignore-unmerged"
+msgstr "--ignore-unmerged"
+
+#. type: Plain text
+#: en/git-restore.txt:101
+#, priority:100
+msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
+msgstr ""
+
+#. type: Plain text
+#: en/git-restore.txt:108
+#, priority:100
+msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-restore.txt:115
+#, priority:100
+msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
+msgstr ""
+
+#. type: Plain text
+#: en/git-restore.txt:122
+#, priority:100
+msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
+msgstr ""
+
+#. type: delimited block -
+#: en/git-restore.txt:128
+#, no-wrap, priority:100
+msgid ""
+"$ git switch master\n"
+"$ git restore --source master~2 Makefile <1>\n"
+"$ rm -f hello.c\n"
+"$ git restore hello.c <2>\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-restore.txt:132
+#, priority:100
+msgid "restore hello.c from the index"
+msgstr ""
+
+#. type: Plain text
+#: en/git-restore.txt:135
+#, priority:100
+msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-restore.txt:138
+#, no-wrap, priority:100
+msgid "$ git restore '*.c'\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-restore.txt:144
+#, priority:100
+msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-restore.txt:146
+#, priority:100
+msgid "To restore all files in the current directory"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-restore.txt:149
+#, no-wrap, priority:100
+msgid "$ git restore .\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-restore.txt:153
+#, priority:100
+msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-restore.txt:156
+#, no-wrap, priority:100
+msgid "$ git restore :/\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-restore.txt:160
+#, priority:100
+msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-restore.txt:163
+#, no-wrap, priority:100
+msgid "$ git restore --staged hello.c\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-restore.txt:167
+#, priority:100
+msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-restore.txt:170
+#, no-wrap, priority:100
+msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-restore.txt:173
+#, priority:100
+msgid "or the short form which is more practical but less readable:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-restore.txt:176
+#, no-wrap, priority:100
+msgid "$ git restore -s@ -SW hello.c\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-restore.txt:182
+#, ignore-same, priority:100
+msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
+msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
+
#. type: Title =
#: en/git-revert.txt:2
#, ignore-same, no-wrap, priority:100
@@ -41495,95 +42668,93 @@ msgid "git-revert - Revert some existing commits"
msgstr ""
#. type: Plain text
-#: en/git-revert.txt:15
+#: en/git-revert.txt:13
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] <commit>...\n"
-"'git revert' --continue\n"
-"'git revert' --quit\n"
-"'git revert' --abort\n"
+"'git revert' (--continue | --skip | --abort | --quit)\n"
msgstr ""
#. type: Plain text
-#: en/git-revert.txt:23
+#: en/git-revert.txt:21
#, priority:100
msgid "Given one or more existing commits, revert the changes that the related patches introduce, and record some new commits that record them. This requires your working tree to be clean (no modifications from the HEAD commit)."
msgstr ""
#. type: Plain text
-#: en/git-revert.txt:32
+#: en/git-revert.txt:30
#, priority:100
-msgid "Note: 'git revert' is used to record some new commits to reverse the effect of some earlier commits (often only a faulty one). If you want to throw away all uncommitted changes in your working directory, you should see linkgit:git-reset[1], particularly the `--hard` option. If you want to extract specific files as they were in another commit, you should see linkgit:git-checkout[1], specifically the `git checkout <commit> -- <filename>` syntax. Take care with these alternatives as both will discard uncommitted changes in your working directory."
+msgid "Note: 'git revert' is used to record some new commits to reverse the effect of some earlier commits (often only a faulty one). If you want to throw away all uncommitted changes in your working directory, you should see linkgit:git-reset[1], particularly the `--hard` option. If you want to extract specific files as they were in another commit, you should see linkgit:git-restore[1], specifically the `--source` option. Take care with these alternatives as both will discard uncommitted changes in your working directory."
msgstr ""
#. type: Plain text
-#: en/git-revert.txt:42
+#: en/git-revert.txt:43
#, priority:100
msgid "Commits to revert. For a more complete list of ways to spell commit names, see linkgit:gitrevisions[7]. Sets of commits can also be given but no traversal is done by default, see linkgit:git-rev-list[1] and its `--no-walk` option."
msgstr ""
#. type: Plain text
-#: en/git-revert.txt:48
+#: en/git-revert.txt:49
#, priority:100
msgid "With this option, 'git revert' will let you edit the commit message prior to committing the revert. This is the default if you run the command from a terminal."
msgstr ""
#. type: Plain text
-#: en/git-revert.txt:56
+#: en/git-revert.txt:57
#, priority:100
msgid "Usually you cannot revert a merge because you do not know which side of the merge should be considered the mainline. This option specifies the parent number (starting from 1) of the mainline and allows revert to reverse the change relative to the specified parent."
msgstr ""
#. type: Plain text
-#: en/git-revert.txt:61
+#: en/git-revert.txt:62
#, priority:100
msgid "Reverting a merge commit declares that you will never want the tree changes brought in by the merge. As a result, later merges will only bring in tree changes introduced by commits that are not ancestors of the previously reverted merge. This may or may not be what you want."
msgstr ""
#. type: Plain text
-#: en/git-revert.txt:64
+#: en/git-revert.txt:65
#, priority:100
msgid "See the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for more details."
msgstr ""
#. type: Plain text
-#: en/git-revert.txt:68
+#: en/git-revert.txt:69
#, priority:100
msgid "With this option, 'git revert' will not start the commit message editor."
msgstr ""
#. type: Plain text
-#: en/git-revert.txt:79
+#: en/git-revert.txt:87
#, priority:100
msgid "Usually the command automatically creates some commits with commit log messages stating which commits were reverted. This flag applies the changes necessary to revert the named commits to your working tree and the index, but does not make the commits. In addition, when this option is used, your index does not have to match the HEAD commit. The revert is done against the beginning state of your index."
msgstr ""
#. type: Plain text
-#: en/git-revert.txt:82
+#: en/git-revert.txt:90
#, priority:100
msgid "This is useful when reverting more than one commits' effect to your index in a row."
msgstr ""
#. type: Labeled list
-#: en/git-revert.txt:110
+#: en/git-revert.txt:123
#, no-wrap, priority:100
msgid "`git revert HEAD~3`"
msgstr ""
#. type: Plain text
-#: en/git-revert.txt:114
+#: en/git-revert.txt:127
#, priority:100
msgid "Revert the changes specified by the fourth last commit in HEAD and create a new commit with the reverted changes."
msgstr ""
#. type: Labeled list
-#: en/git-revert.txt:115
+#: en/git-revert.txt:128
#, no-wrap, priority:100
msgid "`git revert -n master~5..master~2`"
msgstr ""
#. type: Plain text
-#: en/git-revert.txt:122
+#: en/git-revert.txt:135
#, priority:100
msgid "Revert the changes done by commits from the fifth last commit in master (included) to the third last commit in master (included), but do not create any commit with the reverted changes. The revert only modifies the working tree and the index."
msgstr ""
@@ -41601,101 +42772,49 @@ msgid "git-rev-list - Lists commit objects in reverse chronological order"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:64
+#: en/git-rev-list.txt:13
#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"'git rev-list' [ --max-count=<number> ]\n"
-"\t [ --skip=<number> ]\n"
-"\t [ --max-age=<timestamp> ]\n"
-"\t [ --min-age=<timestamp> ]\n"
-"\t [ --sparse ]\n"
-"\t [ --merges ]\n"
-"\t [ --no-merges ]\n"
-"\t [ --min-parents=<number> ]\n"
-"\t [ --no-min-parents ]\n"
-"\t [ --max-parents=<number> ]\n"
-"\t [ --no-max-parents ]\n"
-"\t [ --first-parent ]\n"
-"\t [ --remove-empty ]\n"
-"\t [ --full-history ]\n"
-"\t [ --not ]\n"
-"\t [ --all ]\n"
-"\t [ --branches[=<pattern>] ]\n"
-"\t [ --tags[=<pattern>] ]\n"
-"\t [ --remotes[=<pattern>] ]\n"
-"\t [ --glob=<glob-pattern> ]\n"
-"\t [ --ignore-missing ]\n"
-"\t [ --stdin ]\n"
-"\t [ --quiet ]\n"
-"\t [ --topo-order ]\n"
-"\t [ --parents ]\n"
-"\t [ --timestamp ]\n"
-"\t [ --left-right ]\n"
-"\t [ --left-only ]\n"
-"\t [ --right-only ]\n"
-"\t [ --cherry-mark ]\n"
-"\t [ --cherry-pick ]\n"
-"\t [ --encoding=<encoding> ]\n"
-"\t [ --(author|committer|grep)=<pattern> ]\n"
-"\t [ --regexp-ignore-case | -i ]\n"
-"\t [ --extended-regexp | -E ]\n"
-"\t [ --fixed-strings | -F ]\n"
-"\t [ --date=<format>]\n"
-"\t [ [ --objects | --objects-edge | --objects-edge-aggressive ]\n"
-"\t [ --unpacked ]\n"
-"\t [ --filter=<filter-spec> [ --filter-print-omitted ] ] ]\n"
-"\t [ --missing=<missing-action> ]\n"
-"\t [ --pretty | --header ]\n"
-"\t [ --bisect ]\n"
-"\t [ --bisect-vars ]\n"
-"\t [ --bisect-all ]\n"
-"\t [ --merge ]\n"
-"\t [ --reverse ]\n"
-"\t [ --walk-reflogs ]\n"
-"\t [ --no-walk ] [ --do-walk ]\n"
-"\t [ --count ]\n"
-"\t [ --use-bitmap-index ]\n"
-"\t <commit>... [ \\-- <paths>... ]\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:72
+msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rev-list.txt:21
#, priority:100
msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:79
+#: en/git-rev-list.txt:28
#, priority:100
msgid "You can think of this as a set operation. Commits given on the command line form a set of commits that are reachable from any of them, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:81
+#: en/git-rev-list.txt:30
#, priority:100
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:84
+#: en/git-rev-list.txt:33
#, no-wrap, priority:100
msgid "\t$ git rev-list foo bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:88
+#: en/git-rev-list.txt:37
#, priority:100
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:92
+#: en/git-rev-list.txt:41
#, priority:100
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:96
+#: en/git-rev-list.txt:45
#, no-wrap, priority:100
msgid ""
"\t$ git rev-list origin..HEAD\n"
@@ -41703,13 +42822,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:101
+#: en/git-rev-list.txt:50
#, ignore-ellipsis, priority:100
msgid "Another special notation is \"'<commit1>'...'<commit2>'\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-list.txt:105
+#: en/git-rev-list.txt:54
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git rev-list A B --not $(git merge-base --all A B)\n"
@@ -41717,7 +42836,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:112
+#: en/git-rev-list.txt:61
#, priority:100
msgid "'rev-list' is a very essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For this reason, it has a lot of different options that enables it to be used by commands as different as 'git bisect' and 'git repack'."
msgstr ""
@@ -43370,299 +44489,323 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:281
#, no-wrap, priority:100
+msgid "--no-[to|cc|bcc]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-send-email.txt:284
+#, priority:100
+msgid "Clears any list of \"To:\", \"Cc:\", \"Bcc:\" addresses previously set via config."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:285
+#, ignore-same, no-wrap, priority:100
+msgid "--no-identity"
+msgstr "--no-identity"
+
+#. type: Plain text
+#: en/git-send-email.txt:288
+#, priority:100
+msgid "Clears the previously read value of `sendemail.identity` set via config, if any."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-send-email.txt:289
+#, no-wrap, priority:100
msgid "--to-cmd=<command>"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:286
+#: en/git-send-email.txt:294
#, priority:100
msgid "Specify a command to execute once per patch file which should generate patch file specific \"To:\" entries. Output of this command must be single email address per line. Default is the value of 'sendemail.tocmd' configuration value."
msgstr ""
#. type: Labeled list
-#: en/git-send-email.txt:287
+#: en/git-send-email.txt:295
#, no-wrap, priority:100
msgid "--cc-cmd=<command>"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:292
+#: en/git-send-email.txt:300
#, priority:100
msgid "Specify a command to execute once per patch file which should generate patch file specific \"Cc:\" entries. Output of this command must be single email address per line. Default is the value of `sendemail.ccCmd` configuration value."
msgstr ""
#. type: Labeled list
-#: en/git-send-email.txt:293
+#: en/git-send-email.txt:301
#, ignore-same, no-wrap, priority:100
msgid "--[no-]chain-reply-to"
msgstr "--[no-]chain-reply-to"
#. type: Plain text
-#: en/git-send-email.txt:300
+#: en/git-send-email.txt:308
#, priority:100
msgid "If this is set, each email will be sent as a reply to the previous email sent. If disabled with \"--no-chain-reply-to\", all emails after the first will be sent as replies to the first email sent. When using this, it is recommended that the first file given be an overview of the entire patch series. Disabled by default, but the `sendemail.chainReplyTo` configuration variable can be used to enable it."
msgstr ""
#. type: Labeled list
-#: en/git-send-email.txt:301
+#: en/git-send-email.txt:309
#, no-wrap, priority:100
msgid "--identity=<identity>"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:306
+#: en/git-send-email.txt:314
#, priority:100
msgid "A configuration identity. When given, causes values in the 'sendemail.<identity>' subsection to take precedence over values in the 'sendemail' section. The default identity is the value of `sendemail.identity`."
msgstr ""
#. type: Labeled list
-#: en/git-send-email.txt:307
+#: en/git-send-email.txt:315
#, ignore-same, no-wrap, priority:100
msgid "--[no-]signed-off-by-cc"
msgstr "--[no-]signed-off-by-cc"
#. type: Plain text
-#: en/git-send-email.txt:311
+#: en/git-send-email.txt:319
#, priority:100
msgid "If this is set, add emails found in Signed-off-by: or Cc: lines to the cc list. Default is the value of `sendemail.signedoffbycc` configuration value; if that is unspecified, default to --signed-off-by-cc."
msgstr ""
#. type: Labeled list
-#: en/git-send-email.txt:312
+#: en/git-send-email.txt:320
#, ignore-same, no-wrap, priority:100
msgid "--[no-]cc-cover"
msgstr "--[no-]cc-cover"
#. type: Plain text
-#: en/git-send-email.txt:317
+#: en/git-send-email.txt:325
#, priority:100
msgid "If this is set, emails found in Cc: headers in the first patch of the series (typically the cover letter) are added to the cc list for each email set. Default is the value of 'sendemail.cccover' configuration value; if that is unspecified, default to --no-cc-cover."
msgstr ""
#. type: Labeled list
-#: en/git-send-email.txt:318
+#: en/git-send-email.txt:326
#, ignore-same, no-wrap, priority:100
msgid "--[no-]to-cover"
msgstr "--[no-]to-cover"
#. type: Plain text
-#: en/git-send-email.txt:323
+#: en/git-send-email.txt:331
#, priority:100
msgid "If this is set, emails found in To: headers in the first patch of the series (typically the cover letter) are added to the to list for each email set. Default is the value of 'sendemail.tocover' configuration value; if that is unspecified, default to --no-to-cover."
msgstr ""
#. type: Labeled list
-#: en/git-send-email.txt:324
+#: en/git-send-email.txt:332
#, no-wrap, priority:100
msgid "--suppress-cc=<category>"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:327
+#: en/git-send-email.txt:335
#, priority:100
msgid "Specify an additional category of recipients to suppress the auto-cc of:"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:330
+#: en/git-send-email.txt:338
#, priority:100
msgid "'author' will avoid including the patch author."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:331
+#: en/git-send-email.txt:339
#, priority:100
msgid "'self' will avoid including the sender."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:333
+#: en/git-send-email.txt:341
#, priority:100
msgid "'cc' will avoid including anyone mentioned in Cc lines in the patch header except for self (use 'self' for that)."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:335
+#: en/git-send-email.txt:343
#, priority:100
msgid "'bodycc' will avoid including anyone mentioned in Cc lines in the patch body (commit message) except for self (use 'self' for that)."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:337
+#: en/git-send-email.txt:345
#, priority:100
msgid "'sob' will avoid including anyone mentioned in Signed-off-by lines except for self (use 'self' for that)."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:340
+#: en/git-send-email.txt:348
#, priority:100
msgid "'misc-by' will avoid including anyone mentioned in Acked-by, Reviewed-by, Tested-by and other \"-by\" lines in the patch body, except Signed-off-by (use 'sob' for that)."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:341
+#: en/git-send-email.txt:349
#, priority:100
msgid "'cccmd' will avoid running the --cc-cmd."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:342
+#: en/git-send-email.txt:350
#, priority:100
msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:343
+#: en/git-send-email.txt:351
#, priority:100
msgid "'all' will suppress all auto cc values."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:348
+#: en/git-send-email.txt:356
#, priority:100
msgid "Default is the value of `sendemail.suppresscc` configuration value; if that is unspecified, default to 'self' if --suppress-from is specified, as well as 'body' if --no-signed-off-cc is specified."
msgstr ""
#. type: Labeled list
-#: en/git-send-email.txt:349
+#: en/git-send-email.txt:357
#, ignore-same, no-wrap, priority:100
msgid "--[no-]suppress-from"
msgstr "--[no-]suppress-from"
#. type: Plain text
-#: en/git-send-email.txt:353
+#: en/git-send-email.txt:361
#, priority:100
msgid "If this is set, do not add the From: address to the cc: list. Default is the value of `sendemail.suppressFrom` configuration value; if that is unspecified, default to --no-suppress-from."
msgstr ""
#. type: Labeled list
-#: en/git-send-email.txt:354
+#: en/git-send-email.txt:362
#, ignore-same, no-wrap, priority:100
msgid "--[no-]thread"
msgstr "--[no-]thread"
#. type: Plain text
-#: en/git-send-email.txt:360
+#: en/git-send-email.txt:368
#, priority:100
msgid "If this is set, the In-Reply-To and References headers will be added to each email sent. Whether each mail refers to the previous email (`deep` threading per 'git format-patch' wording) or to the first email (`shallow` threading) is governed by \"--[no-]chain-reply-to\"."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:365
+#: en/git-send-email.txt:373
#, priority:100
msgid "If disabled with \"--no-thread\", those headers will not be added (unless specified with --in-reply-to). Default is the value of the `sendemail.thread` configuration value; if that is unspecified, default to --thread."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:371
+#: en/git-send-email.txt:379
#, priority:100
msgid "It is up to the user to ensure that no In-Reply-To header already exists when 'git send-email' is asked to add it (especially note that 'git format-patch' can be configured to do the threading itself). Failure to do so may not produce the expected result in the recipient's MUA."
msgstr ""
#. type: Title ~
-#: en/git-send-email.txt:374
+#: en/git-send-email.txt:382
#, no-wrap, priority:100
msgid "Administering"
msgstr ""
#. type: Labeled list
-#: en/git-send-email.txt:376
+#: en/git-send-email.txt:384
#, no-wrap, priority:100
msgid "--confirm=<mode>"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:378
+#: en/git-send-email.txt:386
#, priority:100
msgid "Confirm just before sending:"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:381
+#: en/git-send-email.txt:389
#, priority:100
msgid "'always' will always confirm before sending"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:382
+#: en/git-send-email.txt:390
#, priority:100
msgid "'never' will never confirm before sending"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:384
+#: en/git-send-email.txt:392
#, priority:100
msgid "'cc' will confirm before sending when send-email has automatically added addresses from the patch to the Cc list"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:385
+#: en/git-send-email.txt:393
#, priority:100
msgid "'compose' will confirm before sending the first message when using --compose."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:386
+#: en/git-send-email.txt:394
#, priority:100
msgid "'auto' is equivalent to 'cc' + 'compose'"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:391
+#: en/git-send-email.txt:399
#, priority:100
msgid "Default is the value of `sendemail.confirm` configuration value; if that is unspecified, default to 'auto' unless any of the suppress options have been specified, in which case default to 'compose'."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:394
+#: en/git-send-email.txt:402
#, priority:100
msgid "Do everything except actually send the emails."
msgstr ""
#. type: Labeled list
-#: en/git-send-email.txt:395
+#: en/git-send-email.txt:403
#, ignore-same, no-wrap, priority:100
msgid "--[no-]format-patch"
msgstr "--[no-]format-patch"
#. type: Plain text
-#: en/git-send-email.txt:400
+#: en/git-send-email.txt:408
#, priority:100
msgid "When an argument may be understood either as a reference or as a file name, choose to understand it as a format-patch argument (`--format-patch`) or as a file name (`--no-format-patch`). By default, when such a conflict occurs, git send-email will fail."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:404
+#: en/git-send-email.txt:412
#, priority:100
msgid "Make git-send-email less verbose. One line per email should be all that is output."
msgstr ""
#. type: Labeled list
-#: en/git-send-email.txt:405
+#: en/git-send-email.txt:413
#, ignore-same, no-wrap, priority:100
msgid "--[no-]validate"
msgstr "--[no-]validate"
#. type: Plain text
-#: en/git-send-email.txt:408
+#: en/git-send-email.txt:416
#, priority:100
msgid "Perform sanity checks on patches. Currently, validation means the following:"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:411
+#: en/git-send-email.txt:419
#, priority:100
msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:412
+#: en/git-send-email.txt:420
#, priority:100
msgid "Warn of patches that contain lines longer than"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:416
+#: en/git-send-email.txt:424
#, no-wrap, priority:100
msgid ""
"998 characters unless a suitable transfer encoding\n"
@@ -43672,174 +44815,174 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:420
+#: en/git-send-email.txt:428
#, priority:100
msgid "Default is the value of `sendemail.validate`; if this is not set, default to `--validate`."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:423
+#: en/git-send-email.txt:431
#, priority:100
msgid "Send emails even if safety checks would prevent it."
msgstr ""
#. type: Title ~
-#: en/git-send-email.txt:426
+#: en/git-send-email.txt:434
#, no-wrap, priority:100
msgid "Information"
msgstr ""
#. type: Labeled list
-#: en/git-send-email.txt:428
+#: en/git-send-email.txt:436
#, ignore-same, no-wrap, priority:100
msgid "--dump-aliases"
msgstr "--dump-aliases"
#. type: Plain text
-#: en/git-send-email.txt:433
+#: en/git-send-email.txt:441
#, priority:100
msgid "Instead of the normal operation, dump the shorthand alias names from the configured alias file(s), one per line in alphabetical order. Note, this only includes the alias name and not its expanded email addresses. See 'sendemail.aliasesfile' for more information about aliases."
msgstr ""
#. type: Labeled list
-#: en/git-send-email.txt:438
+#: en/git-send-email.txt:446
#, ignore-same, no-wrap, priority:100
msgid "sendemail.aliasesFile"
msgstr "sendemail.aliasesFile"
#. type: Plain text
-#: en/git-send-email.txt:441
+#: en/git-send-email.txt:449
#, priority:100
msgid "To avoid typing long email addresses, point this to one or more email aliases files. You must also supply `sendemail.aliasFileType`."
msgstr ""
#. type: Labeled list
-#: en/git-send-email.txt:442
+#: en/git-send-email.txt:450
#, ignore-same, no-wrap, priority:100
msgid "sendemail.aliasFileType"
msgstr "sendemail.aliasFileType"
#. type: Plain text
-#: en/git-send-email.txt:445
+#: en/git-send-email.txt:453
#, priority:100
msgid "Format of the file(s) specified in sendemail.aliasesFile. Must be one of 'mutt', 'mailrc', 'pine', 'elm', or 'gnus', or 'sendmail'."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:450
+#: en/git-send-email.txt:458
#, priority:100
msgid "What an alias file in each format looks like can be found in the documentation of the email program of the same name. The differences and limitations from the standard formats are described below:"
msgstr ""
#. type: Labeled list
-#: en/git-send-email.txt:452
+#: en/git-send-email.txt:460
#, no-wrap, priority:100
msgid "sendmail"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:454
+#: en/git-send-email.txt:462
#, priority:100
msgid "Quoted aliases and quoted addresses are not supported: lines that"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:455
+#: en/git-send-email.txt:463
#, priority:100
msgid "contain a `\"` symbol are ignored."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:456
+#: en/git-send-email.txt:464
#, priority:100
msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:457
+#: en/git-send-email.txt:465
#, priority:100
msgid "supported."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:458
+#: en/git-send-email.txt:466
#, priority:100
msgid "File inclusion (`:include: /path/name`) is not supported."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:459
+#: en/git-send-email.txt:467
#, priority:100
msgid "Warnings are printed on the standard error output for any"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:461
+#: en/git-send-email.txt:469
#, priority:100
msgid "explicitly unsupported constructs, and any other lines that are not recognized by the parser."
msgstr ""
#. type: Labeled list
-#: en/git-send-email.txt:463
+#: en/git-send-email.txt:471
#, ignore-same, no-wrap, priority:100
msgid "sendemail.multiEdit"
msgstr "sendemail.multiEdit"
#. type: Plain text
-#: en/git-send-email.txt:468
+#: en/git-send-email.txt:476
#, priority:100
msgid "If true (default), a single editor instance will be spawned to edit files you have to edit (patches when `--annotate` is used, and the summary when `--compose` is used). If false, files will be edited one after the other, spawning a new editor each time."
msgstr ""
#. type: Labeled list
-#: en/git-send-email.txt:469
+#: en/git-send-email.txt:477
#, ignore-same, no-wrap, priority:100
msgid "sendemail.confirm"
msgstr "sendemail.confirm"
#. type: Plain text
-#: en/git-send-email.txt:473
+#: en/git-send-email.txt:481
#, priority:100
msgid "Sets the default for whether to confirm before sending. Must be one of 'always', 'never', 'cc', 'compose', or 'auto'. See `--confirm` in the previous section for the meaning of these values."
msgstr ""
#. type: Title ~
-#: en/git-send-email.txt:477
+#: en/git-send-email.txt:485
#, no-wrap, priority:100
msgid "Use gmail as the smtp server"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:480
+#: en/git-send-email.txt:488
#, priority:100
msgid "To use 'git send-email' to send your patches through the GMail SMTP server, edit ~/.gitconfig to specify your account settings:"
msgstr ""
-#. type: Plain text
-#: en/git-send-email.txt:486
+#. type: delimited block -
+#: en/git-send-email.txt:495
#, no-wrap, priority:100
msgid ""
-"\t[sendemail]\n"
-"\t\tsmtpEncryption = tls\n"
-"\t\tsmtpServer = smtp.gmail.com\n"
-"\t\tsmtpUser = yourname@gmail.com\n"
-"\t\tsmtpServerPort = 587\n"
+"[sendemail]\n"
+"\tsmtpEncryption = tls\n"
+"\tsmtpServer = smtp.gmail.com\n"
+"\tsmtpUser = yourname@gmail.com\n"
+"\tsmtpServerPort = 587\n"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:490
+#: en/git-send-email.txt:500
#, priority:100
msgid "If you have multifactor authentication setup on your gmail account, you will need to generate an app-specific password for use with 'git send-email'. Visit https://security.google.com/settings/security/apppasswords to create it."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:493
+#: en/git-send-email.txt:503
#, priority:100
msgid "Once your commits are ready to be sent to the mailing list, run the following commands:"
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:497
+#: en/git-send-email.txt:507
#, no-wrap, priority:100
msgid ""
"\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
@@ -43848,21 +44991,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:502
+#: en/git-send-email.txt:512
#, priority:100
msgid "The first time you run it, you will be prompted for your credentials. Enter the app-specific or your regular password as appropriate. If you have credential helper configured (see linkgit:git-credential[1]), the password will be saved in the credential store so you won't have to type it the next time."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:505
-#, no-wrap, priority:100
-msgid ""
-"Note: the following perl modules are required\n"
-" Net::SMTP::SSL, MIME::Base64 and Authen::SASL\n"
+#: en/git-send-email.txt:518
+#, priority:100
+msgid "Note: the following core Perl modules that may be installed with your distribution of Perl are required: MIME::Base64, MIME::QuotedPrint, Net::Domain and Net::SMTP. These additional Perl modules are also required: Authen::SASL and Mail::Address."
msgstr ""
#. type: Plain text
-#: en/git-send-email.txt:509
+#: en/git-send-email.txt:523
#, priority:100
msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
msgstr ""
@@ -44459,7 +45600,7 @@ msgid "With this option, the command includes the current branch to the list of
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:56 en/rev-list-options.txt:644
+#: en/git-show-branch.txt:56 en/rev-list-options.txt:652
#, ignore-same, no-wrap, priority:260
msgid "--topo-order"
msgstr "--topo-order"
@@ -44471,7 +45612,7 @@ msgid "By default, the branches and their commits are shown in reverse chronolog
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:62 en/rev-list-options.txt:636
+#: en/git-show-branch.txt:62 en/rev-list-options.txt:644
#, ignore-same, no-wrap, priority:260
msgid "--date-order"
msgstr "--date-order"
@@ -44639,7 +45780,7 @@ msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:174
#, priority:100
-msgid "These three branches all forked from a common commit, [master], whose commit message is \"Add {apostrophe}git show-branch{apostrophe}\". The \"fixes\" branch adds one commit \"Introduce \"reset type\" flag to \"git reset\"\". The \"mhf\" branch adds many other commits. The current branch is \"master\"."
+msgid "These three branches all forked from a common commit, [master], whose commit message is \"Add \\'git show-branch'\". The \"fixes\" branch adds one commit \"Introduce \"reset type\" flag to \"git reset\"\". The \"mhf\" branch adds many other commits. The current branch is \"master\"."
msgstr ""
#. type: Plain text
@@ -45366,7 +46507,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git stash' list [<options>]\n"
-"'git stash' show [<stash>]\n"
+"'git stash' show [<options>] [<stash>]\n"
"'git stash' drop [-q|--quiet] [<stash>]\n"
"'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]\n"
"'git stash' branch <branchname> [<stash>]\n"
@@ -45451,25 +46592,25 @@ msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--a
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:92
+#: en/git-stash.txt:93
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs, and any non-option arguments form the message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:93
+#: en/git-stash.txt:94
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:100
+#: en/git-stash.txt:101
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:104
+#: en/git-stash.txt:105
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -45477,139 +46618,139 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:108
+#: en/git-stash.txt:109
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:109
+#: en/git-stash.txt:110
#, no-wrap, priority:240
-msgid "show [<stash>]"
+msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:119
+#: en/git-stash.txt:120
#, priority:240
msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:120
+#: en/git-stash.txt:121
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:126
+#: en/git-stash.txt:127
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:130
+#: en/git-stash.txt:131
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:135
+#: en/git-stash.txt:136
#, priority:240
msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:138
+#: en/git-stash.txt:139
#, priority:240
msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:139
+#: en/git-stash.txt:140
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:144
+#: en/git-stash.txt:145
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:145
+#: en/git-stash.txt:146
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:153
+#: en/git-stash.txt:154
#, priority:240
msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:159
+#: en/git-stash.txt:160
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:160
+#: en/git-stash.txt:161
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:164
+#: en/git-stash.txt:165
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:165
+#: en/git-stash.txt:166
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:171
+#: en/git-stash.txt:172
#, priority:240
msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:172 en/git-update-ref.txt:100
+#: en/git-stash.txt:173 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:179
+#: en/git-stash.txt:180
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:180
+#: en/git-stash.txt:181
#, no-wrap, priority:240
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:186
+#: en/git-stash.txt:187
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:195
+#: en/git-stash.txt:196
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:199
+#: en/git-stash.txt:200
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -45618,31 +46759,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:203
+#: en/git-stash.txt:204
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:208
+#: en/git-stash.txt:209
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:214
+#: en/git-stash.txt:215
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:219
+#: en/git-stash.txt:220
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:227
+#: en/git-stash.txt:228
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -45654,34 +46795,34 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:235
+#: en/git-stash.txt:236
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:246
+#: en/git-stash.txt:247
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
-"$ git checkout -b my_wip\n"
+"$ git switch -c my_wip\n"
"$ git commit -a -m \"WIP\"\n"
-"$ git checkout master\n"
+"$ git switch master\n"
"$ edit emergency fix\n"
"$ git commit -a -m \"Fix in a hurry\"\n"
-"$ git checkout my_wip\n"
+"$ git switch my_wip\n"
"$ git reset --soft HEAD^\n"
"# ... continue hacking ...\n"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:249
+#: en/git-stash.txt:250
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:257
+#: en/git-stash.txt:258
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -45693,19 +46834,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:259
+#: en/git-stash.txt:260
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:264
+#: en/git-stash.txt:265
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:275
+#: en/git-stash.txt:276
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -45720,19 +46861,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:277
+#: en/git-stash.txt:278
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:283
+#: en/git-stash.txt:284
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:288
+#: en/git-stash.txt:289
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -45741,10 +46882,10 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:297
+#: en/git-stash.txt:299
#, ignore-same, priority:240
-msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1]"
-msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1]"
+msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
+msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
#. type: Title =
#: en/git-status.txt:2
@@ -45819,61 +46960,61 @@ msgid "In addition to the names of files that have been changed, also show the t
msgstr ""
#. type: Plain text
-#: en/git-status.txt:65
+#: en/git-status.txt:66
#, priority:280
msgid "The mode parameter is used to specify the handling of untracked files. It is optional: it defaults to 'all', and if specified, it must be stuck to the option (e.g. `-uno`, but not `-u no`)."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:69
+#: en/git-status.txt:70
#, no-wrap, priority:280
msgid "'no' - Show no untracked files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:70
+#: en/git-status.txt:71
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:81
+#: en/git-status.txt:82
#, priority:280
msgid "When `-u` option is not used, untracked files and directories are shown (i.e. the same as specifying `normal`), to help you avoid forgetting to add newly created files. Because it takes extra work to find untracked files in the filesystem, this mode may take some time in a large working tree. Consider enabling untracked cache and split index if supported (see `git update-index --untracked-cache` and `git update-index --split-index`), Otherwise you can use `no` to have `git status` return more quickly without showing untracked files."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:99
+#: en/git-status.txt:101
#, priority:280
msgid "Ignore changes to submodules when looking for changes. <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 before 1.7.0). Using \"all\" hides all changes to submodules (and suppresses the output of submodule summaries when the config option `status.submoduleSummary` is set)."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:100
+#: en/git-status.txt:102
#, no-wrap, priority:280
msgid "--ignored[=<mode>]"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:102
+#: en/git-status.txt:104
#, priority:280
msgid "Show ignored files as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:105
+#: en/git-status.txt:108
#, priority:280
msgid "The mode parameter is used to specify the handling of ignored files. It is optional: it defaults to 'traditional'."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:109
+#: en/git-status.txt:112
#, priority:280
msgid "'traditional' - Shows ignored files and directories, unless"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:112
+#: en/git-status.txt:115
#, no-wrap, priority:280
msgid ""
"--untracked-files=all is specified, in which case\n"
@@ -45882,109 +47023,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:113
+#: en/git-status.txt:116
#, no-wrap, priority:280
msgid "'no'\t - Show no ignored files.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:114
+#: en/git-status.txt:117
#, no-wrap, priority:280
msgid "'matching' - Shows ignored files and directories matching an\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:115
+#: en/git-status.txt:118
#, no-wrap, priority:280
msgid "ignore pattern.\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:121
+#: en/git-status.txt:124
#, priority:280
msgid "When 'matching' mode is specified, paths that explicitly match an ignored pattern are shown. If a directory matches an ignore pattern, then it is shown, but not paths contained in the ignored directory. If a directory does not match an ignore pattern, but all contents are ignored, then the directory is not shown, but all contents are shown."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:125
+#: en/git-status.txt:129
#, priority:280
msgid "Terminate entries with NUL, instead of LF. This implies the `--porcelain=v1` output format if no other format is given."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:132
+#: en/git-status.txt:136
#, priority:280
msgid "Display untracked files in columns. See configuration variable column.status for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:133
+#: en/git-status.txt:137
#, ignore-same, no-wrap, priority:280
msgid "--ahead-behind"
msgstr "--ahead-behind"
#. type: Labeled list
-#: en/git-status.txt:134
+#: en/git-status.txt:138
#, ignore-same, no-wrap, priority:280
msgid "--no-ahead-behind"
msgstr "--no-ahead-behind"
#. type: Plain text
-#: en/git-status.txt:137
+#: en/git-status.txt:141
#, priority:280
msgid "Display or do not display detailed ahead/behind counts for the branch relative to its upstream branch. Defaults to true."
msgstr ""
#. type: Labeled list
-#: en/git-status.txt:138
+#: en/git-status.txt:142
#, ignore-same, no-wrap, priority:280
msgid "--renames"
msgstr "--renames"
#. type: Plain text
-#: en/git-status.txt:142
+#: en/git-status.txt:146
#, priority:280
msgid "Turn on/off rename detection regardless of user configuration. See also linkgit:git-diff[1] `--no-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:147
+#: en/git-status.txt:151
#, priority:280
msgid "Turn on rename detection, optionally setting the similarity threshold. See also linkgit:git-diff[1] `--find-renames`."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:150
+#: en/git-status.txt:154
#, priority:280
msgid "See the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:158
+#: en/git-status.txt:162
#, priority:280
msgid "The output from this command is designed to be used as a commit template comment. The default, long format, is designed to be human readable, verbose and descriptive. Its contents and format are subject to change at any time."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:163
+#: en/git-status.txt:167
#, priority:280
msgid "The paths mentioned in the output, unlike many other Git commands, are made relative to the current directory if you are working in a subdirectory (this is on purpose, to help cutting and pasting). See the status.relativePaths config option below."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:165
+#: en/git-status.txt:169
#, no-wrap, priority:280
msgid "Short Format"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:169
+#: en/git-status.txt:173
#, priority:280
msgid "In the short-format, the status of each path is shown as one of these forms"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:172
+#: en/git-status.txt:176
#, no-wrap, priority:280
msgid ""
"\tXY PATH\n"
@@ -45992,73 +47133,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:176
+#: en/git-status.txt:180
#, priority:280
msgid "where `ORIG_PATH` is where the renamed/copied contents came from. `ORIG_PATH` is only shown when the entry is renamed or copied. The `XY` is a two-letter status code."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:182
+#: en/git-status.txt:186
#, priority:280
msgid "The fields (including the `->`) are separated from each other by a single space. If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash-escaped."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:188
+#: en/git-status.txt:192
#, priority:280
msgid "For paths with merge conflicts, `X` and `Y` show the modification states of each side of the merge. For paths that do not have merge conflicts, `X` shows the status of the index, and `Y` shows the status of the work tree. For untracked paths, `XY` are `??`. Other status codes can be interpreted as follows:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:190
+#: en/git-status.txt:194
#, priority:280
msgid "' ' = unmodified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:191
+#: en/git-status.txt:195
#, priority:280
msgid "'M' = modified"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:192
+#: en/git-status.txt:196
#, priority:280
msgid "'A' = added"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:193
+#: en/git-status.txt:197
#, priority:280
msgid "'D' = deleted"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:194
+#: en/git-status.txt:198
#, priority:280
msgid "'R' = renamed"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:195
+#: en/git-status.txt:199
#, priority:280
msgid "'C' = copied"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:196
+#: en/git-status.txt:200
#, priority:280
msgid "'U' = updated but unmerged"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:199
+#: en/git-status.txt:203
#, priority:280
msgid "Ignored files are not listed, unless `--ignored` option is in effect, in which case `XY` are `!!`."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:226
+#: en/git-status.txt:230
#, no-wrap, priority:280
msgid ""
"X Y Meaning\n"
@@ -46089,7 +47230,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:235
+#: en/git-status.txt:239
#, no-wrap, priority:280
msgid ""
"Submodules have more state and instead report\n"
@@ -46102,91 +47243,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:238
+#: en/git-status.txt:242
#, priority:280
msgid "'m' and '?' are applied recursively. For example if a nested submodule in a submodule contains an untracked file, this is reported as '?' as well."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:240
+#: en/git-status.txt:244
#, priority:280
msgid "If -b is used the short-format status is preceded by a line"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:242
+#: en/git-status.txt:246
#, no-wrap, priority:280
msgid " ## branchname tracking info\n"
msgstr ""
#. type: Title ~
-#: en/git-status.txt:244
+#: en/git-status.txt:248
#, no-wrap, priority:280
msgid "Porcelain Format Version 1"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:251
+#: en/git-status.txt:255
#, priority:280
msgid "Version 1 porcelain format is similar to the short format, but is guaranteed not to change in a backwards-incompatible way between Git versions or based on user configuration. This makes it ideal for parsing by scripts. The description of the short format above also describes the porcelain format, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:254
+#: en/git-status.txt:258
#, priority:280
msgid "The user's color.status configuration is not respected; color will always be off."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:257
+#: en/git-status.txt:261
#, priority:280
msgid "The user's status.relativePaths configuration is not respected; paths shown will always be relative to the repository root."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:267
+#: en/git-status.txt:271
#, priority:280
msgid "There is also an alternate -z format recommended for machine parsing. In that format, the status field is the same, but some other things change. First, the '\\->' is omitted from rename entries and the field order is reversed (e.g 'from \\-> to' becomes 'to from'). Second, a NUL (ASCII 0) follows each filename, replacing space as a field separator and the terminating newline (but a space still separates the status field from the first filename). Third, filenames containing special characters are not specially formatted; no quoting or backslash-escaping is performed."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:269
+#: en/git-status.txt:273
#, priority:280
msgid "Any submodule changes are reported as modified `M` instead of `m` or single `?`."
msgstr ""
#. type: Title ~
-#: en/git-status.txt:271
+#: en/git-status.txt:275
#, no-wrap, priority:280
msgid "Porcelain Format Version 2"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:276
+#: en/git-status.txt:280
#, priority:280
msgid "Version 2 format adds more detailed information about the state of the worktree and changed items. Version 2 also defines an extensible set of easy to parse optional headers."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:280
+#: en/git-status.txt:284
#, priority:280
msgid "Header lines start with \"#\" and are added in response to specific command line arguments. Parsers should ignore headers they don't recognize."
msgstr ""
-#. type: Plain text
-#: en/git-status.txt:282
-#, priority:280
-msgid "### Branch Headers"
+#. type: Title ^
+#: en/git-status.txt:286
+#, no-wrap, priority:280
+msgid "Branch Headers"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:285
+#: en/git-status.txt:290
#, priority:280
msgid "If `--branch` is given, a series of header lines are printed with information about the current branch."
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:295
+#: en/git-status.txt:300
#, no-wrap, priority:280
msgid ""
"Line Notes\n"
@@ -46199,44 +47340,44 @@ msgid ""
"------------------------------------------------------------\n"
msgstr ""
-#. type: Plain text
-#: en/git-status.txt:298
-#, priority:280
-msgid "### Changed Tracked Entries"
+#. type: Title ^
+#: en/git-status.txt:303
+#, no-wrap, priority:280
+msgid "Changed Tracked Entries"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:304
+#: en/git-status.txt:310
#, priority:280
msgid "Following the headers, a series of lines are printed for tracked entries. One of three different line formats may be used to describe an entry depending on the type of change. Tracked entries are printed in an undefined order; parsers should allow for a mixture of the 3 line types in any order."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:306
+#: en/git-status.txt:312
#, priority:280
msgid "Ordinary changed entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:308
+#: en/git-status.txt:314
#, no-wrap, priority:280
msgid " 1 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:310
+#: en/git-status.txt:316
#, priority:280
msgid "Renamed or copied entries have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:312
+#: en/git-status.txt:318
#, no-wrap, priority:280
msgid " 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:343
+#: en/git-status.txt:349
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -46271,19 +47412,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-status.txt:347
+#: en/git-status.txt:353
#, priority:280
msgid "Unmerged entries have the following format; the first character is a \"u\" to distinguish from ordinary changed entries."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:349
+#: en/git-status.txt:355
#, no-wrap, priority:280
msgid " u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>\n"
msgstr ""
#. type: delimited block .
-#: en/git-status.txt:366
+#: en/git-status.txt:372
#, no-wrap, priority:280
msgid ""
"Field Meaning\n"
@@ -46303,86 +47444,86 @@ msgid ""
"--------------------------------------------------------\n"
msgstr ""
-#. type: Plain text
-#: en/git-status.txt:369
-#, priority:280
-msgid "### Other Items"
+#. type: Title ^
+#: en/git-status.txt:375
+#, no-wrap, priority:280
+msgid "Other Items"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:373
+#: en/git-status.txt:380
#, priority:280
msgid "Following the tracked entries (and if requested), a series of lines will be printed for untracked and then ignored items found in the worktree."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:375
+#: en/git-status.txt:382
#, priority:280
msgid "Untracked items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:377
+#: en/git-status.txt:384
#, no-wrap, priority:280
msgid " ? <path>\n"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:379
+#: en/git-status.txt:386
#, priority:280
msgid "Ignored items have the following format:"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:381
+#: en/git-status.txt:388
#, no-wrap, priority:280
msgid " ! <path>\n"
msgstr ""
-#. type: Plain text
-#: en/git-status.txt:383
-#, priority:280
-msgid "### Pathname Format Notes and -z"
+#. type: Title ^
+#: en/git-status.txt:390
+#, no-wrap, priority:280
+msgid "Pathname Format Notes and -z"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:387
+#: en/git-status.txt:395
#, priority:280
msgid "When the `-z` option is given, pathnames are printed as is and without any quoting and lines are terminated with a NUL (ASCII 0x00) byte."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:391
+#: en/git-status.txt:399
#, 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])."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:400
+#: en/git-status.txt:408
#, priority:280
msgid "The command honors `color.status` (or `status.color` -- they mean the same thing and the latter is kept for backward compatibility) and `color.status.<slot>` configuration variables to colorize its output."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:404
+#: en/git-status.txt:412
#, priority:280
msgid "If the config variable `status.relativePaths` is set to false, then all paths shown are relative to the repository root, not to the current directory."
msgstr ""
#. type: Plain text
-#: en/git-status.txt:415
+#: en/git-status.txt:423
#, priority:280
msgid "If `status.submoduleSummary` is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). Please note that the summary output from the status command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings."
msgstr ""
#. type: Title -
-#: en/git-status.txt:417
+#: en/git-status.txt:425
#, no-wrap, priority:280
msgid "BACKGROUND REFRESH"
msgstr ""
#. type: Plain text
-#: en/git-status.txt:428
+#: en/git-status.txt:436
#, priority:280
msgid "By default, `git status` will automatically refresh the index, updating the cached stat information from the working tree and writing out the result. Writing out the updated index is an optimization that isn't strictly necessary (`status` computes the values for itself, but writing them out is just to save subsequent programs from repeating our computation). When `status` is run in the background, the lock held during the write may conflict with other simultaneous processes, causing them to fail. Scripts running `status` in the background should consider using `git --no-optional-locks status` (see linkgit:git[1] for details)."
msgstr ""
@@ -46557,14 +47698,16 @@ msgid "git-submodule - Initialize, update or inspect submodules"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:21
+#: en/git-submodule.txt:23
#, ignore-ellipsis, no-wrap, priority:220
msgid ""
+"'git submodule' [--quiet] [--cached]\n"
"'git submodule' [--quiet] add [<options>] [--] <repository> [<path>]\n"
"'git submodule' [--quiet] status [--cached] [--recursive] [--] [<path>...]\n"
"'git submodule' [--quiet] init [--] [<path>...]\n"
"'git submodule' [--quiet] deinit [-f|--force] (--all|[--] <path>...)\n"
"'git submodule' [--quiet] update [<options>] [--] [<path>...]\n"
+"'git submodule' [--quiet] set-branch [<options>] [--] <path>\n"
"'git submodule' [--quiet] summary [<options>] [--] [<path>...]\n"
"'git submodule' [--quiet] foreach [--recursive] <command>\n"
"'git submodule' [--quiet] sync [--recursive] [--] [<path>...]\n"
@@ -46572,223 +47715,229 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:26
+#: en/git-submodule.txt:28
#, priority:220
msgid "Inspects, updates and manages submodules."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:28
+#: en/git-submodule.txt:30
#, priority:220
msgid "For more information about submodules, see linkgit:gitsubmodules[7]."
msgstr ""
+#. type: Plain text
+#: en/git-submodule.txt:35
+#, priority:220
+msgid "With no arguments, shows the status of existing submodules. Several subcommands are available to perform operations on the submodules."
+msgstr ""
+
#. type: Labeled list
-#: en/git-submodule.txt:31
+#: en/git-submodule.txt:36
#, no-wrap, priority:220
msgid "add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--depth <depth>] [--] <repository> [<path>]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:35
+#: en/git-submodule.txt:40
#, priority:220
msgid "Add the given repository as a submodule at the given path to the changeset to be committed next to the current project: the current project is termed the \"superproject\"."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:44
+#: en/git-submodule.txt:49
#, priority:220
-msgid "<repository> is the URL of the new submodule's origin repository. This may be either an absolute URL, or (if it begins with ./ or ../), the location relative to the superproject's default remote repository (Please note that to specify a repository 'foo.git' which is located right next to a superproject 'bar.git', you'll have to use '../foo.git' instead of './foo.git' - as one might expect when following the rules for relative URLs - because the evaluation of relative URLs in Git is identical to that of relative directories)."
+msgid "<repository> is the URL of the new submodule's origin repository. This may be either an absolute URL, or (if it begins with ./ or ../), the location relative to the superproject's default remote repository (Please note that to specify a repository 'foo.git' which is located right next to a superproject 'bar.git', you'll have to use `../foo.git` instead of `./foo.git` - as one might expect when following the rules for relative URLs - because the evaluation of relative URLs in Git is identical to that of relative directories)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:51
+#: en/git-submodule.txt:56
#, priority:220
msgid "The default remote is the remote of the remote-tracking branch of the current branch. If no such remote-tracking branch exists or the HEAD is detached, \"origin\" is assumed to be the default remote. If the superproject doesn't have a default remote configured the superproject is its own authoritative upstream and the current working directory is used instead."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:60
+#: en/git-submodule.txt:65
#, priority:220
msgid "The optional argument <path> is the relative location for the cloned submodule to exist in the superproject. If <path> is not given, the canonical part of the source repository is used (\"repo\" for \"/path/to/repo.git\" and \"foo\" for \"host.xz:foo/.git\"). If <path> exists and is already a valid Git repository, then it is staged for commit without cloning. The <path> is also used as the submodule's logical name in its configuration entries unless `--name` is used to specify a logical name."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:68
+#: en/git-submodule.txt:73
#, priority:220
msgid "The given URL is recorded into `.gitmodules` for use by subsequent users cloning the superproject. If the URL is given relative to the superproject's repository, the presumption is the superproject and submodule repositories will be kept together in the same relative location, and only the superproject's URL needs to be provided. git-submodule will correctly locate the submodule using the relative URL in `.gitmodules`."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:69
+#: en/git-submodule.txt:74
#, ignore-ellipsis, no-wrap, priority:220
msgid "status [--cached] [--recursive] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:77
+#: en/git-submodule.txt:82
#, priority:220
msgid "Show the status of the submodules. This will print the SHA-1 of the currently checked out commit for each submodule, along with the submodule path and the output of 'git describe' for the SHA-1. Each SHA-1 will possibly be prefixed with `-` if the submodule is not initialized, `+` if the currently checked out submodule commit does not match the SHA-1 found in the index of the containing repository and `U` if the submodule has merge conflicts."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:80
+#: en/git-submodule.txt:85
#, priority:220
msgid "If `--recursive` is specified, this command will recurse into nested submodules, and show their status as well."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:85
+#: en/git-submodule.txt:90
#, priority:220
msgid "If you are only interested in changes of the currently initialized submodules with respect to the commit recorded in the index or the HEAD, linkgit:git-status[1] and linkgit:git-diff[1] will provide that information too (and can also report changes to a submodule's work tree)."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:86
+#: en/git-submodule.txt:91
#, ignore-ellipsis, no-wrap, priority:220
msgid "init [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:93
+#: en/git-submodule.txt:98
#, priority:220
msgid "Initialize the submodules recorded in the index (which were added and committed elsewhere) by setting `submodule.$name.url` in .git/config. It uses the same setting from `.gitmodules` as a template. If the URL is relative, it will be resolved using the default remote. If there is no default remote, the current repository will be assumed to be upstream."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:98
+#: en/git-submodule.txt:103
#, priority:220
msgid "Optional <path> arguments limit which submodules will be initialized. If no path is specified and submodule.active has been configured, submodules configured to be active will be initialized, otherwise all submodules are initialized."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:106
+#: en/git-submodule.txt:111
#, priority:220
msgid "When present, it will also copy the value of `submodule.$name.update`. This command does not alter existing information in .git/config. You can then customize the submodule clone URLs in .git/config for your local setup and proceed to `git submodule update`; you can also just use `git submodule update --init` without the explicit 'init' step if you do not intend to customize any submodule locations."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:108
+#: en/git-submodule.txt:113
#, priority:220
msgid "See the add subcommand for the definition of default remote."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:109
+#: en/git-submodule.txt:114
#, ignore-ellipsis, no-wrap, priority:220
msgid "deinit [-f|--force] (--all|[--] <path>...)"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:116
+#: en/git-submodule.txt:121
#, priority:220
msgid "Unregister the given submodules, i.e. remove the whole `submodule.$name` section from .git/config together with their work tree. Further calls to `git submodule update`, `git submodule foreach` and `git submodule sync` will skip any unregistered submodules until they are initialized again, so use this command if you don't want to have a local checkout of the submodule in your working tree anymore."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:119
+#: en/git-submodule.txt:124
#, priority:220
msgid "When the command is run without pathspec, it errors out, instead of deinit-ing everything, to prevent mistakes."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:122
+#: en/git-submodule.txt:127
#, priority:220
msgid "If `--force` is specified, the submodule's working tree will be removed even if it contains local modifications."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:126
+#: en/git-submodule.txt:131
#, priority:220
msgid "If you really want to remove a submodule from the repository and commit that use linkgit:git-rm[1] instead. See linkgit:gitsubmodules[7] for removal options."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:127
+#: en/git-submodule.txt:132
#, ignore-ellipsis, no-wrap, priority:220
msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:138
+#: en/git-submodule.txt:143
#, priority:220
msgid "Update the registered submodules to match what the superproject expects by cloning missing submodules and updating the working tree of the submodules. The \"updating\" can be done in several ways depending on command line options and the value of `submodule.<name>.update` configuration variable. The command line option takes precedence over the configuration variable. If neither is given, a 'checkout' is performed. The 'update' procedures supported both from the command line as well as through the `submodule.<name>.update` configuration are:"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:139
+#: en/git-submodule.txt:144
#, no-wrap, priority:220
msgid "checkout"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:140
+#: en/git-submodule.txt:145
#, priority:220
msgid "the commit recorded in the superproject will be"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:141
+#: en/git-submodule.txt:146
#, no-wrap, priority:220
msgid "checked out in the submodule on a detached HEAD.\n"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:146
+#: en/git-submodule.txt:151
#, priority:220
msgid "If `--force` is specified, the submodule will be checked out (using `git checkout --force`), even if the commit specified in the index of the containing repository already matches the commit checked out in the submodule."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:147
+#: en/git-submodule.txt:152
#, no-wrap, priority:220
msgid "rebase"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:148
+#: en/git-submodule.txt:153
#, priority:220
msgid "the current branch of the submodule will be rebased"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:149
+#: en/git-submodule.txt:154
#, no-wrap, priority:220
msgid "onto the commit recorded in the superproject.\n"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:151
+#: en/git-submodule.txt:156
#, priority:220
msgid "the commit recorded in the superproject will be merged"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:152
+#: en/git-submodule.txt:157
#, no-wrap, priority:220
msgid "into the current branch in the submodule.\n"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:155
+#: en/git-submodule.txt:160
#, priority:220
msgid "The following 'update' procedures are only available via the `submodule.<name>.update` configuration variable:"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:156
+#: en/git-submodule.txt:161
#, no-wrap, priority:220
msgid "custom command"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:157
+#: en/git-submodule.txt:162
#, priority:220
msgid "arbitrary shell command that takes a single"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:161
+#: en/git-submodule.txt:166
#, no-wrap, priority:220
msgid ""
"argument (the sha1 of the commit recorded in the\n"
@@ -46798,283 +47947,308 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:163
+#: en/git-submodule.txt:168
#, priority:220
msgid "the submodule is not updated."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:167
+#: en/git-submodule.txt:172
#, priority:220
msgid "If the submodule is not yet initialized, and you just want to use the setting as stored in `.gitmodules`, you can automatically initialize the submodule with the `--init` option."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:170
+#: en/git-submodule.txt:175
#, priority:220
msgid "If `--recursive` is specified, this command will recurse into the registered submodules, and update any nested submodules within."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:171
+#: en/git-submodule.txt:176
+#, no-wrap, priority:220
+msgid "set-branch (-b|--branch) <branch> [--] <path>"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-submodule.txt:177
+#, no-wrap, priority:220
+msgid "set-branch (-d|--default) [--] <path>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-submodule.txt:182
+#, priority:220
+msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-submodule.txt:183
#, ignore-ellipsis, no-wrap, priority:220
msgid "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:180
+#: en/git-submodule.txt:192
#, priority:220
msgid "Show commit summary between the given commit (defaults to HEAD) and working tree/index. For a submodule in question, a series of commits in the submodule between the given super project commit and the index or working tree (switched by `--cached`) are shown. If the option `--files` is given, show the series of commits in the submodule between the index of the super project and the working tree of the submodule (this option doesn't allow to use the `--cached` option or to provide an explicit commit)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:183
+#: en/git-submodule.txt:195
#, priority:220
msgid "Using the `--submodule=log` option with linkgit:git-diff[1] will provide that information too."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:184
+#: en/git-submodule.txt:196
#, no-wrap, priority:220
msgid "foreach [--recursive] <command>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:205
+#: en/git-submodule.txt:217
#, priority:220
msgid "Evaluates an arbitrary shell command in each checked out submodule. The command has access to the variables $name, $sm_path, $displaypath, $sha1 and $toplevel: $name is the name of the relevant submodule section in `.gitmodules`, $sm_path is the path of the submodule as recorded in the immediate superproject, $displaypath contains the relative path from the current working directory to the submodules root directory, $sha1 is the commit as recorded in the immediate superproject, and $toplevel is the absolute path to the top-level of the immediate superproject. Note that to avoid conflicts with '$PATH' on Windows, the '$path' variable is now a deprecated synonym of '$sm_path' variable. Any submodules defined in the superproject but not checked out are ignored by this command. Unless given `--quiet`, foreach prints the name of each submodule before evaluating the command. If `--recursive` is given, submodules are traversed recursively (i.e. the given shell command is evaluated in nested submodules as well). A non-zero return from the command in any submodule causes the processing to terminate. This can be overridden by adding '|| :' to the end of the command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:208
+#: en/git-submodule.txt:220
#, priority:220
msgid "As an example, the command below will show the path and currently checked out commit for each submodule:"
msgstr ""
#. type: delimited block -
-#: en/git-submodule.txt:211
+#: en/git-submodule.txt:223
#, no-wrap, priority:220
msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:213
+#: en/git-submodule.txt:225
#, ignore-ellipsis, no-wrap, priority:220
msgid "sync [--recursive] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:220
+#: en/git-submodule.txt:232
#, priority:220
msgid "Synchronizes submodules' remote URL configuration setting to the value specified in `.gitmodules`. It will only affect those submodules which already have a URL entry in .git/config (that is the case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:223
+#: en/git-submodule.txt:235
#, priority:220
msgid "`git submodule sync` synchronizes all submodules while `git submodule sync -- A` synchronizes submodule \"A\" only."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:226
+#: en/git-submodule.txt:238
#, priority:220
msgid "If `--recursive` is specified, this command will recurse into the registered submodules, and sync any nested submodules within."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:227
+#: en/git-submodule.txt:239
#, no-wrap, priority:220
msgid "absorbgitdirs"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:234
+#: en/git-submodule.txt:246
#, priority:220
msgid "If a git directory of a submodule is inside the submodule, move the git directory of the submodule into its superprojects `$GIT_DIR/modules` path and then connect the git directory and its working directory by setting the `core.worktree` and adding a .git file pointing to the git directory embedded in the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:238
+#: en/git-submodule.txt:250
#, priority:220
msgid "A repository that was cloned independently and later added as a submodule or old setups have the submodules git directory inside the submodule instead of embedded into the superprojects git directory."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:240
+#: en/git-submodule.txt:252
#, priority:220
msgid "This command is recursive by default."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:246
+#: en/git-submodule.txt:258
#, priority:220
msgid "Only print error messages."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:253
+#: en/git-submodule.txt:265
#, priority:220
msgid "This option is only valid for add and update commands. Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:257
+#: en/git-submodule.txt:269
#, priority:220
msgid "This option is only valid for the deinit command. Unregister all submodules in the working tree."
msgstr ""
+#. type: Labeled list
+#: en/git-submodule.txt:270
+#, fuzzy, no-wrap, priority:220
+#| msgid "--branch"
+msgid "-b <branch>"
+msgstr "--branch"
+
#. type: Plain text
-#: en/git-submodule.txt:265
+#: en/git-submodule.txt:278
#, priority:220
-msgid "Branch of repository to add as submodule. The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository."
+msgid "Branch of repository to add as submodule. The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository. If the option is not specified, it defaults to 'master'."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:278
+#: en/git-submodule.txt:291
#, priority:220
msgid "This option is only valid for add, deinit and update commands. When running add, allow adding an otherwise ignored submodule path. When running deinit the submodule working trees will be removed even if they contain local changes. When running update (only effective with the checkout procedure), throw away local changes in submodules when switching to a different commit; and always run a checkout operation in the submodule, even if the commit listed in the index of the containing repository matches the commit checked out in the submodule."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:283
+#: en/git-submodule.txt:296
#, priority:220
msgid "This option is only valid for status and summary commands. These commands typically use the commit found in the submodule HEAD, but with this option, the commit stored in the index is used instead."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:284
+#: en/git-submodule.txt:297
#, ignore-same, no-wrap, priority:220
msgid "--files"
msgstr "--files"
#. type: Plain text
-#: en/git-submodule.txt:288
+#: en/git-submodule.txt:301
#, priority:220
msgid "This option is only valid for the summary command. This command compares the commit in the index with that in the submodule HEAD when this option is used."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:290
+#: en/git-submodule.txt:303
#, ignore-same, no-wrap, priority:220
msgid "--summary-limit"
msgstr "--summary-limit"
#. type: Plain text
-#: en/git-submodule.txt:296
+#: en/git-submodule.txt:309
#, priority:220
msgid "This option is only valid for the summary command. Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:297
+#: en/git-submodule.txt:310
#, ignore-same, no-wrap, priority:220
msgid "--remote"
msgstr "--remote"
#. type: Plain text
-#: en/git-submodule.txt:306
+#: en/git-submodule.txt:319
#, priority:220
msgid "This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:312
+#: en/git-submodule.txt:325
#, priority:220
msgid "This works for any of the supported update procedures (`--checkout`, `--rebase`, etc.). The only change is the source of the target SHA-1. For example, `submodule update --remote --merge` will merge upstream submodule changes into the submodules, while `submodule update --merge` will merge superproject gitlink changes into the submodules."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:317
+#: en/git-submodule.txt:330
#, priority:220
msgid "In order to ensure a current tracking branch state, `update --remote` fetches the submodule's remote repository before calculating the SHA-1. If you don't want to fetch, you should use `submodule update --remote --no-fetch`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:327
+#: en/git-submodule.txt:340
#, priority:220
msgid "Use this option to integrate changes from the upstream subproject with your submodule's current HEAD. Alternatively, you can run `git pull` from the submodule, which is equivalent except for the remote branch name: `update --remote` uses the default upstream repository and `submodule.<name>.branch`, while `git pull` uses the submodule's `branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want to distribute the default upstream branch with the superproject and `branch.<name>.merge` if you want a more native feel while working in the submodule itself."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:329
+#: en/git-submodule.txt:342
#, ignore-same, no-wrap, priority:220
msgid "--no-fetch"
msgstr "--no-fetch"
#. type: Plain text
-#: en/git-submodule.txt:332
+#: en/git-submodule.txt:345
#, priority:220
msgid "This option is only valid for the update command. Don't fetch new objects from the remote site."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:333
+#: en/git-submodule.txt:346
#, ignore-same, no-wrap, priority:220
msgid "--checkout"
msgstr "--checkout"
#. type: Plain text
-#: en/git-submodule.txt:341
+#: en/git-submodule.txt:354
#, priority:220
msgid "This option is only valid for the update command. Checkout the commit recorded in the superproject on a detached HEAD in the submodule. This is the default behavior, the main use of this option is to override `submodule.$name.update` when set to a value other than `checkout`. If the key `submodule.$name.update` is either not explicitly set or set to `checkout`, this option is implicit."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:351
+#: en/git-submodule.txt:364
#, priority:220
msgid "This option is only valid for the update command. Merge the commit recorded in the superproject into the current branch of the submodule. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve the resulting conflicts within the submodule with the usual conflict resolution tools. If the key `submodule.$name.update` is set to `merge`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:352
+#: en/git-submodule.txt:365
#, ignore-same, no-wrap, priority:220
msgid "--rebase"
msgstr "--rebase"
#. type: Plain text
-#: en/git-submodule.txt:360
+#: en/git-submodule.txt:373
#, priority:220
msgid "This option is only valid for the update command. Rebase the current branch onto the commit recorded in the superproject. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve these failures with linkgit:git-rebase[1]. If the key `submodule.$name.update` is set to `rebase`, this option is implicit."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:361
+#: en/git-submodule.txt:374
#, ignore-same, no-wrap, priority:220
msgid "--init"
msgstr "--init"
#. type: Plain text
-#: en/git-submodule.txt:365
+#: en/git-submodule.txt:378
#, priority:220
msgid "This option is only valid for the update command. Initialize all submodules for which \"git submodule init\" has not been called so far before updating."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:366
+#: en/git-submodule.txt:379
#, ignore-same, no-wrap, priority:220
msgid "--name"
msgstr "--name"
#. type: Plain text
-#: en/git-submodule.txt:370
+#: en/git-submodule.txt:383
#, priority:220
msgid "This option is only valid for the add command. It sets the submodule's name to the given string instead of defaulting to its path. The name must be valid as a directory name and may not end with a '/'."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:371
+#: en/git-submodule.txt:384
#, no-wrap, priority:220
msgid "--reference <repository>"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:375 en/git-submodule.txt:384
+#: en/git-submodule.txt:388 en/git-submodule.txt:397
#, priority:220
msgid "This option is only valid for add and update commands. These commands sometimes need to clone a remote repository. In this case, this option will be passed to the linkgit:git-clone[1] command."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:379
+#: en/git-submodule.txt:392
#, no-wrap, priority:220
msgid ""
"*NOTE*: Do *not* use this option unless you have read the note\n"
@@ -47083,61 +48257,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:386
+#: en/git-submodule.txt:399
#, no-wrap, priority:220
msgid "*NOTE*: see the NOTE for the `--reference` option.\n"
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:392
+#: en/git-submodule.txt:405
#, priority:220
msgid "This option is only valid for foreach, update, status and sync commands. Traverse submodules recursively. The operation is performed not only in the submodules of the current repo, but also in any nested submodules inside those submodules (and so on)."
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:393
+#: en/git-submodule.txt:406
#, ignore-same, no-wrap, priority:220
msgid "--depth"
msgstr "--depth"
#. type: Plain text
-#: en/git-submodule.txt:397
+#: en/git-submodule.txt:410
#, priority:220
msgid "This option is valid for add and update commands. Create a 'shallow' clone with a history truncated to the specified number of revisions. See linkgit:git-clone[1]"
msgstr ""
#. type: Labeled list
-#: en/git-submodule.txt:398
+#: en/git-submodule.txt:411
#, ignore-same, no-wrap, priority:220
msgid "--[no-]recommend-shallow"
msgstr "--[no-]recommend-shallow"
#. type: Plain text
-#: en/git-submodule.txt:403
+#: en/git-submodule.txt:416
#, priority:220
msgid "This option is only valid for the update command. The initial clone of a submodule will use the recommended `submodule.<name>.shallow` as provided by the `.gitmodules` file by default. To ignore the suggestions use `--no-recommend-shallow`."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:409
+#: en/git-submodule.txt:422
#, priority:220
msgid "This option is only valid for the update command. Clone new submodules in parallel with as many jobs. Defaults to the `submodule.fetchJobs` option."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:414
+#: en/git-submodule.txt:427
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:422
+#: en/git-submodule.txt:435
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:426
+#: en/git-submodule.txt:439
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -47385,7 +48559,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:130 en/git-svn.txt:243
#, priority:100
-msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\*\\*/.rev_map.*' in the FILES section below for details)."
+msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
msgstr ""
#. type: Labeled list
@@ -47769,7 +48943,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:870
+#: en/git-svn.txt:346 en/rev-list-options.txt:905
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -48143,7 +49317,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:530
#, priority:100
-msgid "Only the rev_map and refs/remotes/git-svn are changed (see '$GIT_DIR/svn/\\*\\*/.rev_map.*' in the FILES section below for details). Follow 'reset' with a 'fetch' and then 'git reset' or 'git rebase' to move local branches onto the new tree."
+msgid "Only the rev_map and refs/remotes/git-svn are changed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details). Follow 'reset' with a 'fetch' and then 'git reset' or 'git rebase' to move local branches onto the new tree."
msgstr ""
#. type: Labeled list
@@ -48570,7 +49744,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:765
#, priority:100
-msgid "This option can only be used for one-shot imports as 'git svn' will not be able to fetch again without metadata. Additionally, if you lose your '$GIT_DIR/svn/\\*\\*/.rev_map.*' files, 'git svn' will not be able to rebuild them."
+msgid "This option can only be used for one-shot imports as 'git svn' will not be able to fetch again without metadata. Additionally, if you lose your '$GIT_DIR/svn/\\**/.rev_map.*' files, 'git svn' will not be able to rebuild them."
msgstr ""
#. type: Plain text
@@ -48582,7 +49756,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:777
#, priority:100
-msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider linkgit:git-filter-branch[1] instead. filter-branch also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
+msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports, and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider https://github.com/newren/git-filter-repo[git-filter-repo] instead. filter-repo also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
msgstr ""
#. type: Labeled list
@@ -48976,10 +50150,10 @@ msgstr ""
#: en/git-svn.txt:1109
#, no-wrap, priority:100
msgid ""
-"Keep in mind that the '\\*' (asterisk) wildcard of the local ref\n"
-"(right of the ':') *must* be the farthest right path component;\n"
+"Keep in mind that the `*` (asterisk) wildcard of the local ref\n"
+"(right of the `:`) *must* be the farthest right path component;\n"
"however the remote wildcard may be anywhere as long as it's an\n"
-"independent path component (surrounded by '/' or EOL). This\n"
+"independent path component (surrounded by `/` or EOL). This\n"
"type of configuration is not automatically created by 'init' and\n"
"should be manually entered with a text-editor or using 'git config'.\n"
msgstr ""
@@ -49071,7 +50245,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:1157
#, no-wrap, priority:100
-msgid "$GIT_DIR/svn/\\*\\*/.rev_map.*"
+msgid "$GIT_DIR/svn/\\**/.rev_map.*"
msgstr ""
#. type: Plain text
@@ -49086,6 +50260,318 @@ msgstr ""
msgid "'git svn fetch' and 'git svn rebase' automatically update the rev_map if it is missing or not up to date. 'git svn reset' automatically rewinds it."
msgstr ""
+#. type: Title =
+#: en/git-switch.txt:2
+#, ignore-same, no-wrap, priority:100
+msgid "git-switch(1)"
+msgstr "git-switch(1)"
+
+#. type: Plain text
+#: en/git-switch.txt:7
+#, priority:100
+msgid "git-switch - Switch branches"
+msgstr ""
+
+#. type: Plain text
+#: en/git-switch.txt:15
+#, no-wrap, priority:100
+msgid ""
+"'git switch' [<options>] [--no-guess] <branch>\n"
+"'git switch' [<options>] --detach [<start-point>]\n"
+"'git switch' [<options>] (-c|-C) <new-branch> [<start-point>]\n"
+"'git switch' [<options>] --orphan <new-branch>\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-switch.txt:21
+#, priority:100
+msgid "Switch to a specified branch. The working tree and the index are updated to match the branch. All new commits will be added to the tip of this branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-switch.txt:26
+#, priority:100
+msgid "Optionally a new branch could be created with either `-c`, `-C`, automatically from a remote branch of same name (see `--guess`), or detach the working tree from any branch with `--detach`, along with switching."
+msgstr ""
+
+#. type: Plain text
+#: en/git-switch.txt:31
+#, priority:100
+msgid "Switching branches does not require a clean index and working tree (i.e. no differences compared to `HEAD`). The operation is aborted however if the operation leads to loss of local changes, unless told otherwise with `--discard-changes` or `--merge`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-switch.txt:38
+#, priority:100
+msgid "Branch to switch to."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-switch.txt:39
+#, fuzzy, no-wrap, priority:100
+#| msgid "--branch"
+msgid "<new-branch>"
+msgstr "--branch"
+
+#. type: Plain text
+#: en/git-switch.txt:48
+#, priority:100
+msgid "The starting point for the new branch. Specifying a `<start-point>` allows you to create a branch based on some other point in history than where HEAD currently points. (Or, in the case of `--detach`, allows you to inspect and detach from some other point.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-switch.txt:54
+#, priority:100
+msgid "You can use the `@{-N}` syntax to refer to the N-th last branch/commit switched to using \"git switch\" or \"git checkout\" operation. You may also specify `-` which is synonymous to `@{-1}`. This is often used to switch quickly between two branches, or to undo a branch switch by mistake."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-switch.txt:59
+#, fuzzy, no-wrap, priority:100
+#| msgid "--branch"
+msgid "-c <new-branch>"
+msgstr "--branch"
+
+#. type: Labeled list
+#: en/git-switch.txt:60
+#, fuzzy, no-wrap, priority:100
+#| msgid "--detect-branches"
+msgid "--create <new-branch>"
+msgstr "--detect-branches"
+
+#. type: Plain text
+#: en/git-switch.txt:64
+#, priority:100
+msgid "Create a new branch named `<new-branch>` starting at `<start-point>` before switching to the branch. This is a convenient shortcut for:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-switch.txt:68
+#, no-wrap, priority:100
+msgid ""
+"$ git branch <new-branch>\n"
+"$ git switch <new-branch>\n"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-switch.txt:70
+#, fuzzy, no-wrap, priority:100
+#| msgid "--branch"
+msgid "-C <new-branch>"
+msgstr "--branch"
+
+#. type: Labeled list
+#: en/git-switch.txt:71
+#, fuzzy, no-wrap, priority:100
+#| msgid "--force-untracked-cache"
+msgid "--force-create <new-branch>"
+msgstr "--force-untracked-cache"
+
+#. type: Plain text
+#: en/git-switch.txt:75
+#, priority:100
+msgid "Similar to `--create` except that if `<new-branch>` already exists, it will be reset to `<start-point>`. This is a convenient shortcut for:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-switch.txt:79
+#, no-wrap, priority:100
+msgid ""
+"$ git branch -f <new-branch>\n"
+"$ git switch <new-branch>\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-switch.txt:86
+#, priority:100
+msgid "Switch to a commit for inspection and discardable experiments. See the \"DETACHED HEAD\" section in linkgit:git-checkout[1] for details."
+msgstr ""
+
+#. type: delimited block -
+#: en/git-switch.txt:95
+#, no-wrap, priority:100
+msgid "$ git switch -c <branch> --track <remote>/<branch>\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-switch.txt:106
+#, priority:100
+msgid "`--guess` is the default behavior. Use `--no-guess` to disable it."
+msgstr ""
+
+#. type: Plain text
+#: en/git-switch.txt:110
+#, priority:100
+msgid "An alias for `--discard-changes`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-switch.txt:111
+#, ignore-same, no-wrap, priority:100
+msgid "--discard-changes"
+msgstr "--discard-changes"
+
+#. type: Plain text
+#: en/git-switch.txt:117
+#, priority:100
+msgid "Proceed even if the index or the working tree differs from `HEAD`. Both the index and working tree are restored to match the switching target. If `--recurse-submodules` is specified, submodule content is also restored to match the switching target. This is used to throw away local changes."
+msgstr ""
+
+#. type: Plain text
+#: en/git-switch.txt:127
+#, priority:100
+msgid "If you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context. However, with this option, a three-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-switch.txt:156
+#, priority:100
+msgid "When creating a new branch, set up \"upstream\" configuration. `-c` is implied. See `--track` in linkgit:git-branch[1] for details."
+msgstr ""
+
+#. type: Plain text
+#: en/git-switch.txt:166
+#, priority:100
+msgid "If no `-c` option is given, the name of the new branch will be derived from the remote-tracking branch, by looking at the local part of the refspec configured for the corresponding remote, and then stripping the initial part up to the \"*\". This would tell us to use `hack` as the local branch when branching off of `origin/hack` (or `remotes/origin/hack`, or even `refs/remotes/origin/hack`). If the given name has no slash, or the above guessing results in an empty name, the guessing is aborted. You can explicitly give a name with `-c` in such a case."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-switch.txt:171
+#, no-wrap, priority:100
+msgid "--orphan <new-branch>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-switch.txt:174
+#, priority:100
+msgid "Create a new 'orphan' branch, named `<new-branch>`. All tracked files are removed."
+msgstr ""
+
+#. type: Plain text
+#: en/git-switch.txt:180
+#, priority:100
+msgid "`git switch` refuses when the wanted ref is already checked out by another worktree. This option makes it check the ref out anyway. In other words, the ref can be held by more than one worktree."
+msgstr ""
+
+#. type: Plain text
+#: en/git-switch.txt:189
+#, priority:100
+msgid "Using `--recurse-submodules` will update the content of all initialized submodules according to the commit recorded in the superproject. If nothing (or `--no-recurse-submodules`) is used, the work trees of submodules will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodules."
+msgstr ""
+
+#. type: Plain text
+#: en/git-switch.txt:194
+#, priority:100
+msgid "The following command switches to the \"master\" branch:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-switch.txt:197
+#, no-wrap, priority:100
+msgid "$ git switch master\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-switch.txt:204
+#, no-wrap, priority:100
+msgid "$ git switch mytopic\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-switch.txt:209
+#, priority:100
+msgid "However, your \"wrong\" branch and correct \"mytopic\" branch may differ in files that you have modified locally, in which case the above switch would fail like this:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-switch.txt:213
+#, no-wrap, priority:100
+msgid ""
+"$ git switch mytopic\n"
+"error: You have local changes to 'frotz'; not switching branches.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-switch.txt:221
+#, no-wrap, priority:100
+msgid ""
+"$ git switch -m mytopic\n"
+"Auto-merging frotz\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-switch.txt:229
+#, priority:100
+msgid "To switch back to the previous branch before we switched to mytopic (i.e. \"master\" branch):"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-switch.txt:232
+#, no-wrap, priority:100
+msgid "$ git switch -\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-switch.txt:236
+#, priority:100
+msgid "You can grow a new branch from any commit. For example, switch to \"HEAD~3\" and create branch \"fixup\":"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-switch.txt:240
+#, no-wrap, priority:100
+msgid ""
+"$ git switch -c fixup HEAD~3\n"
+"Switched to a new branch 'fixup'\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-switch.txt:244
+#, priority:100
+msgid "If you want to start a new branch from a remote branch of the same name:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-switch.txt:249
+#, no-wrap, priority:100
+msgid ""
+"$ git switch new-topic\n"
+"Branch 'new-topic' set up to track remote branch 'new-topic' from 'origin'\n"
+"Switched to a new branch 'new-topic'\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-switch.txt:253
+#, priority:100
+msgid "To check out commit `HEAD~3` for temporary inspection or experiment without creating a new branch:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-switch.txt:257
+#, no-wrap, priority:100
+msgid ""
+"$ git switch --detach HEAD~3\n"
+"HEAD is now at 9fc9555312 Merge branch 'cc/shared-index-permbits'\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-switch.txt:261
+#, priority:100
+msgid "If it turns out whatever you have done is worth keeping, you can always create a new name for it (without switching away):"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-switch.txt:264
+#, no-wrap, priority:100
+msgid "$ git switch -c good-surprises\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-switch.txt:270
+#, ignore-same, priority:100
+msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
+
#. type: Title =
#: en/git-symbolic-ref.txt:2
#, ignore-same, no-wrap, priority:100
@@ -49254,205 +50740,217 @@ msgid "--sign"
msgstr "--sign"
#. type: Plain text
-#: en/git-tag.txt:67
+#: en/git-tag.txt:70
#, priority:240
-msgid "Make a GPG-signed tag, using the default e-mail address's key."
+msgid "Make a GPG-signed tag, using the default e-mail address's key. The default behavior of tag GPG-signing is controlled by `tag.gpgSign` configuration variable if it exists, or disabled oder otherwise. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:68
+#: en/git-tag.txt:71
+#, ignore-same, no-wrap, priority:240
+msgid "--no-sign"
+msgstr "--no-sign"
+
+#. type: Plain text
+#: en/git-tag.txt:74
+#, priority:240
+msgid "Override `tag.gpgSign` configuration variable that is set to force each and every tag to be signed."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-tag.txt:75
#, no-wrap, priority:240
msgid "-u <keyid>"
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:69
+#: en/git-tag.txt:76
#, no-wrap, priority:240
msgid "--local-user=<keyid>"
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:71
+#: en/git-tag.txt:78
#, priority:240
msgid "Make a GPG-signed tag, using the given key."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:75
+#: en/git-tag.txt:82
#, priority:240
msgid "Replace an existing tag with the given name (instead of failing)"
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:79
+#: en/git-tag.txt:86
#, priority:240
msgid "Delete existing tags with the given names."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:83
+#: en/git-tag.txt:90
#, priority:240
msgid "Verify the GPG signature of the given tag names."
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:84
+#: en/git-tag.txt:91
#, no-wrap, priority:240
msgid "-n<num>"
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:87
+#: en/git-tag.txt:94
#, priority:240
msgid "<num> specifies how many lines from the annotation, if any, are printed when using -l. Implies `--list`."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:91
+#: en/git-tag.txt:98
#, priority:240
msgid "The default is not to print any annotation lines. If no number is given to `-n`, only the first line is printed. If the tag is not annotated, the commit message is displayed instead."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:96
+#: en/git-tag.txt:103
#, ignore-ellipsis, priority:240
msgid "List tags. With optional `<pattern>...`, e.g. `git tag --list 'v-*'`, list only the tags that match the pattern(s)."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:100
+#: en/git-tag.txt:107
#, priority:240
msgid "Running \"git tag\" without arguments also lists all tags. The pattern is a shell wildcard (i.e., matched using fnmatch(3)). Multiple patterns may be given; if any of them matches, the tag is shown."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:104
+#: en/git-tag.txt:111
#, priority:240
msgid "This option is implicitly supplied if any other list-like option such as `--contains` is provided. See the documentation for each of those options for details."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:117
+#: en/git-tag.txt:124
#, priority:240
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. You may use the --sort=<key> option multiple times, in which case the last key becomes the primary key. Also supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. The keys supported are the same as those in `git for-each-ref`. Sort order defaults to the value configured for the `tag.sort` variable if it exists, or lexicographic order otherwise. See linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:126
+#: en/git-tag.txt:133
#, priority:240
msgid "Sorting and filtering tags are case insensitive."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:132
+#: en/git-tag.txt:139
#, priority:240
msgid "Display tag listing in columns. See configuration variable column.tag for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:134
+#: en/git-tag.txt:141
#, priority:240
msgid "This option is only applicable when listing tags without annotation lines."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:138
+#: en/git-tag.txt:145
#, priority:240
msgid "Only list tags which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:142
+#: en/git-tag.txt:149
#, priority:240
msgid "Only list tags which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:146
+#: en/git-tag.txt:153
#, priority:240
msgid "Only list tags whose commits are reachable from the specified commit (`HEAD` if not specified), incompatible with `--no-merged`."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:150
+#: en/git-tag.txt:157
#, priority:240
msgid "Only list tags whose commits are not reachable from the specified commit (`HEAD` if not specified), incompatible with `--merged`."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:154
+#: en/git-tag.txt:161
#, priority:240
msgid "Only list tags of the given object (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:162
+#: en/git-tag.txt:169
#, priority:240
msgid "Use the given tag message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Implies `-a` if none of `-a`, `-s`, or `-u <keyid>` is given."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:169
+#: en/git-tag.txt:176
#, priority:240
msgid "Take the tag message from the given file. Use '-' to read the message from the standard input. Implies `-a` if none of `-a`, `-s`, or `-u <keyid>` is given."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:175
+#: en/git-tag.txt:182
#, priority:240
msgid "The message taken from file with `-F` and command line with `-m` are usually used as the tag message unmodified. This option lets you further edit the message taken from these sources."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:182
+#: en/git-tag.txt:189
#, priority:240
msgid "This option sets how the tag message is cleaned up. The '<mode>' can be one of 'verbatim', 'whitespace' and 'strip'. The 'strip' mode is default. The 'verbatim' mode does not change message at all, 'whitespace' removes just leading/trailing whitespace lines and 'strip' removes both whitespace and commentary."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:189
+#: en/git-tag.txt:196
#, priority:240
msgid "Create a reflog for the tag. To globally enable reflogs for tags, see `core.logAllRefUpdates` in linkgit:git-config[1]. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:195
+#: en/git-tag.txt:202
#, priority:240
msgid "A string that interpolates `%(fieldname)` from a tag ref being shown and the object it points at. The format is the same as that of linkgit:git-for-each-ref[1]. When unspecified, defaults to `%(refname:strip=2)`."
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:196
+#: en/git-tag.txt:203
#, no-wrap, priority:240
msgid "<tagname>"
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:201
+#: en/git-tag.txt:208
#, priority:240
msgid "The name of the tag to create, delete, or describe. The new tag name must pass all checks defined by linkgit:git-check-ref-format[1]. Some of these checks may restrict the characters allowed in a tag name."
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:202 en/git.txt:312
+#: en/git-tag.txt:209 en/git.txt:334
#, no-wrap, priority:240
msgid "<commit>"
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:206
+#: en/git-tag.txt:213
#, priority:240
msgid "The object that the new tag will refer to, usually a commit. Defaults to HEAD."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:213
+#: en/git-tag.txt:220
#, priority:240
msgid "By default, 'git tag' in sign-with-default mode (-s) will use your committer identity (of the form `Your Name <your@email.address>`) to find a key. If you want to use a different default key, you can specify it in the repository configuration as follows:"
msgstr ""
#. type: delimited block -
-#: en/git-tag.txt:217
+#: en/git-tag.txt:224
#, no-wrap, priority:240
msgid ""
"[user]\n"
@@ -49460,61 +50958,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:222
+#: en/git-tag.txt:229
#, priority:240
msgid "`pager.tag` is only respected when listing tags, i.e., when `-l` is used or implied. The default is to use a pager. See linkgit:git-config[1]."
msgstr ""
#. type: Title ~
-#: en/git-tag.txt:227
+#: en/git-tag.txt:234
#, no-wrap, priority:240
msgid "On Re-tagging"
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:231
+#: en/git-tag.txt:238
#, priority:240
msgid "What should you do when you tag a wrong commit and you would want to re-tag?"
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:234
+#: en/git-tag.txt:241
#, priority:240
msgid "If you never pushed anything out, just re-tag it. Use \"-f\" to replace the old one. And you're done."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:238
+#: en/git-tag.txt:245
#, priority:240
msgid "But if you have pushed things out (or others could just read your repository directly), then others will have already seen the old tag. In that case you can do one of two things:"
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:245
+#: en/git-tag.txt:252
#, priority:240
msgid "The sane thing. Just admit you screwed up, and use a different name. Others have already seen one tag-name, and if you keep the same name, you may be in the situation that two people both have \"version X\", but they actually have 'different' \"X\"'s. So just call it \"X.1\" and be done with it."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:250
+#: en/git-tag.txt:257
#, priority:240
msgid "The insane thing. You really want to call the new version \"X\" too, 'even though' others have already seen the old one. So just use 'git tag -f' again, as if you hadn't already published the old one."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:255
+#: en/git-tag.txt:262
#, priority:240
msgid "However, Git does *not* (and it should not) change tags behind users back. So if somebody already got the old tag, doing a 'git pull' on your tree shouldn't just make them overwrite the old one."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:262
+#: en/git-tag.txt:269
#, priority:240
msgid "If somebody got a release tag from you, you cannot just change the tag for them by updating your own one. This is a big security issue, in that people MUST be able to trust their tag-names. If you really want to do the insane thing, you need to just fess up to it, and tell people that you messed up. You can do that by making a very public announcement saying:"
msgstr ""
#. type: delimited block -
-#: en/git-tag.txt:266
+#: en/git-tag.txt:273
#, no-wrap, priority:240
msgid ""
"Ok, I messed up, and I pushed out an earlier version tagged as X. I\n"
@@ -49522,7 +51020,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-tag.txt:269
+#: en/git-tag.txt:276
#, no-wrap, priority:240
msgid ""
"If you got the wrong tag, and want the new one, please delete\n"
@@ -49530,7 +51028,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-tag.txt:272
+#: en/git-tag.txt:279
#, no-wrap, priority:240
msgid ""
"\tgit tag -d X\n"
@@ -49538,145 +51036,145 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-tag.txt:274
+#: en/git-tag.txt:281
#, no-wrap, priority:240
msgid "to get my updated tag.\n"
msgstr ""
#. type: delimited block -
-#: en/git-tag.txt:276
+#: en/git-tag.txt:283
#, no-wrap, priority:240
msgid "You can test which tag you have by doing\n"
msgstr ""
#. type: delimited block -
-#: en/git-tag.txt:278
+#: en/git-tag.txt:285
#, no-wrap, priority:240
msgid "\tgit rev-parse X\n"
msgstr ""
#. type: delimited block -
-#: en/git-tag.txt:280
+#: en/git-tag.txt:287
#, no-wrap, priority:240
msgid "which should return 0123456789abcdef.. if you have the new version.\n"
msgstr ""
#. type: delimited block -
-#: en/git-tag.txt:282
+#: en/git-tag.txt:289
#, no-wrap, priority:240
msgid "Sorry for the inconvenience.\n"
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:287
+#: en/git-tag.txt:294
#, priority:240
msgid "Does this seem a bit complicated? It *should* be. There is no way that it would be correct to just \"fix\" it automatically. People need to know that their tags might have been changed."
msgstr ""
#. type: Title ~
-#: en/git-tag.txt:290
+#: en/git-tag.txt:297
#, no-wrap, priority:240
msgid "On Automatic following"
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:295
+#: en/git-tag.txt:302
#, priority:240
msgid "If you are following somebody else's tree, you are most likely using remote-tracking branches (eg. `refs/remotes/origin/master`). You usually want the tags from the other end."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:302
+#: en/git-tag.txt:309
#, priority:240
msgid "On the other hand, if you are fetching because you would want a one-shot merge from somebody else, you typically do not want to get tags from there. This happens more often for people near the toplevel but not limited to them. Mere mortals when pulling from each other do not necessarily want to automatically get private anchor point tags from the other person."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:307
+#: en/git-tag.txt:314
#, priority:240
msgid "Often, \"please pull\" messages on the mailing list just provide two pieces of information: a repo URL and a branch name; this is designed to be easily cut&pasted at the end of a 'git fetch' command line:"
msgstr ""
#. type: delimited block -
-#: en/git-tag.txt:310
+#: en/git-tag.txt:317
#, no-wrap, priority:240
msgid "Linus, please pull from\n"
msgstr ""
#. type: delimited block -
-#: en/git-tag.txt:312
+#: en/git-tag.txt:319
#, ignore-ellipsis, no-wrap, priority:240
msgid "\tgit://git..../proj.git master\n"
msgstr ""
#. type: delimited block -
-#: en/git-tag.txt:314
+#: en/git-tag.txt:321
#, ignore-ellipsis, no-wrap, priority:240
msgid "to get the following updates...\n"
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:317
+#: en/git-tag.txt:324
#, priority:240
msgid "becomes:"
msgstr ""
#. type: delimited block -
-#: en/git-tag.txt:320
+#: en/git-tag.txt:327
#, ignore-ellipsis, no-wrap, priority:240
msgid "$ git pull git://git..../proj.git master\n"
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:324
+#: en/git-tag.txt:331
#, priority:240
msgid "In such a case, you do not want to automatically follow the other person's tags."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:332
+#: en/git-tag.txt:339
#, priority:240
msgid "One important aspect of Git is its distributed nature, which largely means there is no inherent \"upstream\" or \"downstream\" in the system. On the face of it, the above example might seem to indicate that the tag namespace is owned by the upper echelon of people and that tags only flow downwards, but that is not the case. It only shows that the usage pattern determines who are interested in whose tags."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:344
+#: en/git-tag.txt:351
#, priority:240
msgid "A one-shot pull is a sign that a commit history is now crossing the boundary between one circle of people (e.g. \"people who are primarily interested in the networking part of the kernel\") who may have their own set of tags (e.g. \"this is the third release candidate from the networking group to be proposed for general consumption with 2.6.21 release\") to another circle of people (e.g. \"people who integrate various subsystem improvements\"). The latter are usually not interested in the detailed tags used internally in the former group (that is what \"internal\" means). That is why it is desirable not to follow tags automatically in this case."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:350
+#: en/git-tag.txt:357
#, priority:240
msgid "It may well be that among networking people, they may want to exchange the tags internal to their group, but in that workflow they are most likely tracking each other's progress by having remote-tracking branches. Again, the heuristic to automatically follow such tags is a good thing."
msgstr ""
#. type: Title ~
-#: en/git-tag.txt:353
+#: en/git-tag.txt:360
#, no-wrap, priority:240
msgid "On Backdating Tags"
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:360
+#: en/git-tag.txt:367
#, priority:240
msgid "If you have imported some changes from another VCS and would like to add tags for major releases of your work, it is useful to be able to specify the date to embed inside of the tag object; such data in the tag object affects, for example, the ordering of tags in the gitweb interface."
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:364
+#: en/git-tag.txt:371
#, priority:240
msgid "To set the date used in future tag objects, set the environment variable GIT_COMMITTER_DATE (see the later discussion of possible values; the most common form is \"YYYY-MM-DD HH:MM\")."
msgstr ""
#. type: delimited block -
-#: en/git-tag.txt:369
+#: en/git-tag.txt:376
#, no-wrap, priority:240
msgid "$ GIT_COMMITTER_DATE=\"2006-10-02 10:31\" git tag -s v1.0.1\n"
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:377
+#: en/git-tag.txt:384
#, priority:240
msgid "linkgit:git-check-ref-format[1]. linkgit:git-config[1]."
msgstr ""
@@ -49724,49 +51222,49 @@ msgid "After you mastered the basic concepts, you can come back to this page to
msgstr ""
#. type: Plain text
-#: en/git.txt:37
+#: en/git.txt:38
#, priority:100
-msgid "A formatted and hyperlinked copy of the latest Git documentation can be viewed at `https://git.github.io/htmldocs/git.html`."
+msgid "A formatted and hyperlinked copy of the latest Git documentation can be viewed at https://git.github.io/htmldocs/git.html or https://git-scm.com/docs."
msgstr ""
#. type: Plain text
-#: en/git.txt:43
+#: en/git.txt:44
#, priority:100
msgid "Prints the Git suite version that the 'git' program came from."
msgstr ""
#. type: Plain text
-#: en/git.txt:49
+#: en/git.txt:50
#, priority:100
msgid "Prints the synopsis and a list of the most commonly used commands. If the option `--all` or `-a` is given then all available commands are printed. If a Git command is named this option will bring up the manual page for that command."
msgstr ""
#. type: Plain text
-#: en/git.txt:54
+#: en/git.txt:55
#, ignore-ellipsis, priority:100
msgid "Other options are available to control how the manual page is displayed. See linkgit:git-help[1] for more information, because `git --help ...` is converted internally into `git help ...`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:55
+#: en/git.txt:56
#, no-wrap, priority:100
msgid "-C <path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:60
+#: en/git.txt:62
#, priority:100
-msgid "Run as if git was started in '<path>' instead of the current working directory. When multiple `-C` options are given, each subsequent non-absolute `-C <path>` is interpreted relative to the preceding `-C <path>`."
+msgid "Run as if git was started in '<path>' instead of the current working directory. When multiple `-C` options are given, each subsequent non-absolute `-C <path>` is interpreted relative to the preceding `-C <path>`. If '<path>' is present but empty, e.g. `-C \"\"`, then the current working directory is left unchanged."
msgstr ""
#. type: Plain text
-#: en/git.txt:65
+#: en/git.txt:67
#, priority:100
msgid "This option affects options that expect path name like `--git-dir` and `--work-tree` in that their interpretations of the path names would be made relative to the working directory caused by the `-C` option. For example the following invocations are equivalent:"
msgstr ""
#. type: Plain text
-#: en/git.txt:68
+#: en/git.txt:70
#, no-wrap, priority:100
msgid ""
" git --git-dir=a.git --work-tree=b -C c status\n"
@@ -49774,373 +51272,409 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:69
+#: en/git.txt:71
#, no-wrap, priority:100
msgid "-c <name>=<value>"
msgstr ""
#. type: Plain text
-#: en/git.txt:74
+#: en/git.txt:76
#, priority:100
msgid "Pass a configuration parameter to the command. The value given will override values from configuration files. The <name> is expected in the same format as listed by 'git config' (subkeys separated by dots)."
msgstr ""
#. type: Plain text
-#: en/git.txt:80
+#: en/git.txt:82
#, ignore-ellipsis, priority:100
msgid "Note that omitting the `=` in `git -c foo.bar ...` is allowed and sets `foo.bar` to the boolean true value (just like `[foo]bar` would in a config file). Including the equals but with an empty value (like `git -c foo.bar= ...`) sets `foo.bar` to the empty string which `git config --type=bool` will convert to `false`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:81
+#: en/git.txt:83
#, no-wrap, priority:100
msgid "--exec-path[=<path>]"
msgstr ""
#. type: Plain text
-#: en/git.txt:86
+#: en/git.txt:88
#, priority:100
msgid "Path to wherever your core Git programs are installed. This can also be controlled by setting the GIT_EXEC_PATH environment variable. If no path is given, 'git' will print the current setting and then exit."
msgstr ""
#. type: Labeled list
-#: en/git.txt:87
+#: en/git.txt:89
#, ignore-same, no-wrap, priority:100
msgid "--html-path"
msgstr "--html-path"
#. type: Plain text
-#: en/git.txt:90
+#: en/git.txt:92
#, priority:100
msgid "Print the path, without trailing slash, where Git's HTML documentation is installed and exit."
msgstr ""
#. type: Labeled list
-#: en/git.txt:91
+#: en/git.txt:93
#, ignore-same, no-wrap, priority:100
msgid "--man-path"
msgstr "--man-path"
#. type: Plain text
-#: en/git.txt:94
+#: en/git.txt:96
#, priority:100
msgid "Print the manpath (see `man(1)`) for the man pages for this version of Git and exit."
msgstr ""
#. type: Labeled list
-#: en/git.txt:95
+#: en/git.txt:97
#, ignore-same, no-wrap, priority:100
msgid "--info-path"
msgstr "--info-path"
#. type: Plain text
-#: en/git.txt:98
+#: en/git.txt:100
#, priority:100
msgid "Print the path where the Info files documenting this version of Git are installed and exit."
msgstr ""
#. type: Labeled list
-#: en/git.txt:100
+#: en/git.txt:102
#, ignore-same, no-wrap, priority:100
msgid "--paginate"
msgstr "--paginate"
#. type: Plain text
-#: en/git.txt:105
+#: en/git.txt:107
#, priority:100
msgid "Pipe all output into 'less' (or if set, $PAGER) if standard output is a terminal. This overrides the `pager.<cmd>` configuration options (see the \"Configuration Mechanism\" section below)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:107
+#: en/git.txt:109
#, ignore-same, no-wrap, priority:100
msgid "--no-pager"
msgstr "--no-pager"
#. type: Plain text
-#: en/git.txt:109
+#: en/git.txt:111
#, priority:100
msgid "Do not pipe Git output into a pager."
msgstr ""
#. type: Labeled list
-#: en/git.txt:110
+#: en/git.txt:112
#, no-wrap, priority:100
msgid "--git-dir=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:114
+#: en/git.txt:116
#, priority:100
msgid "Set the path to the repository. This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
msgstr ""
#. type: Labeled list
-#: en/git.txt:115
+#: en/git.txt:117
#, no-wrap, priority:100
msgid "--work-tree=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:122
+#: en/git.txt:124
#, priority:100
msgid "Set the path to the working tree. It can be an absolute path or a path relative to the current working directory. This can also be controlled by setting the GIT_WORK_TREE environment variable and the core.worktree configuration variable (see core.worktree in linkgit:git-config[1] for a more detailed discussion)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:123
+#: en/git.txt:125
#, no-wrap, priority:100
msgid "--namespace=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:127
+#: en/git.txt:129
#, priority:100
msgid "Set the Git namespace. See linkgit:gitnamespaces[7] for more details. Equivalent to setting the `GIT_NAMESPACE` environment variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:128
+#: en/git.txt:130
#, no-wrap, priority:100
msgid "--super-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:132
+#: en/git.txt:134
#, priority:100
msgid "Currently for internal use only. Set a prefix which gives a path from above a repository down to its root. One use is to give submodules context about the superproject that invoked it."
msgstr ""
#. type: Plain text
-#: en/git.txt:137
+#: en/git.txt:139
#, priority:100
msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git.txt:138
+#: en/git.txt:140
#, ignore-same, no-wrap, priority:100
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
#. type: Plain text
-#: en/git.txt:141
+#: en/git.txt:143
#, priority:100
msgid "Do not use replacement refs to replace Git objects. See linkgit:git-replace[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:142
+#: en/git.txt:144
#, ignore-same, no-wrap, priority:100
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
#. type: Plain text
-#: en/git.txt:146
+#: en/git.txt:148
#, priority:100
msgid "Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:147
+#: en/git.txt:149
#, ignore-same, no-wrap, priority:100
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
#. type: Plain text
-#: en/git.txt:152
+#: en/git.txt:154
#, priority:100
msgid "Add \"glob\" magic to all pathspec. This is equivalent to setting the `GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on individual pathspecs can be done using pathspec magic \":(literal)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:153
+#: en/git.txt:155
#, ignore-same, no-wrap, priority:100
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
#. type: Plain text
-#: en/git.txt:158
+#: en/git.txt:160
#, priority:100
msgid "Add \"literal\" magic to all pathspec. This is equivalent to setting the `GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on individual pathspecs can be done using pathspec magic \":(glob)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:159
+#: en/git.txt:161
#, ignore-same, no-wrap, priority:100
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
#. type: Plain text
-#: en/git.txt:162
+#: en/git.txt:164
#, priority:100
msgid "Add \"icase\" magic to all pathspec. This is equivalent to setting the `GIT_ICASE_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:163
+#: en/git.txt:165
#, ignore-same, no-wrap, priority:100
msgid "--no-optional-locks"
msgstr "--no-optional-locks"
#. type: Plain text
-#: en/git.txt:166
+#: en/git.txt:168
#, priority:100
msgid "Do not perform optional operations that require locks. This is equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:167
+#: en/git.txt:169
#, ignore-ellipsis, no-wrap, priority:100
msgid "--list-cmds=group[,group...]"
msgstr ""
#. type: Plain text
-#: en/git.txt:176
+#: en/git.txt:178
#, priority:100
msgid "List commands by group. This is an internal/experimental option and may change or be removed in the future. Supported groups are: builtins, parseopt (builtin commands that use parse-options), main (all commands in libexec directory), others (all other commands in `$PATH` that have git- prefix), list-<category> (see categories in command-list.txt), nohelpers (exclude helper commands), alias and config (retrieve command list from config variable completion.commands)"
msgstr ""
#. type: Title -
-#: en/git.txt:178
+#: en/git.txt:180
#, no-wrap, priority:100
msgid "GIT COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git.txt:182
+#: en/git.txt:184
#, priority:100
msgid "We divide Git into high level (\"porcelain\") commands and low level (\"plumbing\") commands."
msgstr ""
#. type: Title -
-#: en/git.txt:184
+#: en/git.txt:186
#, no-wrap, priority:100
msgid "High-level commands (porcelain)"
msgstr ""
#. type: Plain text
-#: en/git.txt:188
+#: en/git.txt:190
#, priority:100
msgid "We separate the porcelain commands into the main commands and some ancillary user utilities."
msgstr ""
#. type: Title ~
-#: en/git.txt:190
+#: en/git.txt:192
#, no-wrap, priority:100
msgid "Main porcelain commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:195
+#: en/git.txt:197
#, no-wrap, priority:100
msgid "Ancillary Commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:197
+#: en/git.txt:199
#, priority:100
msgid "Manipulators:"
msgstr ""
#. type: Plain text
-#: en/git.txt:201
+#: en/git.txt:203
#, priority:100
msgid "Interrogators:"
msgstr ""
#. type: Title ~
-#: en/git.txt:206
+#: en/git.txt:208
#, no-wrap, priority:100
msgid "Interacting with Others"
msgstr ""
#. type: Plain text
-#: en/git.txt:210
+#: en/git.txt:212
#, priority:100
msgid "These commands are to interact with foreign SCM and with other people via patch over e-mail."
msgstr ""
+#. type: Title ~
+#: en/git.txt:216
+#, no-wrap, priority:100
+msgid "Reset, restore and revert"
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:219
+#, priority:100
+msgid "There are three commands with similar names: `git reset`, `git restore` and `git revert`."
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:222
+#, priority:100
+msgid "linkgit:git-revert[1] is about making a new commit that reverts the changes made by other commits."
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:227
+#, priority:100
+msgid "linkgit:git-restore[1] is about restoring files in the working tree from either the index or another commit. This command does not update your branch. The command can also be used to restore files in the index from another commit."
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:231
+#, priority:100
+msgid "linkgit:git-reset[1] is about updating your branch, moving the tip in order to add or remove commits from the branch. This operation changes the commit history."
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:234
+#, priority:100
+msgid "`git reset` can also be used to restore the index, overlapping with `git restore`."
+msgstr ""
+
#. type: Title -
-#: en/git.txt:215
+#: en/git.txt:237
#, no-wrap, priority:100
msgid "Low-level commands (plumbing)"
msgstr ""
#. type: Plain text
-#: en/git.txt:222
+#: en/git.txt:244
#, priority:100
msgid "Although Git includes its own porcelain layer, its low-level commands are sufficient to support development of alternative porcelains. Developers of such porcelains might start by reading about linkgit:git-update-index[1] and linkgit:git-read-tree[1]."
msgstr ""
#. type: Plain text
-#: en/git.txt:229
+#: en/git.txt:251
#, priority:100
msgid "The interface (input, output, set of options and the semantics) to these low-level commands are meant to be a lot more stable than Porcelain level commands, because these commands are primarily for scripted use. The interface to Porcelain commands on the other hand are subject to change in order to improve the end user experience."
msgstr ""
#. type: Plain text
-#: en/git.txt:235
+#: en/git.txt:257
#, priority:100
msgid "The following description divides the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between repositories."
msgstr ""
#. type: Title ~
-#: en/git.txt:238
+#: en/git.txt:260
#, no-wrap, priority:100
msgid "Manipulation commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:244
+#: en/git.txt:266
#, no-wrap, priority:100
msgid "Interrogation commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:250
+#: en/git.txt:272
#, priority:100
msgid "In general, the interrogate commands do not touch the files in the working tree."
msgstr ""
#. type: Title ~
-#: en/git.txt:253
+#: en/git.txt:275
#, no-wrap, priority:100
msgid "Synching repositories"
msgstr ""
#. type: Plain text
-#: en/git.txt:259
+#: en/git.txt:281
#, priority:100
msgid "The following are helper commands used by the above; end users typically do not use them directly."
msgstr ""
#. type: Title ~
-#: en/git.txt:264
+#: en/git.txt:286
#, no-wrap, priority:100
msgid "Internal helper commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:268
+#: en/git.txt:290
#, priority:100
msgid "These are internal helper commands used by other commands; end users typically do not use them directly."
msgstr ""
#. type: Title -
-#: en/git.txt:273
+#: en/git.txt:295
#, no-wrap, priority:100
msgid "Configuration Mechanism"
msgstr ""
#. type: Plain text
-#: en/git.txt:278
+#: en/git.txt:300
#, priority:100
msgid "Git uses a simple text format to store customizations that are per repository and are per user. Such a configuration file may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git.txt:283
+#: en/git.txt:305
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -50149,17 +51683,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git.txt:288
-#, 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/git.txt:293
+#: en/git.txt:315
#, no-wrap, priority:100
msgid ""
"; user identity\n"
@@ -50169,601 +51693,601 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:299
+#: en/git.txt:321
#, priority:100
msgid "Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a list and more details about the configuration mechanism."
msgstr ""
#. type: Title -
-#: en/git.txt:302
+#: en/git.txt:324
#, no-wrap, priority:100
msgid "Identifier Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:305
+#: en/git.txt:327
#, priority:100
msgid "Indicates the object name for any type of object."
msgstr ""
#. type: Labeled list
-#: en/git.txt:306 en/git-unpack-file.txt:23
+#: en/git.txt:328 en/git-unpack-file.txt:23
#, no-wrap, priority:100
msgid "<blob>"
msgstr ""
#. type: Plain text
-#: en/git.txt:308
+#: en/git.txt:330
#, priority:100
msgid "Indicates a blob object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:311
+#: en/git.txt:333
#, priority:100
msgid "Indicates a tree object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:314
+#: en/git.txt:336
#, priority:100
msgid "Indicates a commit object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:320
+#: en/git.txt:342
#, priority:100
msgid "Indicates a tree, commit or tag object name. A command that takes a <tree-ish> argument ultimately wants to operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>."
msgstr ""
#. type: Labeled list
-#: en/git.txt:321
+#: en/git.txt:343
#, no-wrap, priority:100
msgid "<commit-ish>"
msgstr ""
#. type: Plain text
-#: en/git.txt:326
+#: en/git.txt:348
#, priority:100
msgid "Indicates a commit or tag object name. A command that takes a <commit-ish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>."
msgstr ""
#. type: Plain text
-#: en/git.txt:330
+#: en/git.txt:352
#, priority:100
msgid "Indicates that an object type is required. Currently one of: `blob`, `tree`, `commit`, or `tag`."
msgstr ""
#. type: Plain text
-#: en/git.txt:334
+#: en/git.txt:356
#, priority:100
msgid "Indicates a filename - almost always relative to the root of the tree structure `GIT_INDEX_FILE` describes."
msgstr ""
#. type: Title -
-#: en/git.txt:336
+#: en/git.txt:358
#, no-wrap, priority:100
msgid "Symbolic Identifiers"
msgstr ""
#. type: Plain text
-#: en/git.txt:339
+#: en/git.txt:361
#, priority:100
msgid "Any Git command accepting any <object> can also use the following symbolic notation:"
msgstr ""
#. type: Plain text
-#: en/git.txt:342
+#: en/git.txt:364
#, priority:100
msgid "indicates the head of the current branch."
msgstr ""
#. type: Labeled list
-#: en/git.txt:343
+#: en/git.txt:365
#, no-wrap, priority:100
msgid "<tag>"
msgstr ""
#. type: Plain text
-#: en/git.txt:346
+#: en/git.txt:368
#, priority:100
msgid "a valid tag 'name' (i.e. a `refs/tags/<tag>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:350
+#: en/git.txt:372
#, priority:100
msgid "a valid head 'name' (i.e. a `refs/heads/<head>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:353
+#: en/git.txt:375
#, priority:100
msgid "For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:356
+#: en/git.txt:378
#, no-wrap, priority:100
msgid "File/Directory Structure"
msgstr ""
#. type: Plain text
-#: en/git.txt:359
+#: en/git.txt:381
#, priority:100
msgid "Please see the linkgit:gitrepository-layout[5] document."
msgstr ""
#. type: Plain text
-#: en/git.txt:361
+#: en/git.txt:383
#, priority:100
msgid "Read linkgit:githooks[5] for more details about each hook."
msgstr ""
#. type: Plain text
-#: en/git.txt:364
+#: en/git.txt:386
#, priority:100
msgid "Higher level SCMs may provide and manage additional information in the `$GIT_DIR`."
msgstr ""
#. type: Title -
-#: en/git.txt:367
+#: en/git.txt:389
#, no-wrap, priority:100
msgid "Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:369
+#: en/git.txt:391
#, priority:100
msgid "Please see linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:374
+#: en/git.txt:396
#, priority:100
msgid "Various Git commands use the following environment variables:"
msgstr ""
#. type: Title ~
-#: en/git.txt:376
+#: en/git.txt:398
#, no-wrap, priority:100
msgid "The Git Repository"
msgstr ""
#. type: Plain text
-#: en/git.txt:380
+#: en/git.txt:402
#, priority:100
msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end."
msgstr ""
#. type: Labeled list
-#: en/git.txt:381
+#: en/git.txt:403
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
#. type: Plain text
-#: en/git.txt:385
+#: en/git.txt:407
#, priority:100
msgid "This environment allows the specification of an alternate index file. If not specified, the default of `$GIT_DIR/index` is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:386
+#: en/git.txt:408
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
#. type: Plain text
-#: en/git.txt:391
+#: en/git.txt:413
#, priority:100
msgid "This environment variable allows the specification of an index version for new repositories. It won't affect existing index files. By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:392
+#: en/git.txt:414
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
#. type: Plain text
-#: en/git.txt:397
+#: en/git.txt:419
#, priority:100
msgid "If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:398
+#: en/git.txt:420
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:404
+#: en/git.txt:426
#, priority:100
msgid "Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a \":\" separated (on Windows \";\" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories."
msgstr ""
#. type: Plain text
-#: en/git.txt:410
+#: en/git.txt:432
#, priority:100
msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:411
+#: en/git.txt:433
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
#. type: Plain text
-#: en/git.txt:416
+#: en/git.txt:438
#, priority:100
msgid "If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository. The `--git-dir` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:417
+#: en/git.txt:439
#, ignore-same, no-wrap, priority:100
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
#. type: Plain text
-#: en/git.txt:421
+#: en/git.txt:443
#, priority:100
msgid "Set the path to the root of the working tree. This can also be controlled by the `--work-tree` command-line option and the core.worktree configuration variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:422
+#: en/git.txt:444
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
#. type: Plain text
-#: en/git.txt:425
+#: en/git.txt:447
#, priority:100
msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:426
+#: en/git.txt:448
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:440
+#: en/git.txt:462
#, priority:100
msgid "This should be a colon-separated list of absolute paths. If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for excluding slow-loading network directories). It will not exclude the current working directory or a GIT_DIR set on the command line or in the environment. Normally, Git has to read the entries in this list and resolve any symlink that might be present in order to compare them with the current directory. However, if even this access is slow, you can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:441
+#: en/git.txt:463
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
#. type: Plain text
-#: en/git.txt:450
+#: en/git.txt:472
#, priority:100
msgid "When run in a directory that does not have \".git\" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries. This environment variable can be set to true to tell Git not to stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will not affect an explicit repository directory set via `GIT_DIR` or on the command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:451
+#: en/git.txt:473
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
#. type: Plain text
-#: en/git.txt:459
+#: en/git.txt:481
#, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr ""
#. type: Title ~
-#: en/git.txt:461
+#: en/git.txt:483
#, no-wrap, priority:100
msgid "Git Commits"
msgstr ""
#. type: Labeled list
-#: en/git.txt:462
+#: en/git.txt:484
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
#. type: Labeled list
-#: en/git.txt:463
+#: en/git.txt:485
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
#. type: Labeled list
-#: en/git.txt:464
+#: en/git.txt:486
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
#. type: Labeled list
-#: en/git.txt:465
+#: en/git.txt:487
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
#. type: Labeled list
-#: en/git.txt:466
+#: en/git.txt:488
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
#. type: Labeled list
-#: en/git.txt:467
+#: en/git.txt:489
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
#. type: Labeled list
-#: en/git.txt:468
+#: en/git.txt:490
#, no-wrap, priority:100
msgid "'EMAIL'"
msgstr ""
#. type: Plain text
-#: en/git.txt:470
+#: en/git.txt:492
#, priority:100
msgid "see linkgit:git-commit-tree[1]"
msgstr ""
#. type: Title ~
-#: en/git.txt:472
+#: en/git.txt:494
#, no-wrap, priority:100
msgid "Git Diffs"
msgstr ""
#. type: Labeled list
-#: en/git.txt:473
+#: en/git.txt:495
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
#. type: Plain text
-#: en/git.txt:478
+#: en/git.txt:500
#, priority:100
msgid "Only valid setting is \"--unified=??\" or \"-u??\" to set the number of context lines shown when a unified diff is created. This takes precedence over any \"-U\" or \"--unified\" option value passed on the Git diff command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:479
+#: en/git.txt:501
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
#. type: Plain text
-#: en/git.txt:484
+#: en/git.txt:506
#, priority:100
msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called, instead of the diff invocation described above. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
msgstr ""
#. type: Plain text
-#: en/git.txt:486
+#: en/git.txt:508
#, priority:100
msgid "path old-file old-hex old-mode new-file new-hex new-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:488
+#: en/git.txt:510
#, priority:100
msgid "where:"
msgstr ""
#. type: Labeled list
-#: en/git.txt:489
+#: en/git.txt:511
#, no-wrap, priority:100
msgid "<old|new>-file"
msgstr ""
#. type: Plain text
-#: en/git.txt:490
+#: en/git.txt:512
#, priority:100
msgid "are files GIT_EXTERNAL_DIFF can use to read the"
msgstr ""
#. type: Plain text
-#: en/git.txt:491
+#: en/git.txt:513
#, no-wrap, priority:100
msgid "contents of <old|new>,\n"
msgstr ""
#. type: Labeled list
-#: en/git.txt:491
+#: en/git.txt:513
#, no-wrap, priority:100
msgid "<old|new>-hex"
msgstr ""
#. type: Plain text
-#: en/git.txt:492
+#: en/git.txt:514
#, priority:100
msgid "are the 40-hexdigit SHA-1 hashes,"
msgstr ""
#. type: Labeled list
-#: en/git.txt:492
+#: en/git.txt:514
#, no-wrap, priority:100
msgid "<old|new>-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:493
+#: en/git.txt:515
#, priority:100
msgid "are the octal representation of the file modes."
msgstr ""
#. type: Plain text
-#: en/git.txt:499
+#: en/git.txt:521
#, priority:100
msgid "The file parameters can point at the user's working file (e.g. `new-file` in \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits."
msgstr ""
#. type: Plain text
-#: en/git.txt:502
+#: en/git.txt:524
#, priority:100
msgid "For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>."
msgstr ""
#. type: Plain text
-#: en/git.txt:505
+#: en/git.txt:527
#, priority:100
msgid "For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, `GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
msgstr ""
#. type: Labeled list
-#: en/git.txt:506
+#: en/git.txt:528
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
#. type: Plain text
-#: en/git.txt:508
+#: en/git.txt:530
#, priority:100
msgid "A 1-based counter incremented by one for every path."
msgstr ""
#. type: Labeled list
-#: en/git.txt:509
+#: en/git.txt:531
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
#. type: Plain text
-#: en/git.txt:511
+#: en/git.txt:533
#, priority:100
msgid "The total number of paths."
msgstr ""
#. type: Labeled list
-#: en/git.txt:514
+#: en/git.txt:536
#, ignore-same, no-wrap, priority:100
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
#. type: Plain text
-#: en/git.txt:518
+#: en/git.txt:540
#, priority:100
msgid "A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
msgstr ""
#. type: Labeled list
-#: en/git.txt:519
+#: en/git.txt:541
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
#. type: Plain text
-#: en/git.txt:524
+#: en/git.txt:546
#, priority:100
msgid "This environment variable overrides `$PAGER`. If it is set to an empty string or to the value \"cat\", Git will not launch a pager. See also the `core.pager` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:525
+#: en/git.txt:547
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
#. type: Plain text
-#: en/git.txt:530
+#: en/git.txt:552
#, priority:100
msgid "This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by several Git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:531
+#: en/git.txt:553
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
-#: en/git.txt:532
+#: en/git.txt:554
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
#. type: Plain text
-#: en/git.txt:539
+#: en/git.txt:561
#, priority:100
msgid "If either of these environment variables is set then 'git fetch' and 'git push' will use the specified command instead of 'ssh' when they need to connect to a remote system. The command-line parameters passed to the configured command are determined by the ssh variant. See `ssh.variant` option in linkgit:git-config[1] for details."
msgstr ""
#. type: Plain text
-#: en/git.txt:546
+#: en/git.txt:567
#, priority:100
msgid "`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by the shell, which allows additional arguments to be included. `$GIT_SSH` on the other hand must be just the path to a program (which can be a wrapper shell script, if additional arguments are needed)."
msgstr ""
#. type: Plain text
-#: en/git.txt:550
+#: en/git.txt:571
#, priority:100
msgid "Usually it is easier to configure any desired options through your personal `.ssh/config` file. Please consult your ssh documentation for further details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:551
+#: en/git.txt:572
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
#. type: Plain text
-#: en/git.txt:556
+#: en/git.txt:577
#, priority:100
msgid "If this environment variable is set, it overrides Git's autodetection whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, plink or tortoiseplink. This variable overrides the config setting `ssh.variant` that serves the same purpose."
msgstr ""
#. type: Labeled list
-#: en/git.txt:557
+#: en/git.txt:578
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
#. type: Plain text
-#: en/git.txt:563
+#: en/git.txt:584
#, priority:100
msgid "If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument and read the password from its STDOUT. See also the `core.askPass` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:564
+#: en/git.txt:585
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
#. type: Plain text
-#: en/git.txt:567
+#: en/git.txt:588
#, priority:100
msgid "If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:568
+#: en/git.txt:589
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
#. type: Plain text
-#: en/git.txt:575
+#: en/git.txt:596
#, priority:100
msgid "Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file. This environment variable can be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for a picky script, or you can set it temporarily to avoid using a buggy `/etc/gitconfig` file while waiting for someone with sufficient permissions to fix it."
msgstr ""
#. type: Labeled list
-#: en/git.txt:576
+#: en/git.txt:597
#, ignore-same, no-wrap, priority:100
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
#. type: Plain text
-#: en/git.txt:586
+#: en/git.txt:607
#, no-wrap, priority:100
msgid ""
"If this environment variable is set to \"1\", then commands such\n"
@@ -50778,469 +52302,523 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:587
+#: en/git.txt:608
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
#. type: Plain text
-#: en/git.txt:590
+#: en/git.txt:611
#, priority:100
msgid "Enables general trace messages, e.g. alias expansion, built-in command execution and external command execution."
msgstr ""
#. type: Plain text
-#: en/git.txt:594
+#: en/git.txt:615 en/git.txt:693
#, priority:100
msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
msgstr ""
#. type: Plain text
-#: en/git.txt:599
+#: en/git.txt:620 en/git.txt:698
#, priority:100
msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
msgstr ""
#. type: Plain text
-#: en/git.txt:604
+#: en/git.txt:625
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it."
msgstr ""
#. type: Plain text
-#: en/git.txt:607
+#: en/git.txt:628 en/git.txt:715
#, priority:100
msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
msgstr ""
#. type: Labeled list
-#: en/git.txt:608
+#: en/git.txt:629
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_FSMONITOR`"
msgstr "`GIT_TRACE_FSMONITOR`"
#. type: Plain text
-#: en/git.txt:611
+#: en/git.txt:632
#, priority:100
msgid "Enables trace messages for the filesystem monitor extension. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:612
+#: en/git.txt:633
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
#. type: Plain text
-#: en/git.txt:618
+#: en/git.txt:639
#, priority:100
msgid "Enables trace messages for all accesses to any packs. For each access, the pack file name and an offset in the pack is recorded. This may be helpful for troubleshooting some pack-related performance problems. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:619
+#: en/git.txt:640
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
#. type: Plain text
-#: en/git.txt:625
+#: en/git.txt:646
#, priority:100
msgid "Enables trace messages for all packets coming in or out of a given program. This can help with debugging object negotiation or other protocol issues. Tracing is turned off at a packet starting with \"PACK\" (but see `GIT_TRACE_PACKFILE` below). See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:626
+#: en/git.txt:647
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
#. type: Plain text
-#: en/git.txt:633
+#: en/git.txt:654
#, priority:100
msgid "Enables tracing of packfiles sent or received by a given program. Unlike other trace output, this trace is verbatim: no headers, and no quoting of binary data. You almost certainly want to direct into a file (e.g., `GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal or mixing it with other trace output."
msgstr ""
#. type: Plain text
-#: en/git.txt:636
+#: en/git.txt:657
#, priority:100
msgid "Note that this is currently only implemented for the client side of clones and fetches."
msgstr ""
#. type: Labeled list
-#: en/git.txt:637
+#: en/git.txt:658
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
#. type: Plain text
-#: en/git.txt:641
+#: en/git.txt:662
#, priority:100
msgid "Enables performance related trace messages, e.g. total execution time of each Git command. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:642
+#: en/git.txt:663
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
#. type: Plain text
-#: en/git.txt:646
+#: en/git.txt:667
#, priority:100
msgid "Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:647
+#: en/git.txt:668
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
#. type: Plain text
-#: en/git.txt:651
+#: en/git.txt:672
#, priority:100
msgid "Enables trace messages that can help debugging fetching / cloning of shallow repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:652
+#: en/git.txt:673
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
#. type: Plain text
-#: en/git.txt:659
+#: en/git.txt:680
#, priority:100
msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. This option overrides setting the `GIT_CURL_VERBOSE` environment variable. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:660
+#: en/git.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr "`GIT_TRACE_CURL_NO_DATA`"
#. type: Plain text
-#: en/git.txt:663
+#: en/git.txt:684
#, priority:100
msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:664
+#: en/git.txt:685
+#, ignore-same, no-wrap, priority:100
+msgid "`GIT_TRACE2`"
+msgstr "`GIT_TRACE2`"
+
+#. type: Plain text
+#: en/git.txt:689
+#, priority:100
+msgid "Enables more detailed trace messages from the \"trace2\" library. Output from `GIT_TRACE2` is a simple text-based format for human readability."
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:707
+#, priority:100
+msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it. If the path already exists and is a directory, the trace messages will be written to files (one per process) in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:712
+#, priority:100
+msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket. The socket type can be either `stream` or `dgram`."
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:718
+#, priority:100
+msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
+msgstr ""
+
+#. type: Labeled list
+#: en/git.txt:720
+#, ignore-same, no-wrap, priority:100
+msgid "`GIT_TRACE2_EVENT`"
+msgstr "`GIT_TRACE2_EVENT`"
+
+#. type: Plain text
+#: en/git.txt:725
+#, priority:100
+msgid "This setting writes a JSON-based format that is suited for machine interpretation. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
+msgstr ""
+
+#. type: Labeled list
+#: en/git.txt:726
+#, ignore-same, no-wrap, priority:100
+msgid "`GIT_TRACE2_PERF`"
+msgstr "`GIT_TRACE2_PERF`"
+
+#. type: Plain text
+#: en/git.txt:732
+#, priority:100
+msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
+msgstr ""
+
+#. type: Labeled list
+#: en/git.txt:733
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDACT_COOKIES`"
msgstr "`GIT_REDACT_COOKIES`"
#. type: Plain text
-#: en/git.txt:669
+#: en/git.txt:738
#, priority:100
msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
msgstr ""
#. type: Labeled list
-#: en/git.txt:670
+#: en/git.txt:739
#, ignore-same, no-wrap, priority:100
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:678
+#: en/git.txt:747
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:679
+#: en/git.txt:748
#, ignore-same, no-wrap, priority:100
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:682
+#: en/git.txt:751
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:683
+#: en/git.txt:752
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:686
+#: en/git.txt:755
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:687
+#: en/git.txt:756
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:690
+#: en/git.txt:759
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
msgstr ""
#. type: Labeled list
-#: en/git.txt:691
+#: en/git.txt:760
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
#. type: Plain text
-#: en/git.txt:700
+#: en/git.txt:769
#, priority:100
msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref. A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
msgstr ""
#. type: Labeled list
-#: en/git.txt:701
+#: en/git.txt:770
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
#. type: Plain text
-#: en/git.txt:711
+#: en/git.txt:780
#, priority:100
msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:712
+#: en/git.txt:781
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:720
+#: en/git.txt:789
#, priority:100
msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:721
+#: en/git.txt:790
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
#. type: Plain text
-#: en/git.txt:727
+#: en/git.txt:796
#, priority:100
msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state. This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands. See linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:728
+#: en/git.txt:797
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL`"
msgstr "`GIT_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:733
+#: en/git.txt:802
#, priority:100
msgid "For internal use only. Used in handshaking the wire protocol. Contains a colon ':' separated list of keys with optional values 'key[=value]'. Presence of unknown keys and values must be ignored."
msgstr ""
#. type: Labeled list
-#: en/git.txt:734
+#: en/git.txt:803
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr "`GIT_OPTIONAL_LOCKS`"
#. type: Plain text
-#: en/git.txt:741
+#: en/git.txt:810
#, priority:100
msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock. For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository. Defaults to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:742
+#: en/git.txt:811
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDIN`"
msgstr "`GIT_REDIRECT_STDIN`"
#. type: Labeled list
-#: en/git.txt:743
+#: en/git.txt:812
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDOUT`"
msgstr "`GIT_REDIRECT_STDOUT`"
#. type: Labeled list
-#: en/git.txt:744
+#: en/git.txt:813
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDERR`"
msgstr "`GIT_REDIRECT_STDERR`"
#. type: Plain text
-#: en/git.txt:754
+#: en/git.txt:823
#, priority:100
msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
msgstr ""
#. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:828
#, priority:100
msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
msgstr ""
#. type: Labeled list
-#: en/git.txt:760
+#: en/git.txt:829
#, no-wrap, priority:100
msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
msgstr ""
#. type: Plain text
-#: en/git.txt:768
+#: en/git.txt:837
#, priority:100
msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value. This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]). Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
msgstr ""
#. type: Title -
-#: en/git.txt:770
+#: en/git.txt:839
#, no-wrap, priority:100
msgid "Discussion[[Discussion]]"
msgstr ""
#. type: Plain text
-#: en/git.txt:775
+#: en/git.txt:844
#, priority:100
msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:782
+#: en/git.txt:851
#, priority:100
msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level. The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
msgstr ""
#. type: Plain text
-#: en/git.txt:787
+#: en/git.txt:856
#, priority:100
msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:792
+#: en/git.txt:861
#, priority:100
msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step. Commits with more than one parent represent merges of independent lines of development."
msgstr ""
#. type: Plain text
-#: en/git.txt:798
+#: en/git.txt:867
#, priority:100
msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this purpose."
msgstr ""
#. type: Plain text
-#: en/git.txt:801
+#: en/git.txt:870
#, priority:100
msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
msgstr ""
#. type: Plain text
-#: en/git.txt:808
+#: en/git.txt:877
#, priority:100
msgid "Named pointers called refs mark interesting points in history. A ref may contain the SHA-1 name of an object or the name of another ref. Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development. SHA-1 names of tags of interest are stored under `ref/tags/`. A special ref named `HEAD` contains the name of the currently checked-out branch."
msgstr ""
#. type: Plain text
-#: en/git.txt:817
+#: en/git.txt:886
#, priority:100
msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes. The blob object represents the contents of the file as of the head of the current branch. The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree. Subsequent changes to the working tree can be found by comparing these attributes. The index may be updated with new content, and new commits may be created from the content stored in the index."
msgstr ""
#. type: Plain text
-#: en/git.txt:821
+#: en/git.txt:890
#, priority:100
msgid "The index is also capable of storing multiple entries (called \"stages\") for a given pathname. These stages are used to hold the various unmerged version of a file when a merge is in progress."
msgstr ""
#. type: Title -
-#: en/git.txt:823
+#: en/git.txt:892
#, no-wrap, priority:100
msgid "FURTHER DOCUMENTATION"
msgstr ""
#. type: Plain text
-#: en/git.txt:828
+#: en/git.txt:897
#, priority:100
msgid "See the references in the \"description\" section to get started using Git. The following is probably more detail than necessary for a first-time user."
msgstr ""
#. type: Plain text
-#: en/git.txt:832
+#: en/git.txt:901
#, priority:100
msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
msgstr ""
#. type: Plain text
-#: en/git.txt:834
+#: en/git.txt:903
#, priority:100
msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
msgstr ""
#. type: Plain text
-#: en/git.txt:837
+#: en/git.txt:906
#, priority:100
msgid "See also the link:howto-index.html[howto] documents for some useful examples."
msgstr ""
#. type: Plain text
-#: en/git.txt:840
+#: en/git.txt:909
#, priority:100
msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
msgstr ""
#. type: Plain text
-#: en/git.txt:843
+#: en/git.txt:912
#, priority:100
msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:846
+#: en/git.txt:915
#, no-wrap, priority:100
msgid "Authors"
msgstr ""
#. type: Plain text
-#: en/git.txt:851
+#: en/git.txt:920
#, priority:100
msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
msgstr ""
#. type: Plain text
-#: en/git.txt:855
+#: en/git.txt:924
#, priority:100
msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
msgstr ""
#. type: Title -
-#: en/git.txt:857
+#: en/git.txt:926
#, no-wrap, priority:100
msgid "Reporting Bugs"
msgstr ""
#. type: Plain text
-#: en/git.txt:864
+#: en/git.txt:933
#, priority:100
msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done. You do not have to be subscribed to the list to send a message there. See the list archive at https://public-inbox.org/git for previous bug reports and other discussions."
msgstr ""
#. type: Plain text
-#: en/git.txt:867
+#: en/git.txt:936
#, priority:100
msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
msgstr ""
#. type: Plain text
-#: en/git.txt:875
+#: en/git.txt:944
#, priority:100
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
msgstr ""
@@ -52470,9 +54048,10 @@ msgstr ""
#. type: Plain text
#: en/git-update-server-info.txt:13
-#, no-wrap, priority:100
-msgid "'git update-server-info' [--force]\n"
-msgstr ""
+#, fuzzy, no-wrap, priority:100
+#| msgid "git-update-server-info(1)"
+msgid "'git update-server-info'\n"
+msgstr "git-update-server-info(1)"
#. type: Plain text
#: en/git-update-server-info.txt:21
@@ -52481,25 +54060,19 @@ msgid "A dumb server that does not do on-the-fly pack generations must have some
msgstr ""
#. type: Plain text
-#: en/git-update-server-info.txt:29
-#, priority:100
-msgid "Update the info files from scratch."
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-server-info.txt:37
+#: en/git-update-server-info.txt:28
#, priority:100
msgid "Currently the command updates the following files. Please see linkgit:gitrepository-layout[5] for description of what they are for:"
msgstr ""
#. type: Plain text
-#: en/git-update-server-info.txt:39
+#: en/git-update-server-info.txt:30
#, priority:100
msgid "objects/info/packs"
msgstr ""
#. type: Plain text
-#: en/git-update-server-info.txt:41
+#: en/git-update-server-info.txt:32
#, priority:100
msgid "info/refs"
msgstr ""
@@ -53189,7 +54762,7 @@ msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:97
#, priority:100
-msgid "For consistency, we also try such a trick if 'browser.konqueror.path' is set to something like 'A_PATH_TO/konqueror'. That means we will try to launch 'A_PATH_TO/kfmclient' instead."
+msgid "For consistency, we also try such a trick if 'browser.konqueror.path' is set to something like `A_PATH_TO/konqueror`. That means we will try to launch `A_PATH_TO/kfmclient` instead."
msgstr ""
#. type: delimited block -
@@ -53590,7 +55163,7 @@ msgstr ""
#. type: Plain text
#: en/git-worktree.txt:219
#, priority:240
-msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There are one exception to this: refs inside refs/bisect and refs/worktree is not shared."
+msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared."
msgstr ""
#. type: Plain text
@@ -54117,185 +55690,215 @@ msgstr ""
#. type: Plain text
#: en/merge-options.txt:9
#, priority:240
-msgid "With --no-commit perform the merge but pretend the merge failed and do not autocommit, to give the user a chance to inspect and further tweak the merge result before committing."
+msgid "With --no-commit perform the merge and stop just before creating a merge commit, to give the user a chance to inspect and further tweak the merge result before committing."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:18
+#: en/merge-options.txt:14
#, priority:240
-msgid "Invoke an editor before committing successful mechanical merge to further edit the auto-generated merge message, so that the user can explain and justify the merge. The `--no-edit` option can be used to accept the auto-generated message (this is generally discouraged)."
+msgid "Note that fast-forward updates do not create a merge commit and therefore there is no way to stop those merges with --no-commit. Thus, if you want to ensure your branch is not changed or updated by the merge command, use --no-ff with --no-commit."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:22
+#: en/merge-options.txt:23
#, priority:240
-msgid "The `--edit` (or `-e`) option is still useful if you are giving a draft message with the `-m` option from the command line and want to edit it in the editor."
+msgid "Invoke an editor before committing successful mechanical merge to further edit the auto-generated merge message, so that the user can explain and justify the merge. The `--no-edit` option can be used to accept the auto-generated message (this is generally discouraged)."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:29
+#: en/merge-options.txt:27
#, priority:240
-msgid "Older scripts may depend on the historical behaviour of not allowing the user to edit the merge log message. They will see an editor opened when they run `git merge`. To make it easier to adjust such scripts to the updated behaviour, the environment variable `GIT_MERGE_AUTOEDIT` can be set to `no` at the beginning of them."
+msgid "The `--edit` (or `-e`) option is still useful if you are giving a draft message with the `-m` option from the command line and want to edit it in the editor."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:34
#, priority:240
-msgid "When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. This is the default behavior."
+msgid "Older scripts may depend on the historical behaviour of not allowing the user to edit the merge log message. They will see an editor opened when they run `git merge`. To make it easier to adjust such scripts to the updated behaviour, the environment variable `GIT_MERGE_AUTOEDIT` can be set to `no` at the beginning of them."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:40
+#: en/merge-options.txt:41
#, priority:240
-msgid "Create a merge commit even when the merge resolves as a fast-forward. This is the default behaviour when merging an annotated (and possibly signed) tag that is not stored in its natural place in 'refs/tags/' hierarchy."
+msgid "This option determines how the merge message will be cleaned up before commiting. See linkgit:git-commit[1] for more details. In addition, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on to the commit machinery in the case of a merge conflict."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:41
+#: en/merge-options.txt:44
#, ignore-same, no-wrap, priority:240
msgid "--ff-only"
msgstr "--ff-only"
#. type: Plain text
-#: en/merge-options.txt:45
+#: en/merge-options.txt:50
+#, priority:240
+msgid "Specifies how a merge is handled when the merged-in history is already a descendant of the current history. `--ff` is the default unless merging an annotated (and possibly signed) tag that is not stored in its natural place in the `refs/tags/` hierarchy, in which case `--no-ff` is assumed."
+msgstr ""
+
+#. type: Plain text
+#: en/merge-options.txt:55
+#, priority:240
+msgid "With `--ff`, when possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit."
+msgstr ""
+
+#. type: Plain text
+#: en/merge-options.txt:58
+#, priority:240
+msgid "With `--no-ff`, create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward."
+msgstr ""
+
+#. type: Plain text
+#: en/merge-options.txt:61
#, priority:240
-msgid "Refuse to merge and exit with a non-zero status unless the current `HEAD` is already up to date or the merge can be resolved as a fast-forward."
+msgid "With `--ff-only`, resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:51
+#: en/merge-options.txt:67
#, priority:240
msgid "GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:57
+#: en/merge-options.txt:73
#, priority:240
msgid "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also linkgit:git-fmt-merge-msg[1]."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:60
+#: en/merge-options.txt:76
#, priority:240
msgid "With --no-log do not list one-line descriptions from the actual commits being merged."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:62
+#: en/merge-options.txt:78
#, ignore-same, no-wrap, priority:240
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
-#: en/merge-options.txt:71
+#: en/merge-options.txt:87
#, priority:240
msgid "With --no-signoff do not add a Signed-off-by line."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:77
+#: en/merge-options.txt:93
#, priority:240
msgid "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:80
+#: en/merge-options.txt:96
#, priority:240
msgid "With -n or --no-stat do not show a diffstat at the end of the merge."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:81
+#: en/merge-options.txt:97
#, ignore-same, no-wrap, priority:240
msgid "--squash"
msgstr "--squash"
#. type: Labeled list
-#: en/merge-options.txt:82
+#: en/merge-options.txt:98
#, ignore-same, no-wrap, priority:240
msgid "--no-squash"
msgstr "--no-squash"
#. type: Plain text
-#: en/merge-options.txt:90
+#: en/merge-options.txt:106
#, priority:240
msgid "Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:93
+#: en/merge-options.txt:109
#, priority:240
msgid "With --no-squash perform the merge and commit the result. This option can be used to override --squash."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:101
+#: en/merge-options.txt:111
+#, priority:240
+msgid "With --squash, --commit is not allowed, and will fail."
+msgstr ""
+
+#. type: Plain text
+#: en/merge-options.txt:115
+#, priority:240
+msgid "This option bypasses the pre-merge and commit-msg hooks. See also linkgit:githooks[5]."
+msgstr ""
+
+#. type: Plain text
+#: en/merge-options.txt:123
#, priority:240
msgid "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise)."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:102
+#: en/merge-options.txt:124
#, no-wrap, priority:240
msgid "-X <option>"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:106
+#: en/merge-options.txt:128
#, priority:240
msgid "Pass merge strategy specific option through to the merge strategy."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:107
+#: en/merge-options.txt:129
#, ignore-same, no-wrap, priority:240
msgid "--verify-signatures"
msgstr "--verify-signatures"
#. type: Labeled list
-#: en/merge-options.txt:108
+#: en/merge-options.txt:130
#, ignore-same, no-wrap, priority:240
msgid "--no-verify-signatures"
msgstr "--no-verify-signatures"
#. type: Plain text
-#: en/merge-options.txt:114
+#: en/merge-options.txt:136
#, priority:240
msgid "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:116
+#: en/merge-options.txt:138
#, ignore-same, no-wrap, priority:240
msgid "--no-summary"
msgstr "--no-summary"
#. type: Plain text
-#: en/merge-options.txt:119
+#: en/merge-options.txt:141
#, priority:240
msgid "Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:124
+#: en/merge-options.txt:146
#, priority:240
msgid "Operate quietly. Implies --no-progress."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:135
+#: en/merge-options.txt:157
#, priority:240
msgid "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:138
+#: en/merge-options.txt:160
#, ignore-same, no-wrap, priority:240
msgid "--allow-unrelated-histories"
msgstr "--allow-unrelated-histories"
#. type: Plain text
-#: en/merge-options.txt:144
+#: en/merge-options.txt:166
#, priority:240
msgid "By default, `git merge` command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added."
msgstr ""
@@ -54645,41 +56248,47 @@ msgstr "p4merge"
#. type: Plain text
#: en/mergetools-merge.txt:20
#, ignore-same, priority:240
+msgid "smerge"
+msgstr "smerge"
+
+#. type: Plain text
+#: en/mergetools-merge.txt:21
+#, ignore-same, priority:240
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
-#: en/mergetools-merge.txt:21
+#: en/mergetools-merge.txt:22
#, ignore-same, priority:240
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
-#: en/mergetools-merge.txt:22
+#: en/mergetools-merge.txt:23
#, ignore-same, priority:240
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
-#: en/mergetools-merge.txt:23
+#: en/mergetools-merge.txt:24
#, ignore-same, priority:240
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
-#: en/mergetools-merge.txt:24
+#: en/mergetools-merge.txt:25
#, ignore-same, priority:240
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
-#: en/mergetools-merge.txt:25
+#: en/mergetools-merge.txt:26
#, ignore-same, priority:240
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
-#: en/mergetools-merge.txt:25
+#: en/mergetools-merge.txt:26
#, ignore-same, priority:240
msgid "xxdiff"
msgstr "xxdiff"
@@ -54856,425 +56465,944 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:106
#, priority:260
-msgid "'%H': commit hash"
+msgid "Placeholders that expand to a single literal character:"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:106
+#, ignore-same, no-wrap, priority:260
+msgid "'%n'"
+msgstr "'%n'"
+
#. type: Plain text
#: en/pretty-formats.txt:107
-#, priority:260
-msgid "'%h': abbreviated commit hash"
-msgstr ""
+#, fuzzy, priority:260
+#| msgid "--oneline"
+msgid "newline"
+msgstr "--oneline"
#. type: Plain text
#: en/pretty-formats.txt:108
#, priority:260
-msgid "'%T': tree hash"
+msgid "a raw '%'"
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:108
+#, no-wrap, priority:260
+msgid "'%x00'"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:109
#, priority:260
-msgid "'%t': abbreviated tree hash"
+msgid "print a byte from a hex code"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:110
+#: en/pretty-formats.txt:111
#, priority:260
-msgid "'%P': parent hashes"
+msgid "Placeholders that affect formatting of later placeholders:"
msgstr ""
-#. type: Plain text
+#. type: Labeled list
#: en/pretty-formats.txt:111
+#, ignore-same, no-wrap, priority:260
+msgid "'%Cred'"
+msgstr "'%Cred'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:112
#, priority:260
-msgid "'%p': abbreviated parent hashes"
+msgid "switch color to red"
msgstr ""
-#. type: Plain text
+#. type: Labeled list
#: en/pretty-formats.txt:112
+#, ignore-same, no-wrap, priority:260
+msgid "'%Cgreen'"
+msgstr "'%Cgreen'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:113
#, priority:260
-msgid "'%an': author name"
+msgid "switch color to green"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:113
+#, ignore-same, no-wrap, priority:260
+msgid "'%Cblue'"
+msgstr "'%Cblue'"
+
#. type: Plain text
#: en/pretty-formats.txt:114
#, priority:260
-msgid "'%aN': author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "switch color to blue"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:114
+#, ignore-same, no-wrap, priority:260
+msgid "'%Creset'"
+msgstr "'%Creset'"
+
#. type: Plain text
#: en/pretty-formats.txt:115
+#, fuzzy, priority:260
+#| msgid "color"
+msgid "reset color"
+msgstr "color"
+
+#. type: Labeled list
+#: en/pretty-formats.txt:115
+#, ignore-ellipsis, no-wrap, priority:260
+msgid "'%C(...)'"
+msgstr ""
+
+#. type: Plain text
+#: en/pretty-formats.txt:116
#, priority:260
-msgid "'%ae': author email"
+msgid "color specification, as described under Values in the"
+msgstr ""
+
+#. type: Plain text
+#: en/pretty-formats.txt:129
+#, ignore-ellipsis, priority:260
+msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:129
+#, ignore-same, no-wrap, priority:260
+msgid "'%m'"
+msgstr "'%m'"
+
#. type: Plain text
-#: en/pretty-formats.txt:117
+#: en/pretty-formats.txt:130
#, priority:260
-msgid "'%aE': author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "left (`<`), right (`>`) or boundary (`-`) mark"
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:130
+#, no-wrap, priority:260
+msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:118
+#: en/pretty-formats.txt:131
#, priority:260
-msgid "'%ad': author date (format respects --date= option)"
+msgid "switch line wrapping, like the -w option of"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:119
+#: en/pretty-formats.txt:132
+#, ignore-same, priority:260
+msgid "linkgit:git-shortlog[1]."
+msgstr "linkgit:git-shortlog[1]."
+
+#. type: Labeled list
+#: en/pretty-formats.txt:132
+#, no-wrap, priority:260
+msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
+msgstr ""
+
+#. type: Plain text
+#: en/pretty-formats.txt:133
#, priority:260
-msgid "'%aD': author date, RFC2822 style"
+msgid "make the next placeholder take at"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:120
+#: en/pretty-formats.txt:140
#, priority:260
-msgid "'%ar': author date, relative"
+msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:140
+#, no-wrap, priority:260
+msgid "'%<|(<N>)'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:121
+#: en/pretty-formats.txt:141
#, priority:260
-msgid "'%at': author date, UNIX timestamp"
+msgid "make the next placeholder take at least until Nth"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:122
+#: en/pretty-formats.txt:142
#, priority:260
-msgid "'%ai': author date, ISO 8601-like format"
+msgid "columns, padding spaces on the right if necessary"
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:142
+#, no-wrap, priority:260
+msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:123
+#: en/pretty-formats.txt:143
#, priority:260
-msgid "'%aI': author date, strict ISO 8601 format"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:124
+#: en/pretty-formats.txt:144
#, priority:260
-msgid "'%cn': committer name"
+msgid "but padding spaces on the left"
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:144
+#, no-wrap, priority:260
+msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:126
+#: en/pretty-formats.txt:145
#, priority:260
-msgid "'%cN': committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "similar to '%>(<N>)', '%>|(<N>)'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:127
+#: en/pretty-formats.txt:149
#, priority:260
-msgid "'%ce': committer email"
+msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:149
+#, no-wrap, priority:260
+msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:129
+#: en/pretty-formats.txt:150
#, priority:260
-msgid "'%cE': committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "similar to '%<(<N>)', '%<|(<N>)'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:130
+#: en/pretty-formats.txt:152
#, priority:260
-msgid "'%cd': committer date (format respects --date= option)"
+msgid "respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:131
+#: en/pretty-formats.txt:154
#, priority:260
-msgid "'%cD': committer date, RFC2822 style"
+msgid "Placeholders that expand to information extracted from the commit:"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:154
+#, ignore-same, no-wrap, priority:260
+msgid "'%H'"
+msgstr "'%H'"
+
#. type: Plain text
-#: en/pretty-formats.txt:132
+#: en/pretty-formats.txt:155
+#, fuzzy, priority:260
+#| msgid "`commit`"
+msgid "commit hash"
+msgstr "`commit`"
+
+#. type: Labeled list
+#: en/pretty-formats.txt:155
+#, ignore-same, no-wrap, priority:260
+msgid "'%h'"
+msgstr "'%h'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:156
+#, fuzzy, priority:260
+#| msgid "--abbrev-commit"
+msgid "abbreviated commit hash"
+msgstr "--abbrev-commit"
+
+#. type: Labeled list
+#: en/pretty-formats.txt:156
+#, ignore-same, no-wrap, priority:260
+msgid "'%T'"
+msgstr "'%T'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:157
#, priority:260
-msgid "'%cr': committer date, relative"
+msgid "tree hash"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:157
+#, ignore-same, no-wrap, priority:260
+msgid "'%t'"
+msgstr "'%t'"
+
#. type: Plain text
-#: en/pretty-formats.txt:133
+#: en/pretty-formats.txt:158
#, priority:260
-msgid "'%ct': committer date, UNIX timestamp"
+msgid "abbreviated tree hash"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:158
+#, ignore-same, no-wrap, priority:260
+msgid "'%P'"
+msgstr "'%P'"
+
#. type: Plain text
-#: en/pretty-formats.txt:134
+#: en/pretty-formats.txt:159
+#, fuzzy, priority:260
+#| msgid "--parents"
+msgid "parent hashes"
+msgstr "--parents"
+
+#. type: Labeled list
+#: en/pretty-formats.txt:159
+#, ignore-same, no-wrap, priority:260
+msgid "'%p'"
+msgstr "'%p'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:160
#, priority:260
-msgid "'%ci': committer date, ISO 8601-like format"
+msgid "abbreviated parent hashes"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:160
+#, ignore-same, no-wrap, priority:260
+msgid "'%an'"
+msgstr "'%an'"
+
#. type: Plain text
-#: en/pretty-formats.txt:135
+#: en/pretty-formats.txt:161
+#, fuzzy, priority:260
+#| msgid "`author`"
+msgid "author name"
+msgstr "`author`"
+
+#. type: Labeled list
+#: en/pretty-formats.txt:161
+#, ignore-same, no-wrap, priority:260
+msgid "'%aN'"
+msgstr "'%aN'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:162
#, priority:260
-msgid "'%cI': committer date, strict ISO 8601 format"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:136
+#: en/pretty-formats.txt:163 en/pretty-formats.txt:166
+#, fuzzy, priority:260
+#| msgid "linkgit:git-blame[1]"
+msgid "or linkgit:git-blame[1])"
+msgstr "linkgit:git-blame[1]"
+
+#. type: Labeled list
+#: en/pretty-formats.txt:163
+#, ignore-same, no-wrap, priority:260
+msgid "'%ae'"
+msgstr "'%ae'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:164
+#, fuzzy, priority:260
+#| msgid "`author`"
+msgid "author email"
+msgstr "`author`"
+
+#. type: Labeled list
+#: en/pretty-formats.txt:164
+#, ignore-same, no-wrap, priority:260
+msgid "'%aE'"
+msgstr "'%aE'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:165
#, priority:260
-msgid "'%d': ref names, like the --decorate option of linkgit:git-log[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:166
+#, ignore-same, no-wrap, priority:260
+msgid "'%ad'"
+msgstr "'%ad'"
+
#. type: Plain text
-#: en/pretty-formats.txt:137
+#: en/pretty-formats.txt:167
#, priority:260
-msgid "'%D': ref names without the \" (\", \")\" wrapping."
+msgid "author date (format respects --date= option)"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:167
+#, ignore-same, no-wrap, priority:260
+msgid "'%aD'"
+msgstr "'%aD'"
+
#. type: Plain text
-#: en/pretty-formats.txt:139
+#: en/pretty-formats.txt:168
#, priority:260
-msgid "'%S': ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
+msgid "author date, RFC2822 style"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:168
+#, ignore-same, no-wrap, priority:260
+msgid "'%ar'"
+msgstr "'%ar'"
+
#. type: Plain text
-#: en/pretty-formats.txt:140
+#: en/pretty-formats.txt:169
+#, fuzzy, priority:260
+#| msgid "--author-date-order"
+msgid "author date, relative"
+msgstr "--author-date-order"
+
+#. type: Labeled list
+#: en/pretty-formats.txt:169
+#, ignore-same, no-wrap, priority:260
+msgid "'%at'"
+msgstr "'%at'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:170
#, priority:260
-msgid "'%e': encoding"
+msgid "author date, UNIX timestamp"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:170
+#, ignore-same, no-wrap, priority:260
+msgid "'%ai'"
+msgstr "'%ai'"
+
#. type: Plain text
-#: en/pretty-formats.txt:141
+#: en/pretty-formats.txt:171
#, priority:260
-msgid "'%s': subject"
+msgid "author date, ISO 8601-like format"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:171
+#, ignore-same, no-wrap, priority:260
+msgid "'%aI'"
+msgstr "'%aI'"
+
#. type: Plain text
-#: en/pretty-formats.txt:142
+#: en/pretty-formats.txt:172
#, priority:260
-msgid "'%f': sanitized subject line, suitable for a filename"
+msgid "author date, strict ISO 8601 format"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:172
+#, ignore-same, no-wrap, priority:260
+msgid "'%cn'"
+msgstr "'%cn'"
+
#. type: Plain text
-#: en/pretty-formats.txt:143
+#: en/pretty-formats.txt:173
+#, fuzzy, priority:260
+#| msgid "`committer`"
+msgid "committer name"
+msgstr "`committer`"
+
+#. type: Labeled list
+#: en/pretty-formats.txt:173
+#, ignore-same, no-wrap, priority:260
+msgid "'%cN'"
+msgstr "'%cN'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:174
#, priority:260
-msgid "'%b': body"
+msgid "committer name (respecting .mailmap, see"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:144
+#: en/pretty-formats.txt:175 en/pretty-formats.txt:178 en/pretty-formats.txt:221 en/pretty-formats.txt:224
+#, fuzzy, priority:260
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+
+#. type: Labeled list
+#: en/pretty-formats.txt:175
+#, ignore-same, no-wrap, priority:260
+msgid "'%ce'"
+msgstr "'%ce'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:176
+#, fuzzy, priority:260
+#| msgid "`committer`"
+msgid "committer email"
+msgstr "`committer`"
+
+#. type: Labeled list
+#: en/pretty-formats.txt:176
+#, ignore-same, no-wrap, priority:260
+msgid "'%cE'"
+msgstr "'%cE'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:177
#, priority:260
-msgid "'%B': raw body (unwrapped subject and body)"
+msgid "committer email (respecting .mailmap, see"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:178
+#, ignore-same, no-wrap, priority:260
+msgid "'%cd'"
+msgstr "'%cd'"
+
#. type: Plain text
-#: en/pretty-formats.txt:146
+#: en/pretty-formats.txt:179
#, priority:260
-msgid "'%N': commit notes"
+msgid "committer date (format respects --date= option)"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:179
+#, ignore-same, no-wrap, priority:260
+msgid "'%cD'"
+msgstr "'%cD'"
+
#. type: Plain text
-#: en/pretty-formats.txt:148
+#: en/pretty-formats.txt:180
#, priority:260
-msgid "'%GG': raw verification message from GPG for a signed commit"
+msgid "committer date, RFC2822 style"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:180
+#, ignore-same, no-wrap, priority:260
+msgid "'%cr'"
+msgstr "'%cr'"
+
#. type: Plain text
-#: en/pretty-formats.txt:156
+#: en/pretty-formats.txt:181
+#, fuzzy, priority:260
+#| msgid "--committer-date-is-author-date"
+msgid "committer date, relative"
+msgstr "--committer-date-is-author-date"
+
+#. type: Labeled list
+#: en/pretty-formats.txt:181
+#, ignore-same, no-wrap, priority:260
+msgid "'%ct'"
+msgstr "'%ct'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:182
#, priority:260
-msgid "'%G?': show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "committer date, UNIX timestamp"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:182
+#, ignore-same, no-wrap, priority:260
+msgid "'%ci'"
+msgstr "'%ci'"
+
#. type: Plain text
-#: en/pretty-formats.txt:157
+#: en/pretty-formats.txt:183
#, priority:260
-msgid "'%GS': show the name of the signer for a signed commit"
+msgid "committer date, ISO 8601-like format"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:183
+#, ignore-same, no-wrap, priority:260
+msgid "'%cI'"
+msgstr "'%cI'"
+
#. type: Plain text
-#: en/pretty-formats.txt:158
+#: en/pretty-formats.txt:184
#, priority:260
-msgid "'%GK': show the key used to sign a signed commit"
+msgid "committer date, strict ISO 8601 format"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:184
+#, ignore-same, no-wrap, priority:260
+msgid "'%d'"
+msgstr "'%d'"
+
#. type: Plain text
-#: en/pretty-formats.txt:159
+#: en/pretty-formats.txt:185
#, priority:260
-msgid "'%GF': show the fingerprint of the key used to sign a signed commit"
+msgid "ref names, like the --decorate option of linkgit:git-log[1]"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:185
+#, ignore-same, no-wrap, priority:260
+msgid "'%D'"
+msgstr "'%D'"
+
#. type: Plain text
-#: en/pretty-formats.txt:161
+#: en/pretty-formats.txt:186
#, priority:260
-msgid "'%GP': show the fingerprint of the primary key whose subkey was used to sign a signed commit"
+msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:166
+#: en/pretty-formats.txt:187
#, priority:260
-msgid "'%gD': reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago`}; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "ref name given on the command line by which the commit was reached"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:169
+#: en/pretty-formats.txt:188
#, priority:260
-msgid "'%gd': shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "(like `git log --source`), only works with `git log`"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:188
+#, ignore-same, no-wrap, priority:260
+msgid "'%e'"
+msgstr "'%e'"
+
#. type: Plain text
-#: en/pretty-formats.txt:170
+#: en/pretty-formats.txt:189
#, priority:260
-msgid "'%gn': reflog identity name"
+msgid "encoding"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:172
+#: en/pretty-formats.txt:190
+#, fuzzy, priority:260
+#| msgid "--keep-subject"
+msgid "subject"
+msgstr "--keep-subject"
+
+#. type: Labeled list
+#: en/pretty-formats.txt:190
+#, ignore-same, no-wrap, priority:260
+msgid "'%f'"
+msgstr "'%f'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:191
#, priority:260
-msgid "'%gN': reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "sanitized subject line, suitable for a filename"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:191
+#, ignore-same, no-wrap, priority:260
+msgid "'%b'"
+msgstr "'%b'"
+
#. type: Plain text
-#: en/pretty-formats.txt:173
+#: en/pretty-formats.txt:192
#, priority:260
-msgid "'%ge': reflog identity email"
+msgid "body"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:192
+#, ignore-same, no-wrap, priority:260
+msgid "'%B'"
+msgstr "'%B'"
+
#. type: Plain text
-#: en/pretty-formats.txt:175
+#: en/pretty-formats.txt:193
#, priority:260
-msgid "'%gE': reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "raw body (unwrapped subject and body)"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:194
+#, ignore-same, no-wrap, priority:260
+msgid "'%N'"
+msgstr "'%N'"
+
#. type: Plain text
-#: en/pretty-formats.txt:176
+#: en/pretty-formats.txt:195
+#, fuzzy, priority:260
+#| msgid "`committer`"
+msgid "commit notes"
+msgstr "`committer`"
+
+#. type: Labeled list
+#: en/pretty-formats.txt:196
+#, ignore-same, no-wrap, priority:260
+msgid "'%GG'"
+msgstr "'%GG'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:197
#, priority:260
-msgid "'%gs': reflog subject"
+msgid "raw verification message from GPG for a signed commit"
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:197
+#, no-wrap, priority:260
+msgid "'%G?'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:177
+#: en/pretty-formats.txt:198
#, priority:260
-msgid "'%Cred': switch color to red"
+msgid "show \"G\" for a good (valid) signature,"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:178
+#: en/pretty-formats.txt:205
#, priority:260
-msgid "'%Cgreen': switch color to green"
+msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:205
+#, ignore-same, no-wrap, priority:260
+msgid "'%GS'"
+msgstr "'%GS'"
+
#. type: Plain text
-#: en/pretty-formats.txt:179
+#: en/pretty-formats.txt:206
#, priority:260
-msgid "'%Cblue': switch color to blue"
+msgid "show the name of the signer for a signed commit"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:206
+#, ignore-same, no-wrap, priority:260
+msgid "'%GK'"
+msgstr "'%GK'"
+
#. type: Plain text
-#: en/pretty-formats.txt:180
+#: en/pretty-formats.txt:207
#, priority:260
-msgid "'%Creset': reset color"
+msgid "show the key used to sign a signed commit"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:207
+#, ignore-same, no-wrap, priority:260
+msgid "'%GF'"
+msgstr "'%GF'"
+
#. type: Plain text
-#: en/pretty-formats.txt:192
-#, ignore-ellipsis, priority:260
-msgid "'%C(...)': color specification, as described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
+#: en/pretty-formats.txt:208
+#, priority:260
+msgid "show the fingerprint of the key used to sign a signed commit"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:208
+#, ignore-same, no-wrap, priority:260
+msgid "'%GP'"
+msgstr "'%GP'"
+
#. type: Plain text
-#: en/pretty-formats.txt:193
+#: en/pretty-formats.txt:209
#, priority:260
-msgid "'%m': left (`<`), right (`>`) or boundary (`-`) mark"
+msgid "show the fingerprint of the primary key whose subkey was used"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:194
+#: en/pretty-formats.txt:210
#, priority:260
-msgid "'%n': newline"
+msgid "to sign a signed commit"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:210
+#, ignore-same, no-wrap, priority:260
+msgid "'%gD'"
+msgstr "'%gD'"
+
#. type: Plain text
-#: en/pretty-formats.txt:195
+#: en/pretty-formats.txt:211
#, priority:260
-msgid "'%%': a raw '%'"
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:196
+#: en/pretty-formats.txt:215
#, priority:260
-msgid "'%x00': print a byte from a hex code"
+msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:215
+#, ignore-same, no-wrap, priority:260
+msgid "'%gd'"
+msgstr "'%gd'"
+
#. type: Plain text
-#: en/pretty-formats.txt:198
+#: en/pretty-formats.txt:216
#, priority:260
-msgid "'%w([<w>[,<i1>[,<i2>]]])': switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
+msgid "shortened reflog selector; same as `%gD`, but the refname"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:203
+#: en/pretty-formats.txt:218
#, priority:260
-msgid "'%<(<N>[,trunc|ltrunc|mtrunc])': make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:218
+#, ignore-same, no-wrap, priority:260
+msgid "'%gn'"
+msgstr "'%gn'"
+
#. type: Plain text
-#: en/pretty-formats.txt:205
+#: en/pretty-formats.txt:219
#, priority:260
-msgid "'%<|(<N>)': make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
+msgid "reflog identity name"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:219
+#, ignore-same, no-wrap, priority:260
+msgid "'%gN'"
+msgstr "'%gN'"
+
#. type: Plain text
-#: en/pretty-formats.txt:207
+#: en/pretty-formats.txt:220
#, priority:260
-msgid "'%>(<N>)', '%>|(<N>)': similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
+msgid "reflog identity name (respecting .mailmap, see"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:221
+#, ignore-same, no-wrap, priority:260
+msgid "'%ge'"
+msgstr "'%ge'"
+
#. type: Plain text
-#: en/pretty-formats.txt:210
+#: en/pretty-formats.txt:222
#, priority:260
-msgid "'%>>(<N>)', '%>>|(<N>)': similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "reflog identity email"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:222
+#, ignore-same, no-wrap, priority:260
+msgid "'%gE'"
+msgstr "'%gE'"
+
#. type: Plain text
-#: en/pretty-formats.txt:212
+#: en/pretty-formats.txt:223
#, priority:260
-msgid "'%><(<N>)', '%><|(<N>)': similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
+msgid "reflog identity email (respecting .mailmap, see"
msgstr ""
+#. type: Labeled list
+#: en/pretty-formats.txt:224
+#, ignore-same, no-wrap, priority:260
+msgid "'%gs'"
+msgstr "'%gs'"
+
#. type: Plain text
-#: en/pretty-formats.txt:219
+#: en/pretty-formats.txt:225
#, priority:260
-msgid "%(trailers[:options]): display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options. If the `only` option is given, omit non-trailer lines from the trailer block. If the `unfold` option is given, behave as if interpret-trailer's `--unfold` option was given. E.g., `%(trailers:only,unfold)` to do both."
+msgid "reflog subject"
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:225
+#, no-wrap, priority:260
+msgid "'%(trailers[:options])'"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:226
#, priority:260
-msgid "Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will insert an empty string unless we are traversing reflog entries (e.g., by `git log -g`). The `%d` and `%D` placeholders will use the \"short\" decoration format if `--decorate` was not already provided on the command line."
+msgid "display the trailers of the body as"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:230
#, priority:260
+msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgstr ""
+
+#. type: Plain text
+#: en/pretty-formats.txt:238
+#, priority:260
+msgid "'key=<K>': only show trailers with specified key. Matching is done case-insensitively and trailing colon is optional. If option is given multiple times trailer lines matching any of the keys are shown. This option automatically enables the `only` option so that non-trailer lines in the trailer block are hidden. If that is not desired it can be disabled with `only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with key `Reviewed-by`."
+msgstr ""
+
+#. type: Plain text
+#: en/pretty-formats.txt:244
+#, priority:260
+msgid "'only[=val]': select whether non-trailer lines from the trailer block should be included. The `only` keyword may optionally be followed by an equal sign and one of `true`, `on`, `yes` to omit or `false`, `off`, `no` to show the non-trailer lines. If option is given without value it is enabled. If given multiple times the last value is used."
+msgstr ""
+
+#. type: Plain text
+#: en/pretty-formats.txt:253
+#, priority:260
+msgid "'separator=<SEP>': specify a separator inserted between trailer lines. When this option is not given each trailer line is terminated with a line feed character. The string SEP may contain the literal formatting codes described above. To use comma as separator one must use `%x2C` as it would otherwise be parsed as next option. If separator option is given multiple times only the last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows all trailer lines whose key is \"Ticket\" separated by a comma and a space."
+msgstr ""
+
+#. type: Plain text
+#: en/pretty-formats.txt:257
+#, priority:260
+msgid "'unfold[=val]': make it behave as if interpret-trailer's `--unfold` option was given. In same way as to for `only` it can be followed by an equal sign and explicit value. E.g., `%(trailers:only,unfold=true)` unfolds and shows all trailer lines."
+msgstr ""
+
+#. type: Plain text
+#: en/pretty-formats.txt:259
+#, priority:260
+msgid "'valueonly[=val]': skip over the key part of the trailer line and only show the value part. Also this optionally allows explicit value."
+msgstr ""
+
+#. type: Plain text
+#: en/pretty-formats.txt:266
+#, priority:260
+msgid "Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will insert an empty string unless we are traversing reflog entries (e.g., by `git log -g`). The `%d` and `%D` placeholders will use the \"short\" decoration format if `--decorate` was not already provided on the command line."
+msgstr ""
+
+#. type: Plain text
+#: en/pretty-formats.txt:270
+#, priority:260
msgid "If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:274
#, priority:260
msgid "If you add a `-` (minus sign) after '%' of a placeholder, all consecutive line-feeds immediately preceding the expansion are deleted if and only if the placeholder expands to an empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:278
#, priority:260
msgid "If you add a ` ` (space) after '%' of a placeholder, a space is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:240
+#: en/pretty-formats.txt:280
#, priority:260
msgid "'tformat:'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:248
+#: en/pretty-formats.txt:288
#, priority:260
msgid "The 'tformat:' format works exactly like 'format:', except that it provides \"terminator\" semantics instead of \"separator\" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the \"oneline\" format does. For example:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:254
+#: en/pretty-formats.txt:294
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=format:%h 4da45bef \\\n"
@@ -55284,7 +57412,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:259
+#: en/pretty-formats.txt:299
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef \\\n"
@@ -55294,13 +57422,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:264
+#: en/pretty-formats.txt:304
#, priority:260
msgid "In addition, any unrecognized string that has a `%` in it is interpreted as if it has `tformat:` in front of it. For example, these two are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:268
+#: en/pretty-formats.txt:308
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef\n"
@@ -55433,12 +57561,6 @@ msgstr ""
msgid "Multiple --notes options can be combined to control which notes are being displayed. Examples: \"--notes=foo\" will show only notes from \"refs/notes/foo\"; \"--notes=foo --notes\" will show both notes from \"refs/notes/foo\" and from the default notes ref(s)."
msgstr ""
-#. type: Labeled list
-#: en/pretty-options.txt:81
-#, ignore-same, no-wrap, priority:260
-msgid "--no-notes"
-msgstr "--no-notes"
-
#. type: Plain text
#: en/pretty-options.txt:87
#, priority:260
@@ -55676,7 +57798,7 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:64
#, priority:100
-msgid "Note that any of the 'refs/*' cases above may come either from the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file. While the ref name encoding is unspecified, UTF-8 is preferred as some output processing may assume ref names in UTF-8."
+msgid "Note that any of the 'refs/*' cases above may come either from the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file. While the ref name encoding is unspecified, UTF-8 is preferred as some output processing may assume ref names in UTF-8."
msgstr ""
#. type: Labeled list
@@ -55694,7 +57816,7 @@ msgstr ""
#. type: Labeled list
#: en/revisions.txt:68
#, no-wrap, priority:100
-msgid "'<refname>@{<date>}', e.g. 'master@\\{yesterday\\}', 'HEAD@{5 minutes ago}'"
+msgid "'[<refname>]@{<date>}', e.g. 'master@\\{yesterday\\}', 'HEAD@{5 minutes ago}'"
msgstr ""
#. type: Plain text
@@ -55742,7 +57864,7 @@ msgstr ""
#. type: Labeled list
#: en/revisions.txt:98
#, no-wrap, priority:100
-msgid "'<branchname>@\\{upstream\\}', e.g. 'master@\\{upstream\\}', '@\\{u\\}'"
+msgid "'[<branchname>]@\\{upstream\\}', e.g. 'master@\\{upstream\\}', '@\\{u\\}'"
msgstr ""
#. type: Plain text
@@ -55754,13 +57876,13 @@ msgstr ""
#. type: Labeled list
#: en/revisions.txt:106
#, no-wrap, priority:100
-msgid "'<branchname>@\\{push\\}', e.g. 'master@\\{push\\}', '@\\{push\\}'"
+msgid "'[<branchname>]@\\{push\\}', e.g. 'master@\\{push\\}', '@\\{push\\}'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:112
#, priority:100
-msgid "The suffix '@\\{push}' reports the branch \"where we would push to\" if `git push` were run while `branchname` was checked out (or the current `HEAD` if no branchname is specified). Since our push destination is in a remote repository, of course, we report the local tracking branch that corresponds to that branch (i.e., something in 'refs/remotes/')."
+msgid "The suffix '@\\{push}' reports the branch \"where we would push to\" if `git push` were run while `branchname` was checked out (or the current `HEAD` if no branchname is specified). Since our push destination is in a remote repository, of course, we report the local tracking branch that corresponds to that branch (i.e., something in `refs/remotes/`)."
msgstr ""
#. type: Plain text
@@ -55775,7 +57897,7 @@ msgstr ""
msgid ""
"$ git config push.default current\n"
"$ git config remote.pushdefault myfork\n"
-"$ git checkout -b mybranch origin/master\n"
+"$ git switch -c mybranch origin/master\n"
msgstr ""
#. type: delimited block -
@@ -55809,7 +57931,7 @@ msgstr ""
#. type: Labeled list
#: en/revisions.txt:134
#, no-wrap, priority:100
-msgid "'<rev>{caret}', e.g. 'HEAD{caret}, v1.5.1{caret}0'"
+msgid "'<rev>{caret}[<n>]', e.g. 'HEAD{caret}, v1.5.1{caret}0'"
msgstr ""
#. type: Plain text
@@ -55821,107 +57943,107 @@ msgstr ""
#. type: Labeled list
#: en/revisions.txt:142
#, no-wrap, priority:100
-msgid "'<rev>{tilde}<n>', e.g. 'master{tilde}3'"
+msgid "'<rev>{tilde}[<n>]', e.g. 'HEAD{tilde}, master{tilde}3'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:149
+#: en/revisions.txt:151
#, priority:100
-msgid "A suffix '{tilde}<n>' to a revision parameter means the commit object that is the <n>th generation ancestor of the named commit object, following only the first parents. I.e. '<rev>{tilde}3' is equivalent to '<rev>{caret}{caret}{caret}' which is equivalent to '<rev>{caret}1{caret}1{caret}1'. See below for an illustration of the usage of this form."
+msgid "A suffix '{tilde}' to a revision parameter means the first parent of that commit object. A suffix '{tilde}<n>' to a revision parameter means the commit object that is the <n>th generation ancestor of the named commit object, following only the first parents. I.e. '<rev>{tilde}3' is equivalent to '<rev>{caret}{caret}{caret}' which is equivalent to '<rev>{caret}1{caret}1{caret}1'. See below for an illustration of the usage of this form."
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:150
+#: en/revisions.txt:152
#, no-wrap, priority:100
msgid "'<rev>{caret}{<type>}', e.g. 'v0.99.8{caret}\\{commit\\}'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:161
+#: en/revisions.txt:163
#, priority:100
msgid "A suffix '{caret}' followed by an object type name enclosed in brace pair means dereference the object at '<rev>' recursively until an object of type '<type>' is found or the object cannot be dereferenced anymore (in which case, barf). For example, if '<rev>' is a commit-ish, '<rev>{caret}\\{commit\\}' describes the corresponding commit object. Similarly, if '<rev>' is a tree-ish, '<rev>{caret}\\{tree\\}' describes the corresponding tree object. '<rev>{caret}0' is a short-hand for '<rev>{caret}\\{commit\\}'."
msgstr ""
#. type: Plain text
-#: en/revisions.txt:166
+#: en/revisions.txt:168
#, priority:100
-msgid "'rev{caret}\\{object\\}' can be used to make sure 'rev' names an object that exists, without requiring 'rev' to be a tag, and without dereferencing 'rev'; because a tag is already an object, it does not have to be dereferenced even once to get to an object."
+msgid "'<rev>{caret}\\{object\\}' can be used to make sure '<rev>' names an object that exists, without requiring '<rev>' to be a tag, and without dereferencing '<rev>'; because a tag is already an object, it does not have to be dereferenced even once to get to an object."
msgstr ""
#. type: Plain text
-#: en/revisions.txt:169
+#: en/revisions.txt:171
#, priority:100
-msgid "'rev{caret}\\{tag\\}' can be used to ensure that 'rev' identifies an existing tag object."
+msgid "'<rev>{caret}\\{tag\\}' can be used to ensure that '<rev>' identifies an existing tag object."
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:170
+#: en/revisions.txt:172
#, no-wrap, priority:100
msgid "'<rev>{caret}{}', e.g. 'v0.99.8{caret}{}'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:175
+#: en/revisions.txt:177
#, priority:100
msgid "A suffix '{caret}' followed by an empty brace pair means the object could be a tag, and dereference the tag recursively until a non-tag object is found."
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:176
+#: en/revisions.txt:178
#, no-wrap, priority:100
msgid "'<rev>{caret}{/<text>}', e.g. 'HEAD^{/fix nasty bug}'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:182
+#: en/revisions.txt:184
#, priority:100
msgid "A suffix '{caret}' to a revision parameter, followed by a brace pair that contains a text led by a slash, is the same as the ':/fix nasty bug' syntax below except that it returns the youngest matching commit which is reachable from the '<rev>' before '{caret}'."
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:183
+#: en/revisions.txt:185
#, no-wrap, priority:100
msgid "':/<text>', e.g. ':/fix nasty bug'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:196
+#: en/revisions.txt:198
#, priority:100
msgid "A colon, followed by a slash, followed by a text, names a commit whose commit message matches the specified regular expression. This name returns the youngest matching commit which is reachable from any ref, including HEAD. The regular expression can match any part of the commit message. To match messages starting with a string, one can use e.g. ':/^foo'. The special sequence ':/!' is reserved for modifiers to what is matched. ':/!-foo' performs a negative match, while ':/!!foo' matches a literal '!' character, followed by 'foo'. Any other sequence beginning with ':/!' is reserved for now. Depending on the given text, the shell's word splitting rules might require additional quoting."
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:197
+#: en/revisions.txt:199
#, no-wrap, priority:100
-msgid "'<rev>:<path>', e.g. 'HEAD:README', ':README', 'master:./README'"
+msgid "'<rev>:<path>', e.g. 'HEAD:README', 'master:./README'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:208
+#: en/revisions.txt:207
#, priority:100
-msgid "A suffix ':' followed by a path names the blob or tree at the given path in the tree-ish object named by the part before the colon. ':path' (with an empty part before the colon) is a special case of the syntax described next: content recorded in the index at the given path. A path starting with './' or '../' is relative to the current working directory. The given path will be converted to be relative to the working tree's root directory. This is most useful to address a blob or tree from a commit or tree that has the same tree structure as the working tree."
+msgid "A suffix ':' followed by a path names the blob or tree at the given path in the tree-ish object named by the part before the colon. A path starting with './' or '../' is relative to the current working directory. The given path will be converted to be relative to the working tree's root directory. This is most useful to address a blob or tree from a commit or tree that has the same tree structure as the working tree."
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:209
+#: en/revisions.txt:208
#, no-wrap, priority:100
-msgid "':<n>:<path>', e.g. ':0:README', ':README'"
+msgid "':[<n>:]<path>', e.g. ':0:README', ':README'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:217
+#: en/revisions.txt:216
#, priority:100
msgid "A colon, optionally followed by a stage number (0 to 3) and a colon, followed by a path, names a blob object in the index at the given path. A missing stage number (and the colon that follows it) names a stage 0 entry. During a merge, stage 1 is the common ancestor, stage 2 is the target branch's version (typically the current branch), and stage 3 is the version from the branch which is being merged."
msgstr ""
#. type: Plain text
-#: en/revisions.txt:221
+#: en/revisions.txt:220
#, priority:100
msgid "Here is an illustration, by Jon Loeliger. Both commit nodes B and C are parents of commit node A. Parent commits are ordered left-to-right."
msgstr ""
#. type: delimited block .
-#: en/revisions.txt:233
+#: en/revisions.txt:232
#, no-wrap, priority:100
msgid ""
"G H I J\n"
@@ -55937,7 +58059,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/revisions.txt:245
+#: en/revisions.txt:244
#, no-wrap, priority:100
msgid ""
" A = = A^0\n"
@@ -55953,211 +58075,211 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/revisions.txt:252
+#: en/revisions.txt:251
#, priority:100
msgid "History traversing commands such as `git log` operate on a set of commits, not just a single commit."
msgstr ""
#. type: Plain text
-#: en/revisions.txt:257
+#: en/revisions.txt:256
#, priority:100
msgid "For these commands, specifying a single revision, using the notation described in the previous section, means the set of commits `reachable` from the given commit."
msgstr ""
#. type: Plain text
-#: en/revisions.txt:260
+#: en/revisions.txt:259
#, priority:100
msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
msgstr ""
#. type: Title ~
-#: en/revisions.txt:263
+#: en/revisions.txt:262
#, no-wrap, priority:100
msgid "Commit Exclusions"
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:265
+#: en/revisions.txt:264
#, no-wrap, priority:100
msgid "'{caret}<rev>' (caret) Notation"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:270
+#: en/revisions.txt:269
#, priority:100
msgid "To exclude commits reachable from a commit, a prefix '{caret}' notation is used. E.g. '{caret}r1 r2' means commits reachable from 'r2' but exclude the ones reachable from 'r1' (i.e. 'r1' and its ancestors)."
msgstr ""
#. type: Title ~
-#: en/revisions.txt:272
+#: en/revisions.txt:271
#, no-wrap, priority:100
msgid "Dotted Range Notations"
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:274
+#: en/revisions.txt:273
#, no-wrap, priority:100
msgid "The '..' (two-dot) Range Notation"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:280
+#: en/revisions.txt:279
#, priority:100
msgid "The '{caret}r1 r2' set operation appears so often that there is a shorthand for it. When you have two commits 'r1' and 'r2' (named according to the syntax explained in SPECIFYING REVISIONS above), you can ask for commits that are reachable from r2 excluding those that are reachable from r1 by '{caret}r1 r2' and it can be written as 'r1..r2'."
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:281
+#: en/revisions.txt:280
#, ignore-ellipsis, no-wrap, priority:100
msgid "The '...' (three-dot) Symmetric Difference Notation"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:287
+#: en/revisions.txt:286
#, ignore-ellipsis, priority:100
msgid "A similar notation 'r1\\...r2' is called symmetric difference of 'r1' and 'r2' and is defined as 'r1 r2 --not $(git merge-base --all r1 r2)'. It is the set of commits that are reachable from either one of 'r1' (left side) or 'r2' (right side) but not from both."
msgstr ""
#. type: Plain text
-#: en/revisions.txt:294
+#: en/revisions.txt:293
#, priority:100
msgid "In these two shorthand notations, you can omit one end and let it default to HEAD. For example, 'origin..' is a shorthand for 'origin..HEAD' and asks \"What did I do since I forked from the origin branch?\" Similarly, '..origin' is a shorthand for 'HEAD..origin' and asks \"What did the origin do since I forked from them?\" Note that '..' would mean 'HEAD..HEAD' which is an empty range that is both reachable and unreachable from HEAD."
msgstr ""
#. type: Title ~
-#: en/revisions.txt:296
+#: en/revisions.txt:295
#, no-wrap, priority:100
msgid "Other <rev>{caret} Parent Shorthand Notations"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:299
+#: en/revisions.txt:298
#, priority:100
msgid "Three other shorthands exist, particularly useful for merge commits, for naming a set that is formed by a commit and its parent commits."
msgstr ""
#. type: Plain text
-#: en/revisions.txt:301
+#: en/revisions.txt:300
#, priority:100
msgid "The 'r1{caret}@' notation means all parents of 'r1'."
msgstr ""
#. type: Plain text
-#: en/revisions.txt:304
+#: en/revisions.txt:303
#, priority:100
msgid "The 'r1{caret}!' notation includes commit 'r1' but excludes all of its parents. By itself, this notation denotes the single commit 'r1'."
msgstr ""
#. type: Plain text
-#: en/revisions.txt:311
+#: en/revisions.txt:310
#, priority:100
-msgid "The '<rev>{caret}-<n>' notation includes '<rev>' but excludes the <n>th parent (i.e. a shorthand for '<rev>{caret}<n>..<rev>'), with '<n>' = 1 if not given. This is typically useful for merge commits where you can just pass '<commit>{caret}-' to get all the commits in the branch that was merged in merge commit '<commit>' (including '<commit>' itself)."
+msgid "The '<rev>{caret}-[<n>]' notation includes '<rev>' but excludes the <n>th parent (i.e. a shorthand for '<rev>{caret}<n>..<rev>'), with '<n>' = 1 if not given. This is typically useful for merge commits where you can just pass '<commit>{caret}-' to get all the commits in the branch that was merged in merge commit '<commit>' (including '<commit>' itself)."
msgstr ""
#. type: Plain text
-#: en/revisions.txt:315
+#: en/revisions.txt:314
#, priority:100
msgid "While '<rev>{caret}<n>' was about specifying a single commit parent, these three notations also consider its parents. For example you can say 'HEAD{caret}2{caret}@', however you cannot say 'HEAD{caret}@{caret}2'."
msgstr ""
#. type: Title -
-#: en/revisions.txt:317
+#: en/revisions.txt:316
#, no-wrap, priority:100
msgid "Revision Range Summary"
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:319
+#: en/revisions.txt:318
#, no-wrap, priority:100
msgid "'<rev>'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:322
+#: en/revisions.txt:321
#, priority:100
msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:323
+#: en/revisions.txt:322
#, no-wrap, priority:100
msgid "'{caret}<rev>'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:326
+#: en/revisions.txt:325
#, priority:100
msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:327
+#: en/revisions.txt:326
#, no-wrap, priority:100
msgid "'<rev1>..<rev2>'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:331
+#: en/revisions.txt:330
#, priority:100
msgid "Include commits that are reachable from <rev2> but exclude those that are reachable from <rev1>. When either <rev1> or <rev2> is omitted, it defaults to `HEAD`."
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:332
+#: en/revisions.txt:331
#, ignore-ellipsis, no-wrap, priority:100
msgid "'<rev1>\\...<rev2>'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:336
+#: en/revisions.txt:335
#, priority:100
msgid "Include commits that are reachable from either <rev1> or <rev2> but exclude those that are reachable from both. When either <rev1> or <rev2> is omitted, it defaults to `HEAD`."
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:337
+#: en/revisions.txt:336
#, no-wrap, priority:100
msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:341
+#: en/revisions.txt:340
#, priority:100
msgid "A suffix '{caret}' followed by an at sign is the same as listing all parents of '<rev>' (meaning, include anything reachable from its parents, but not the commit itself)."
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:342
+#: en/revisions.txt:341
#, no-wrap, priority:100
msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:346
+#: en/revisions.txt:345
#, priority:100
msgid "A suffix '{caret}' followed by an exclamation mark is the same as giving commit '<rev>' and then all its parents prefixed with '{caret}' to exclude them (and their ancestors)."
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:347
+#: en/revisions.txt:346
#, no-wrap, priority:100
msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:350
+#: en/revisions.txt:349
#, priority:100
msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
msgstr ""
#. type: Plain text
-#: en/revisions.txt:354
+#: en/revisions.txt:353
#, priority:100
msgid "Here are a handful of examples using the Loeliger illustration above, with each step in the notation's expansion and selection carefully spelt out:"
msgstr ""
#. type: delimited block .
-#: en/revisions.txt:378
+#: en/revisions.txt:377
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" Args Expanded arguments Selected commits\n"
@@ -56550,338 +58672,350 @@ msgstr "--reflog"
msgid "Pretend as if all objects mentioned by reflogs are listed on the command line as `<commit>`."
msgstr ""
+#. type: Labeled list
+#: en/rev-list-options.txt:185
+#, ignore-same, no-wrap, priority:260
+msgid "--alternate-refs"
+msgstr "--alternate-refs"
+
#. type: Plain text
#: en/rev-list-options.txt:192
#, priority:260
+msgid "Pretend as if all objects mentioned as ref tips of alternate repositories were listed on the command line. An alternate repository is any repository whose object directory is specified in `objects/info/alternates`. The set of included objects may be modified by `core.alternateRefsCommand`, etc. See linkgit:git-config[1]."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:200
+#, priority:260
msgid "By default, all working trees will be examined by the following options when there are more than one (see linkgit:git-worktree[1]): `--all`, `--reflog` and `--indexed-objects`. This option forces them to examine the current working tree only."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:196
+#: en/rev-list-options.txt:204
#, priority:260
msgid "Upon seeing an invalid object name in the input, pretend as if the bad input was not given."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:198 en/rev-list-options.txt:578
+#: en/rev-list-options.txt:206 en/rev-list-options.txt:586
#, ignore-same, no-wrap, priority:260
msgid "--bisect"
msgstr "--bisect"
#. type: Plain text
-#: en/rev-list-options.txt:203
+#: en/rev-list-options.txt:211
#, priority:260
msgid "Pretend as if the bad bisection ref `refs/bisect/bad` was listed and as if it was followed by `--not` and the good bisection refs `refs/bisect/good-*` on the command line. Cannot be combined with --first-parent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:210
+#: en/rev-list-options.txt:218
#, priority:260
msgid "In addition to the '<commit>' listed on the command line, read them from the standard input. If a `--` separator is seen, stop reading commits and start reading paths to limit the result."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:218
+#: en/rev-list-options.txt:226
#, priority:260
msgid "Don't print anything to standard output. This form is primarily meant to allow the caller to test the exit status to see if a range of objects is fully connected (or not). It is faster than redirecting stdout to `/dev/null` as the output does not have to be formatted."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:220
+#: en/rev-list-options.txt:228
#, ignore-same, no-wrap, priority:260
msgid "--cherry-mark"
msgstr "--cherry-mark"
#. type: Plain text
-#: en/rev-list-options.txt:223
+#: en/rev-list-options.txt:231
#, priority:260
msgid "Like `--cherry-pick` (see below) but mark equivalent commits with `=` rather than omitting them, and inequivalent ones with `+`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:224
+#: en/rev-list-options.txt:232
#, ignore-same, no-wrap, priority:260
msgid "--cherry-pick"
msgstr "--cherry-pick"
#. type: Plain text
-#: en/rev-list-options.txt:228
+#: en/rev-list-options.txt:236
#, priority:260
msgid "Omit any commit that introduces the same change as another commit on the ``other side'' when the set of commits are limited with symmetric difference."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:236
+#: en/rev-list-options.txt:244
#, priority:260
msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:237
+#: en/rev-list-options.txt:245
#, ignore-same, no-wrap, priority:260
msgid "--left-only"
msgstr "--left-only"
#. type: Labeled list
-#: en/rev-list-options.txt:238
+#: en/rev-list-options.txt:246
#, ignore-same, no-wrap, priority:260
msgid "--right-only"
msgstr "--right-only"
#. type: Plain text
-#: en/rev-list-options.txt:242
+#: en/rev-list-options.txt:250
#, priority:260
msgid "List only commits on the respective side of a symmetric difference, i.e. only those which would be marked `<` resp. `>` by `--left-right`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:248
+#: en/rev-list-options.txt:256
#, ignore-ellipsis, priority:260
msgid "For example, `--cherry-pick --right-only A...B` omits those commits from `B` which are in `A` or are patch-equivalent to a commit in `A`. In other words, this lists the `+` commits from `git cherry A B`. More precisely, `--cherry-pick --right-only --no-merges` gives the exact list."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:249
+#: en/rev-list-options.txt:257
#, ignore-same, no-wrap, priority:260
msgid "--cherry"
msgstr "--cherry"
#. type: Plain text
-#: en/rev-list-options.txt:255
+#: en/rev-list-options.txt:263
#, ignore-ellipsis, priority:260
msgid "A synonym for `--right-only --cherry-mark --no-merges`; useful to limit the output to the commits on our side and mark those that have been applied to the other side of a forked history with `git log --cherry upstream...mybranch`, similar to `git cherry upstream mybranch`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:257
+#: en/rev-list-options.txt:265
#, ignore-same, no-wrap, priority:260
msgid "--walk-reflogs"
msgstr "--walk-reflogs"
#. type: Plain text
-#: en/rev-list-options.txt:263
+#: en/rev-list-options.txt:271
#, ignore-ellipsis, priority:260
msgid "Instead of walking the commit ancestry chain, walk reflog entries from the most recent one to older ones. When this option is used you cannot specify commits to exclude (that is, '{caret}commit', 'commit1..commit2', and 'commit1\\...commit2' notations cannot be used)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:270
+#: en/rev-list-options.txt:278
#, priority:260
msgid "With `--pretty` format other than `oneline` (for obvious reasons), this causes the output to have two extra lines of information taken from the reflog. The reflog designator in the output may be shown as `ref@{Nth}` (where `Nth` is the reverse-chronological index in the reflog) or as `ref@{timestamp}` (with the timestamp for that entry), depending on a few rules:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:274
+#: en/rev-list-options.txt:282
#, priority:260
msgid "If the starting point is specified as `ref@{Nth}`, show the index format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:277
+#: en/rev-list-options.txt:285
#, priority:260
msgid "If the starting point was specified as `ref@{now}`, show the timestamp format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:280
+#: en/rev-list-options.txt:288
#, priority:260
msgid "If neither was used, but `--date` was given on the command line, show the timestamp in the format requested by `--date`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:282
+#: en/rev-list-options.txt:290
#, priority:260
msgid "Otherwise, show the index format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:288
+#: en/rev-list-options.txt:296
#, priority:260
msgid "Under `--pretty=oneline`, the commit message is prefixed with this information on the same line. This option cannot be combined with `--reverse`. See also linkgit:git-reflog[1]."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:292
+#: en/rev-list-options.txt:300
#, priority:260
msgid "After a failed merge, show refs that touch files having a conflict and don't exist on all heads to merge."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:293
+#: en/rev-list-options.txt:301
#, ignore-same, no-wrap, priority:260
msgid "--boundary"
msgstr "--boundary"
#. type: Plain text
-#: en/rev-list-options.txt:296
+#: en/rev-list-options.txt:304
#, priority:260
msgid "Output excluded boundary commits. Boundary commits are prefixed with `-`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:298
+#: en/rev-list-options.txt:306
#, ignore-same, no-wrap, priority:260
msgid "--use-bitmap-index"
msgstr "--use-bitmap-index"
#. type: Plain text
-#: en/rev-list-options.txt:303
+#: en/rev-list-options.txt:311
#, priority:260
msgid "Try to speed up the traversal using the pack bitmap index (if one is available). Note that when traversing with `--objects`, trees and blobs will not have their associated path printed."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:304
+#: en/rev-list-options.txt:312
#, no-wrap, priority:260
msgid "--progress=<header>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:307
+#: en/rev-list-options.txt:315
#, priority:260
msgid "Show progress reports on stderr as objects are considered. The `<header>` text will be printed with each progress update."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:310
+#: en/rev-list-options.txt:318
#, no-wrap, priority:260
msgid "History Simplification"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:316
+#: en/rev-list-options.txt:324
#, priority:260
msgid "Sometimes you are only interested in parts of the history, for example the commits modifying a particular <path>. But there are two parts of 'History Simplification', one part is selecting the commits and the other is how to do it, as there are various strategies to simplify the history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:318
+#: en/rev-list-options.txt:326
#, priority:260
msgid "The following options select the commits to be shown:"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:319
+#: en/rev-list-options.txt:327
#, no-wrap, priority:260
msgid "<paths>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:321
+#: en/rev-list-options.txt:329
#, priority:260
msgid "Commits modifying the given <paths> are selected."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:322
+#: en/rev-list-options.txt:330
#, ignore-same, no-wrap, priority:260
msgid "--simplify-by-decoration"
msgstr "--simplify-by-decoration"
#. type: Plain text
-#: en/rev-list-options.txt:324
+#: en/rev-list-options.txt:332
#, priority:260
msgid "Commits that are referred by some branch or tag are selected."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:326
+#: en/rev-list-options.txt:334
#, priority:260
msgid "Note that extra commits can be shown to give a meaningful history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:328
+#: en/rev-list-options.txt:336
#, priority:260
msgid "The following options affect the way the simplification is performed:"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:329 en/rev-list-options.txt:403
+#: en/rev-list-options.txt:337 en/rev-list-options.txt:411
#, no-wrap, priority:260
msgid "Default mode"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:334
+#: en/rev-list-options.txt:342
#, priority:260
msgid "Simplifies the history to the simplest history explaining the final state of the tree. Simplest because it prunes some side branches if the end result is the same (i.e. merging branches with the same content)"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:335
+#: en/rev-list-options.txt:343
#, ignore-same, no-wrap, priority:260
msgid "--full-history"
msgstr "--full-history"
#. type: Plain text
-#: en/rev-list-options.txt:337
+#: en/rev-list-options.txt:345
#, priority:260
msgid "Same as the default mode, but does not prune some history."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:338 en/rev-list-options.txt:471
+#: en/rev-list-options.txt:346 en/rev-list-options.txt:479
#, ignore-same, no-wrap, priority:260
msgid "--dense"
msgstr "--dense"
#. type: Plain text
-#: en/rev-list-options.txt:341
+#: en/rev-list-options.txt:349
#, priority:260
msgid "Only the selected commits are shown, plus some to have a meaningful history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:344
+#: en/rev-list-options.txt:352
#, priority:260
msgid "All commits in the simplified history are shown."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:345 en/rev-list-options.txt:482
+#: en/rev-list-options.txt:353 en/rev-list-options.txt:490
#, ignore-same, no-wrap, priority:260
msgid "--simplify-merges"
msgstr "--simplify-merges"
#. type: Plain text
-#: en/rev-list-options.txt:349
+#: en/rev-list-options.txt:357
#, priority:260
msgid "Additional option to `--full-history` to remove some needless merges from the resulting history, as there are no selected commits contributing to this merge."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:350 en/rev-list-options.txt:529
+#: en/rev-list-options.txt:358 en/rev-list-options.txt:537
#, ignore-same, no-wrap, priority:260
msgid "--ancestry-path"
msgstr "--ancestry-path"
#. type: Plain text
-#: en/rev-list-options.txt:356
+#: en/rev-list-options.txt:364
#, priority:260
msgid "When given a range of commits to display (e.g. 'commit1..commit2' or 'commit2 {caret}commit1'), only display commits that exist directly on the ancestry chain between the 'commit1' and 'commit2', i.e. commits that are both descendants of 'commit1', and ancestors of 'commit2'."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:358
+#: en/rev-list-options.txt:366
#, priority:260
msgid "A more detailed explanation follows."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:362
+#: en/rev-list-options.txt:370
#, priority:260
msgid "Suppose you specified `foo` as the <paths>. We shall call commits that modify `foo` !TREESAME, and the rest TREESAME. (In a diff filtered for `foo`, they look different and equal, respectively.)"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:366
+#: en/rev-list-options.txt:374
#, priority:260
msgid "In the following, we will always refer to the same example history to illustrate the differences between simplification settings. We assume that you are filtering for a file `foo` in this commit graph:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:372
+#: en/rev-list-options.txt:380
#, no-wrap, priority:260
msgid ""
"\t .-A---M---N---O---P---Q\n"
@@ -56892,73 +59026,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:375
+#: en/rev-list-options.txt:383
#, priority:260
msgid "The horizontal line of history A---Q is taken to be the first parent of each merge. The commits are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:379
+#: en/rev-list-options.txt:387
#, priority:260
msgid "`I` is the initial commit, in which `foo` exists with contents ``asdf'', and a file `quux` exists with contents ``quux''. Initial commits are compared to an empty tree, so `I` is !TREESAME."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:381
+#: en/rev-list-options.txt:389
#, priority:260
msgid "In `A`, `foo` contains just ``foo''."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:384
+#: en/rev-list-options.txt:392
#, priority:260
msgid "`B` contains the same change as `A`. Its merge `M` is trivial and hence TREESAME to all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:387
+#: en/rev-list-options.txt:395
#, priority:260
msgid "`C` does not change `foo`, but its merge `N` changes it to ``foobar'', so it is not TREESAME to any parent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:390
+#: en/rev-list-options.txt:398
#, priority:260
msgid "`D` sets `foo` to ``baz''. Its merge `O` combines the strings from `N` and `D` to ``foobarbaz''; i.e., it is not TREESAME to any parent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:393
+#: en/rev-list-options.txt:401
#, priority:260
msgid "`E` changes `quux` to ``xyzzy'', and its merge `P` combines the strings to ``quux xyzzy''. `P` is TREESAME to `O`, but not to `E`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:397
+#: en/rev-list-options.txt:405
#, priority:260
msgid "`X` is an independent root commit that added a new file `side`, and `Y` modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and `Q` is TREESAME to `P`, but not to `Y`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:402
+#: en/rev-list-options.txt:410
#, priority:260
msgid "`rev-list` walks backwards through history, including or excluding commits based on whether `--full-history` and/or parent rewriting (via `--parents` or `--children`) are used. The following settings are available."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:410
+#: en/rev-list-options.txt:418
#, priority:260
msgid "Commits are included if they are not TREESAME to any parent (though this can be changed, see `--sparse` below). If the commit was a merge, and it was TREESAME to one parent, follow only that parent. (Even if there are several TREESAME parents, follow only one of them.) Otherwise, follow all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:412
+#: en/rev-list-options.txt:420
#, priority:260
msgid "This results in:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:417
+#: en/rev-list-options.txt:425
#, no-wrap, priority:260
msgid ""
"\t .-A---N---O\n"
@@ -56967,67 +59101,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:423
+#: en/rev-list-options.txt:431
#, priority:260
msgid "Note how the rule to only follow the TREESAME parent, if one is available, removed `B` from consideration entirely. `C` was considered via `N`, but is TREESAME. Root commits are compared to an empty tree, so `I` is !TREESAME."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:427
+#: en/rev-list-options.txt:435
#, priority:260
msgid "Parent/child relations are only visible with `--parents`, but that does not affect the commits selected in default mode, so we have shown the parent lines."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:428
+#: en/rev-list-options.txt:436
#, no-wrap, priority:260
msgid "--full-history without parent rewriting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:434
+#: en/rev-list-options.txt:442
#, priority:260
msgid "This mode differs from the default in one point: always follow all parents of a merge, even if it is TREESAME to one of them. Even if more than one side of the merge has commits that are included, this does not imply that the merge itself is! In the example, we get"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:437
+#: en/rev-list-options.txt:445
#, no-wrap, priority:260
msgid "\tI A B N D O P Q\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:442
+#: en/rev-list-options.txt:450
#, priority:260
msgid "`M` was excluded because it is TREESAME to both parents. `E`, `C` and `B` were all walked, but only `B` was !TREESAME, so the others do not appear."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:446
+#: en/rev-list-options.txt:454
#, priority:260
msgid "Note that without parent rewriting, it is not really possible to talk about the parent/child relationships between the commits, so we show them disconnected."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:447
+#: en/rev-list-options.txt:455
#, no-wrap, priority:260
msgid "--full-history with parent rewriting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:450
+#: en/rev-list-options.txt:458
#, priority:260
msgid "Ordinary commits are only included if they are !TREESAME (though this can be changed, see `--sparse` below)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:454
+#: en/rev-list-options.txt:462
#, priority:260
msgid "Merges are always included. However, their parent list is rewritten: Along each parent, prune away commits that are not included themselves. This results in"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:461
+#: en/rev-list-options.txt:469
#, no-wrap, priority:260
msgid ""
"\t .-A---M---N---O---P---Q\n"
@@ -57038,73 +59172,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:467
+#: en/rev-list-options.txt:475
#, priority:260
msgid "Compare to `--full-history` without rewriting above. Note that `E` was pruned away because it is TREESAME, but the parent list of P was rewritten to contain `E`'s parent `I`. The same happened for `C` and `N`, and `X`, `Y` and `Q`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:470
+#: en/rev-list-options.txt:478
#, priority:260
msgid "In addition to the above settings, you can change whether TREESAME affects inclusion:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:474
+#: en/rev-list-options.txt:482
#, priority:260
msgid "Commits that are walked are included if they are not TREESAME to any parent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:477
+#: en/rev-list-options.txt:485
#, priority:260
msgid "All commits that are walked are included."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:481
+#: en/rev-list-options.txt:489
#, priority:260
msgid "Note that without `--full-history`, this still simplifies merges: if one of the parents is TREESAME, we follow only that one, so the other sides of the merge are never walked."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:485
+#: en/rev-list-options.txt:493
#, priority:260
msgid "First, build a history graph in the same way that `--full-history` with parent rewriting does (see above)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:488
+#: en/rev-list-options.txt:496
#, priority:260
msgid "Then simplify each commit `C` to its replacement `C'` in the final history according to the following rules:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:491
+#: en/rev-list-options.txt:499
#, priority:260
msgid "Set `C'` to `C`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:496
+#: en/rev-list-options.txt:504
#, priority:260
msgid "Replace each parent `P` of `C'` with its simplification `P'`. In the process, drop parents that are ancestors of other parents or that are root commits TREESAME to an empty tree, and remove duplicates, but take care to never drop all parents that we are TREESAME to."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:500
+#: en/rev-list-options.txt:508
#, priority:260
msgid "If after this parent rewriting, `C'` is a root or merge commit (has zero or >1 parents), a boundary commit, or !TREESAME, it remains. Otherwise, it is replaced with its only parent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:504
+#: en/rev-list-options.txt:512
#, priority:260
msgid "The effect of this is best shown by way of comparing to `--full-history` with parent rewriting. The example turns into:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:511
+#: en/rev-list-options.txt:519
#, no-wrap, priority:260
msgid ""
"\t .-A---M---N---O\n"
@@ -57115,49 +59249,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:514
+#: en/rev-list-options.txt:522
#, priority:260
msgid "Note the major differences in `N`, `P`, and `Q` over `--full-history`:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:518
+#: en/rev-list-options.txt:526
#, priority:260
msgid "`N`'s parent list had `I` removed, because it is an ancestor of the other parent `M`. Still, `N` remained because it is !TREESAME."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:521
+#: en/rev-list-options.txt:529
#, priority:260
msgid "`P`'s parent list similarly had `I` removed. `P` was then removed completely, because it had one parent and is TREESAME."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:525
+#: en/rev-list-options.txt:533
#, priority:260
msgid "`Q`'s parent list had `Y` simplified to `X`. `X` was then removed, because it was a TREESAME root. `Q` was then removed completely, because it had one parent and is TREESAME."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:528
+#: en/rev-list-options.txt:536
#, priority:260
msgid "Finally, there is a fifth simplification mode available:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:534
+#: en/rev-list-options.txt:542
#, priority:260
msgid "Limit the displayed commits to those directly on the ancestry chain between the ``from'' and ``to'' commits in the given commit range. I.e. only display commits that are ancestor of the ``to'' commit and descendants of the ``from'' commit."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:536
+#: en/rev-list-options.txt:544
#, priority:260
msgid "As an example use case, consider the following commit history:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:543
+#: en/rev-list-options.txt:551
#, no-wrap, priority:260
msgid ""
"\t D---E-------F\n"
@@ -57168,19 +59302,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:551
+#: en/rev-list-options.txt:559
#, priority:260
msgid "A regular 'D..M' computes the set of commits that are ancestors of `M`, but excludes the ones that are ancestors of `D`. This is useful to see what happened to the history leading to `M` since `D`, in the sense that ``what does `M` have that did not exist in `D`''. The result in this example would be all the commits, except `A` and `B` (and `D` itself, of course)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:557
+#: en/rev-list-options.txt:565
#, priority:260
msgid "When we want to find out what commits in `M` are contaminated with the bug introduced by `D` and need fixing, however, we might want to view only the subset of 'D..M' that are actually descendants of `D`, i.e. excluding `C` and `K`. This is exactly what the `--ancestry-path` option does. Applied to the 'D..M' range, it results in:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:564
+#: en/rev-list-options.txt:572
#, no-wrap, priority:260
msgid ""
"\t\tE-------F\n"
@@ -57191,37 +59325,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:573
+#: en/rev-list-options.txt:581
#, priority:260
msgid "The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away)."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:576
+#: en/rev-list-options.txt:584
#, no-wrap, priority:260
msgid "Bisection Helpers"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:585
+#: en/rev-list-options.txt:593
#, priority:260
msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:588
+#: en/rev-list-options.txt:596
#, no-wrap, priority:260
msgid "\t$ git rev-list --bisect foo ^bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:591
+#: en/rev-list-options.txt:599
#, priority:260
msgid "outputs 'midpoint', the output of the two commands"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:595
+#: en/rev-list-options.txt:603
#, no-wrap, priority:260
msgid ""
"\t$ git rev-list foo ^midpoint\n"
@@ -57229,91 +59363,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:601
+#: en/rev-list-options.txt:609
#, priority:260
msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one. Cannot be combined with --first-parent."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:602
+#: en/rev-list-options.txt:610
#, ignore-same, no-wrap, priority:260
msgid "--bisect-vars"
msgstr "--bisect-vars"
#. type: Plain text
-#: en/rev-list-options.txt:613
+#: en/rev-list-options.txt:621
#, priority:260
msgid "This calculates the same as `--bisect`, except that refs in `refs/bisect/` are not used, and except that this outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable `bisect_rev`, and the expected number of commits to be tested after `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be tested if `bisect_rev` turns out to be good to `bisect_good`, the expected number of commits to be tested if `bisect_rev` turns out to be bad to `bisect_bad`, and the number of commits we are bisecting right now to `bisect_all`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:614
+#: en/rev-list-options.txt:622
#, ignore-same, no-wrap, priority:260
msgid "--bisect-all"
msgstr "--bisect-all"
#. type: Plain text
-#: en/rev-list-options.txt:620
+#: en/rev-list-options.txt:628
#, priority:260
msgid "This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. Refs in `refs/bisect/` are not used. The farthest from them is displayed first. (This is the only one displayed by `--bisect`.)"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:624
+#: en/rev-list-options.txt:632
#, priority:260
msgid "This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they may not compile for example)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:628
+#: en/rev-list-options.txt:636
#, priority:260
msgid "This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:632
+#: en/rev-list-options.txt:640
#, no-wrap, priority:260
msgid "Commit Ordering"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:635
+#: en/rev-list-options.txt:643
#, priority:260
msgid "By default, the commits are shown in reverse chronological order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:639
+#: en/rev-list-options.txt:647
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:640
+#: en/rev-list-options.txt:648
#, ignore-same, no-wrap, priority:260
msgid "--author-date-order"
msgstr "--author-date-order"
#. type: Plain text
-#: en/rev-list-options.txt:643
+#: en/rev-list-options.txt:651
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:648
+#: en/rev-list-options.txt:656
#, priority:260
msgid "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:650
+#: en/rev-list-options.txt:658
#, priority:260
msgid "For example, in a commit history like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:656
+#: en/rev-list-options.txt:664
#, no-wrap, priority:260
msgid ""
" ---1----2----4----7\n"
@@ -57322,397 +59456,439 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:662
+#: en/rev-list-options.txt:670
#, priority:260
msgid "where the numbers denote the order of commit timestamps, `git rev-list` and friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 4 3 2 1."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:667
+#: en/rev-list-options.txt:675
#, priority:260
msgid "With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:672
+#: en/rev-list-options.txt:680
#, priority:260
msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:674
+#: en/rev-list-options.txt:682
#, no-wrap, priority:260
msgid "Object Traversal"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:677
+#: en/rev-list-options.txt:685
#, priority:260
msgid "These options are mostly targeted for packing of Git repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:679
+#: en/rev-list-options.txt:687
#, ignore-same, no-wrap, priority:260
msgid "--objects"
msgstr "--objects"
#. type: Plain text
-#: en/rev-list-options.txt:684
+#: en/rev-list-options.txt:692
#, priority:260
msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:685
+#: en/rev-list-options.txt:693
#, ignore-same, no-wrap, priority:260
msgid "--in-commit-order"
msgstr "--in-commit-order"
#. type: Plain text
-#: en/rev-list-options.txt:689
+#: en/rev-list-options.txt:697
#, priority:260
msgid "Print tree and blob ids in order of the commits. The tree and blob ids are printed after they are first referenced by a commit."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:690
+#: en/rev-list-options.txt:698
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge"
msgstr "--objects-edge"
#. type: Plain text
-#: en/rev-list-options.txt:696
+#: en/rev-list-options.txt:704
#, priority:260
msgid "Similar to `--objects`, but also print the IDs of excluded commits prefixed with a ``-'' character. This is used by linkgit:git-pack-objects[1] to build a ``thin'' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:697
+#: en/rev-list-options.txt:705
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
#. type: Plain text
-#: en/rev-list-options.txt:701
+#: en/rev-list-options.txt:709
#, priority:260
msgid "Similar to `--objects-edge`, but it tries harder to find excluded commits at the cost of increased time. This is used instead of `--objects-edge` to build ``thin'' packs for shallow repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:702
+#: en/rev-list-options.txt:710
#, ignore-same, no-wrap, priority:260
msgid "--indexed-objects"
msgstr "--indexed-objects"
#. type: Plain text
-#: en/rev-list-options.txt:706
+#: en/rev-list-options.txt:714
#, priority:260
msgid "Pretend as if all trees and blobs used by the index are listed on the command line. Note that you probably want to use `--objects`, too."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:710
+#: en/rev-list-options.txt:718
#, priority:260
msgid "Only useful with `--objects`; print the object IDs that are not in packs."
msgstr ""
+#. type: Labeled list
+#: en/rev-list-options.txt:719
+#, ignore-same, no-wrap, priority:260
+msgid "--object-names"
+msgstr "--object-names"
+
+#. type: Plain text
+#: en/rev-list-options.txt:722
+#, priority:260
+msgid "Only useful with `--objects`; print the names of the object IDs that are found. This is the default behavior."
+msgstr ""
+
+#. type: Labeled list
+#: en/rev-list-options.txt:723
+#, ignore-same, no-wrap, priority:260
+msgid "--no-object-names"
+msgstr "--no-object-names"
+
+#. type: Plain text
+#: en/rev-list-options.txt:728
+#, priority:260
+msgid "Only useful with `--objects`; does not print the names of the object IDs that are found. This inverts `--object-names`. This flag allows the output to be more easily parsed by commands such as linkgit:git-cat-file[1]."
+msgstr ""
+
#. type: Plain text
-#: en/rev-list-options.txt:715
+#: en/rev-list-options.txt:733
#, priority:260
msgid "Only useful with one of the `--objects*`; omits objects (usually blobs) from the list of printed objects. The '<filter-spec>' may be one of the following:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:717
+#: en/rev-list-options.txt:735
#, priority:260
msgid "The form '--filter=blob:none' omits all blobs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:722
+#: en/rev-list-options.txt:740
#, priority:260
msgid "The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or units. n may be zero. The suffixes k, m, and g can be used to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as 'blob:limit=1024'."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:727
+#: en/rev-list-options.txt:745
#, priority:260
msgid "The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout specification contained in the blob (or blob-expression) '<blob-ish>' to omit blobs that would not be not required for a sparse checkout on the requested refs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:730
+#: en/rev-list-options.txt:755
#, priority:260
-msgid "The form '--filter=sparse:path=<path>' similarly uses a sparse-checkout specification contained in <path>."
+msgid "The form '--filter=tree:<depth>' omits all blobs and trees whose depth from the root tree is >= <depth> (minimum depth if an object is located at multiple depths in the commits traversed). <depth>=0 will not include any trees or blobs unless included explicitly in the command-line (or standard input when --stdin is used). <depth>=1 will include only the tree and blobs which are referenced directly by a commit reachable from <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 while also including trees and blobs one more level removed from an explicitly-given commit or tree."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:740
+#: en/rev-list-options.txt:759
#, priority:260
-msgid "The form '--filter=tree:<depth>' omits all blobs and trees whose depth from the root tree is >= <depth> (minimum depth if an object is located at multiple depths in the commits traversed). <depth>=0 will not include any trees or blobs unless included explicitly in the command-line (or standard input when --stdin is used). <depth>=1 will include only the tree and blobs which are referenced directly by a commit reachable from <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 while also including trees and blobs one more level removed from an explicitly-given commit or tree."
+msgid "Note that the form '--filter=sparse:path=<path>' that wants to read from an arbitrary path on the filesystem has been dropped for security reasons."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:762
+#, priority:260
+msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:771
+#, ignore-ellipsis, priority:260
+msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:775
+#, priority:260
+msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:743
+#: en/rev-list-options.txt:778
#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:744
+#: en/rev-list-options.txt:779
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:747
+#: en/rev-list-options.txt:782
#, priority:260
-msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter.\tObject IDs are prefixed with a ``~'' character."
+msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:754
+#: en/rev-list-options.txt:789
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:762
+#: en/rev-list-options.txt:797
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:765
+#: en/rev-list-options.txt:800
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:772
+#: en/rev-list-options.txt:807
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:774
+#: en/rev-list-options.txt:809
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:782
+#: en/rev-list-options.txt:817
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:783
+#: en/rev-list-options.txt:818
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:785
+#: en/rev-list-options.txt:820
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:787
+#: en/rev-list-options.txt:822
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:793
+#: en/rev-list-options.txt:828
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:797
+#: en/rev-list-options.txt:832
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:799
+#: en/rev-list-options.txt:834
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:800
+#: en/rev-list-options.txt:835
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:807
+#: en/rev-list-options.txt:842
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:811
+#: en/rev-list-options.txt:847
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:813
+#: en/rev-list-options.txt:849
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:852
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:818
+#: en/rev-list-options.txt:854
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:819
+#: en/rev-list-options.txt:855
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:820
+#: en/rev-list-options.txt:856
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:824
+#: en/rev-list-options.txt:859
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:827
+#: en/rev-list-options.txt:862
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:829
+#: en/rev-list-options.txt:864
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:838
+#: en/rev-list-options.txt:873
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:845
+#: en/rev-list-options.txt:880
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:849
+#: en/rev-list-options.txt:884
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:856
+#: en/rev-list-options.txt:891
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:859
+#: en/rev-list-options.txt:894
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:861
+#: en/rev-list-options.txt:896
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:863
+#: en/rev-list-options.txt:898
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:865
+#: en/rev-list-options.txt:900
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:868
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:873
+#: en/rev-list-options.txt:908
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:874
+#: en/rev-list-options.txt:909
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:877
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:879
+#: en/rev-list-options.txt:914
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:881
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:883
+#: en/rev-list-options.txt:918
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:888
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:890
+#: en/rev-list-options.txt:925
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:897
+#: en/rev-list-options.txt:932
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -57723,19 +59899,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:935
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:903
+#: en/rev-list-options.txt:938
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:910
+#: en/rev-list-options.txt:945
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -57747,85 +59923,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:912
+#: en/rev-list-options.txt:947
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:918
+#: en/rev-list-options.txt:953
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:920
+#: en/rev-list-options.txt:955
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:923
+#: en/rev-list-options.txt:958
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:924
+#: en/rev-list-options.txt:959
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:930
+#: en/rev-list-options.txt:965
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:940
+#: en/rev-list-options.txt:975
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:944
+#: en/rev-list-options.txt:979
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:949
+#: en/rev-list-options.txt:984
#, priority:260
msgid "Listed below are options that control the formatting of diff output. Some of them are specific to linkgit:git-rev-list[1], however other diff options may be given. See linkgit:git-diff-files[1] for more options."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:956
+#: en/rev-list-options.txt:991
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:962
+#: en/rev-list-options.txt:997
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:970
+#: en/rev-list-options.txt:1012
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:973
+#: en/rev-list-options.txt:1015
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:976
+#: en/rev-list-options.txt:1018
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
@@ -57833,17 +60009,23 @@ msgstr ""
#. type: Plain text
#: en/sequencer.txt:5
#, priority:100
-msgid "Continue the operation in progress using the information in '.git/sequencer'. Can be used to continue after resolving conflicts in a failed cherry-pick or revert."
+msgid "Continue the operation in progress using the information in `.git/sequencer`. Can be used to continue after resolving conflicts in a failed cherry-pick or revert."
msgstr ""
#. type: Plain text
-#: en/sequencer.txt:10
+#: en/sequencer.txt:9
+#, priority:100
+msgid "Skip the current commit and continue with the rest of the sequence."
+msgstr ""
+
+#. type: Plain text
+#: en/sequencer.txt:14
#, priority:100
msgid "Forget about the current operation in progress. Can be used to clear the sequencer state after a failed cherry-pick or revert."
msgstr ""
#. type: Plain text
-#: en/sequencer.txt:12
+#: en/sequencer.txt:16
#, priority:100
msgid "Cancel the operation and return to the pre-sequence state."
msgstr ""
@@ -58159,7 +60341,7 @@ msgstr ""
#. type: Plain text
#: en/urls.txt:66
#, priority:300
-msgid "where <address> may be a path, a server and path, or an arbitrary URL-like string recognized by the specific remote helper being invoked. See linkgit:gitremote-helpers[1] for details."
+msgid "where <address> may be a path, a server and path, or an arbitrary URL-like string recognized by the specific remote helper being invoked. See linkgit:gitremote-helpers[7] for details."
msgstr ""
#. type: Plain text
@@ -58224,3 +60406,7 @@ msgstr ""
#, priority:300
msgid "a URL like \"git://example.org/path/to/repo.git\" will be rewritten to \"ssh://example.org/path/to/repo.git\" for pushes, but pulls will still use the original URL."
msgstr ""
+
+#, ignore-same
+#~ msgid "git-remote-testgit(1)"
+#~ msgstr "git-remote-testgit(1)"